Commit graph

2508 commits

Author SHA1 Message Date
Connor Turland
55328aaf3a attempt two at array max limit on home page 2012-12-22 03:46:30 -05:00
Connor Turland
87d1d02bb2 added limit to how many topics can show up on main console for testing 2012-12-22 03:43:25 -05:00
Connor Turland
c5a0387917 added public assets for staging 2012-12-22 03:37:01 -05:00
Connor Turland
c4194923a3 got filtering on canvas working 2012-12-22 03:32:12 -05:00
Connor Turland
37e41c87bf made it so that only synapses can be created on topic pages, not new topics. Restructured the URL address system 2012-12-21 18:07:13 -05:00
Connor Turland
84e9f59b8a removed public/assets again, as they screw up local dev 2012-12-21 00:39:13 -05:00
Connor Turland
69ad435e2c added precompiled assets for staging 2012-12-21 00:17:19 -05:00
Connor Turland
c92508d909 made it so that the synapse still appears even while you write the description of the connection 2012-12-21 00:08:52 -05:00
Connor Turland
355a6d4d0f got basic right click on node and drag to create synapse working! 2012-12-20 23:45:44 -05:00
Devin Howard
18a7675067 cleaned up css files 2012-12-20 20:19:55 -05:00
Connor Turland
cdec4b2ffa pushhh 2012-12-20 19:24:27 -05:00
Connor Turland
6e75b93e3b added public assets for staging 2012-12-16 15:05:12 -05:00
Connor Turland
3931fdd40e got Rgraph working 2012-12-16 15:00:43 -05:00
Connor Turland
66a6e22854 removed public assets again 2012-12-16 01:23:43 -05:00
Connor Turland
12b8ed0aa0 added precompiled public assets 2012-12-16 01:17:19 -05:00
Connor Turland
04819ca342 got filtering/finding system working, and node creation happening in place. 2012-12-16 01:12:41 -05:00
Connor Turland
d822d87b5a Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2012-12-15 22:52:27 -05:00
Connor Turland
c0d05942f7 got sidebar find/filters working for -findbyname and -findbymetacode 2012-12-15 22:52:12 -05:00
Devin Howard
e0858f5b39 Merge branch 'devel' 2012-12-15 19:48:25 -05:00
Devin Howard
4242841d86 totally unweildy and not working implementation of node adding by double clicking. It works all right though 2012-12-15 19:46:39 -05:00
Devin Howard
fe97eb0f4e removed public/assets folder 2012-12-15 17:23:07 -05:00
Connor Turland
87d1efd0de Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2012-12-15 16:59:02 -05:00
Devin Howard
ca6c811870 pop up node creation on double click implemented. The x and y of the click are available to the function but are as yet unused 2012-12-15 14:47:04 -05:00
Devin Howard
d6803007c3 pulled the on click handler event code out into a function at the bottom of graphsettings.js. I also created a function in preparation for handling double click on the canvas 2012-12-15 14:24:21 -05:00
Devin Howard
dfdc1bfd94 removed config/database.yml 2012-12-15 14:08:00 -05:00
Devin Howard
ac02995bac updated .gitignore 2012-12-15 13:49:12 -05:00
Connor Turland
758c7e47b0 added precompiled assets for production 2012-12-15 04:44:08 -05:00
Connor Turland
ea8f37da27 adjusted so that cards show up where the icon is, rather than in one static place. 2012-12-15 04:27:55 -05:00
Connor Turland
7c65634ade Merge branch 'ACI' 2012-12-15 02:39:52 -05:00
Connor Turland
6296ca480f restructured a lot of code to be more readable and have less duplication of code 2012-12-15 02:39:14 -05:00
Connor Turland
55d8a197de removed public assets 2012-12-14 13:31:39 -05:00
Connor Turland
3989b7d3b6 precompiled assets 2012-12-14 10:38:49 -05:00
Connor Turland
9f4522e1e7 swapped in db config file for production 2012-12-14 03:20:33 -05:00
Connor Turland
5fb5868378 precompiled assets 2012-12-14 03:10:57 -05:00
Connor Turland
a5fd4cb835 caching changes 2012-12-14 02:59:37 -05:00
Connor Turland
7606c07fd4 removed tmp folder 2012-12-14 02:55:27 -05:00
Connor Turland
7e4fed4020 more caching mods 2012-12-14 02:52:54 -05:00
Connor Turland
2c9a7a8946 changed caching again 2012-12-14 02:41:59 -05:00
Connor Turland
7c2169a2de changed the caching settings 2012-12-14 02:38:59 -05:00
Connor Turland
4a12f251e4 no changes 2012-12-14 02:22:41 -05:00
Connor Turland
5e1ec6ea26 added topic searching in the upper bar 2012-12-14 02:16:17 -05:00
Devin Howard
fcf6c87d2f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2012-12-09 19:47:28 -05:00
Devin Howard
f338265e1b Merge branch 'devel' 2012-12-09 19:46:51 -05:00
Devin Howard
e0c5ea3cf6 after fooling around with reverting my dumb changes, actually committed the removal of 20121203225613_add_arranged_to_map.rb 2012-12-09 19:45:48 -05:00
Devin Howard
3de67ace71 Merge branch 'devel' 2012-12-09 19:45:09 -05:00
Devin Howard
dd8e421cd4 Revert "Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it.""
This reverts commit 31ab10b338.
2012-12-09 19:44:50 -05:00
Devin Howard
7e1610147a Revert "removed 20121203225613_add_arranged_to_map.rb"
This reverts commit baaa746a47.
2012-12-09 19:44:18 -05:00
Devin Howard
31ab10b338 Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."
This reverts commit 698690effd.
2012-12-09 19:43:53 -05:00
Devin Howard
2e0c1a4320 Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."
This reverts commit 698690effd.
2012-12-09 19:42:45 -05:00
Devin Howard
baaa746a47 removed 20121203225613_add_arranged_to_map.rb 2012-12-09 19:42:09 -05:00