Devin Howard
|
be1323ce85
|
got some hacky way of having the showcard show up on the page. TODO: figure out how to drop the application.html wrapper stuff and how to get this into Javascript
|
2012-12-30 23:40:43 -05:00 |
|
Devin Howard
|
ae95cbf6f4
|
I did something with config/routes.rb and now showcard/1 shows an empty html page instead of giving an error
|
2012-12-30 23:33:08 -05:00 |
|
Devin Howard
|
8d1171c2c8
|
made showcard into a non-partial view, in desperation
|
2012-12-30 23:30:18 -05:00 |
|
Devin Howard
|
5d552a5d00
|
added showcard partial view to items so we can load them with AJAX...\!
|
2012-12-30 23:05:33 -05:00 |
|
Devin Howard
|
abe34696da
|
added an empty div at the bottom of the page containing nodes
|
2012-12-30 23:04:30 -05:00 |
|
Devin Howard
|
293b3727a2
|
Merge branch 'master' into devel
|
2012-12-30 22:56:09 -05:00 |
|
Devin Howard
|
a7412cd162
|
initialization code for best_in_place
|
2012-12-30 22:56:05 -05:00 |
|
Devin Howard
|
460e992f32
|
added best_in_place gem
|
2012-12-30 18:50:23 -05:00 |
|
Connor Turland
|
95ee65f58a
|
added assets for staging
|
2012-12-26 23:16:00 -05:00 |
|
Connor Turland
|
704bb2f0f7
|
fixed images (mostly) and fixed accidental topic double creation
|
2012-12-26 23:00:05 -05:00 |
|
Connor Turland
|
8577a40503
|
added precompiled assets for staging
|
2012-12-26 21:07:34 -05:00 |
|
Connor Turland
|
510ab5fabb
|
added proper images
|
2012-12-26 20:57:06 -05:00 |
|
Connor Turland
|
3be8d56406
|
switched the feedback map back in as map 7
|
2012-12-25 23:01:17 -05:00 |
|
Connor Turland
|
e4dfa7f384
|
added public assets for staging
|
2012-12-25 22:56:54 -05:00 |
|
Connor Turland
|
475ccad493
|
increased line size. fixed ability to see synapses on Rgraph pages
|
2012-12-25 22:47:02 -05:00 |
|
Connor Turland
|
3a071204f5
|
removed public assets again
|
2012-12-25 18:48:39 -05:00 |
|
Connor Turland
|
3356160af4
|
moved all the menus in the upper right to the logo. created the console at /console. changed synapse creation to be either on right click and drag or alt+left click. fixed scrolling and spacing on list pages of maps and topics. added ability to clear the canvas on the console and to save to map. removed metamap page, and extraneous controllers.
|
2012-12-25 18:29:20 -05:00 |
|
Connor Turland
|
cea2ea7e2a
|
adjusted the console/canvas to be clear when you start, and the ability to load topics to your canvas by mapper, or by map. fixed issue where synapse was asking for description when there was no topic at the other end
|
2012-12-23 01:34:27 -05:00 |
|
Connor Turland
|
783894461e
|
testing ability to pull topics onto the canvas
|
2012-12-23 01:12:56 -05:00 |
|
Connor Turland
|
79f931bede
|
updated finding topic by name to be aware whether they are searching in the commons, or on their canvas, and only show the autocomplete if they're searching in the commons
|
2012-12-22 14:52:16 -05:00 |
|
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 |
|