Devin Howard
|
12d5e17e6c
|
hide synapse editing dialog on click in graphsettings.js
|
2013-01-30 18:58:27 -05:00 |
|
Devin Howard
|
a080fa2ec4
|
now the permissions is broken and it looks bad, but the directionality editing works
|
2013-01-27 17:58:43 -05:00 |
|
Devin Howard
|
25fa45356f
|
javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things.
|
2013-01-27 17:21:19 -05:00 |
|
Connor Turland
|
b358f3dc5b
|
fixed login bug
|
2013-01-26 00:46:03 -05:00 |
|
Connor Turland
|
68d08af9d3
|
db file for production
|
2013-01-25 22:50:23 -05:00 |
|
Connor Turland
|
81094a5d62
|
testing metacode things with staging
|
2013-01-25 22:31:35 -05:00 |
|
Connor Turland
|
f3de1944d1
|
testing metacode things with staging
|
2013-01-25 22:28:45 -05:00 |
|
Connor Turland
|
a0f638c10c
|
added ability to switch what metacodes you are mapping with
|
2013-01-25 20:49:40 -05:00 |
|
Connor Turland
|
9853f91a59
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-25 00:48:09 -05:00 |
|
Connor Turland
|
9bc07b04fa
|
improved so many things
|
2013-01-25 00:47:32 -05:00 |
|
Devin Howard
|
0ad2392af5
|
Merge branch 'master' into devel
|
2013-01-24 19:53:07 -05:00 |
|
Devin Howard
|
87b2526373
|
removed 2 spaces from sessions_controller
|
2013-01-24 19:52:13 -05:00 |
|
Devin Howard
|
c9614e33e3
|
removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends?
|
2013-01-24 19:51:51 -05:00 |
|
Connor Turland
|
3433e1f05c
|
lowered synapse alpha
|
2013-01-23 23:40:06 -05:00 |
|
Connor Turland
|
397eddca84
|
removed assets for github
|
2013-01-23 22:48:03 -05:00 |
|
Connor Turland
|
43e1e12503
|
changed topic exploration to move into fluid space.
|
2013-01-23 22:05:24 -05:00 |
|
Connor Turland
|
1727d95c4c
|
re-enabled my work so far on realtime for Fabio
|
2013-01-23 13:55:50 -05:00 |
|
Connor Turland
|
02ac167444
|
good start on more persistent permissions throughout the platform
|
2013-01-23 13:43:01 -05:00 |
|
Connor Turland
|
a85e8fac71
|
added db config default file
|
2013-01-20 18:00:10 -05:00 |
|
Connor Turland
|
1633b61637
|
permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json
|
2013-01-18 17:08:06 -05:00 |
|
Devin Howard
|
3deebc6c09
|
merged comment in home.html.erb with Twitter contact info
|
2013-01-15 19:32:23 -05:00 |
|
Devin Howard
|
626cf37917
|
added pointer to our Twitter on main page
|
2013-01-15 19:31:16 -05:00 |
|
Devin Howard
|
6aed92d22d
|
added comments, heavily interspersed with TODO's, to every view
|
2013-01-11 18:49:59 -05:00 |
|
Devin Howard
|
d3358d17d0
|
OK those bugs are fixed. The great Javascript refactor is done for tonight.
graphsettings.js has been split into the following files (shown with line counts):
:javascripts Devin$ wc -l Jit/graphsettings.js
384 Jit/graphsettings.js
:javascripts Devin$ wc -l Jit/onCreateLabelHandler.js
281 Jit/onCreateLabelHandler.js
:javascripts Devin$ wc -l Jit/select-edit-delete-nodes-and-edges.js
185 Jit/select-edit-delete-nodes-and-edges.js
:javascripts Devin$ wc -l Jit/graphsettings-model.js
12 Jit/graphsettings-model.js
:javascripts Devin$ wc -l Jit/graphsettings-event-handlers.js
145 Jit/graphsettings-event-handlers.js
|
2013-01-10 22:19:44 -05:00 |
|
Devin Howard
|
bb1bf2d05f
|
removed alerts from loadgraphs.js
|
2013-01-10 22:02:34 -05:00 |
|
Devin Howard
|
d69cafaf85
|
a bunch of javascript refactoring, but this specific commit introduces at least one bug (onCreateLabel isn't called)
|
2013-01-10 22:01:24 -05:00 |
|
Devin Howard
|
d2383e50db
|
make description field not have save/cancel buttons for best_in_place
|
2013-01-10 19:13:18 -05:00 |
|
Connor Turland
|
3c6baae698
|
push to live successful! swapping back out files for normal dev
|
2013-01-08 00:42:00 -05:00 |
|
Connor Turland
|
cab180d87b
|
fixed tiny styling error on the menu
|
2013-01-08 00:03:40 -05:00 |
|
Connor Turland
|
e1ece299cc
|
styled buttons
|
2013-01-07 23:40:58 -05:00 |
|
Connor Turland
|
f48659288c
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-07 23:04:14 -05:00 |
|
Connor Turland
|
1b44175c31
|
added home page with recent info, and personal profiles with recent indo
|
2013-01-07 23:03:41 -05:00 |
|
Devin Howard
|
1fed4d2f06
|
save synapses to map in saveToMap function wasn't working, but it is now
|
2013-01-07 23:03:29 -05:00 |
|
Devin Howard
|
3f1d9ddda5
|
cleaned up synapse editing code - should be bug-free. Famous last words?
|
2013-01-07 22:06:24 -05:00 |
|
Devin Howard
|
e2c408f983
|
changed savedToMap() function so that it also includes all synapses
|
2013-01-07 22:05:59 -05:00 |
|
Devin Howard
|
a7d4debd02
|
added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller
|
2013-01-07 22:05:27 -05:00 |
|
Devin Howard
|
e481dcd822
|
changed maps controller so it accepts synapses as a csv list
|
2013-01-07 22:04:53 -05:00 |
|
Devin Howard
|
647467e97a
|
render edge labels with white background
|
2013-01-07 20:34:47 -05:00 |
|
Connor Turland
|
bf957617da
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-07 19:57:35 -05:00 |
|
Connor Turland
|
3ee2921ae4
|
updating user profile pages
|
2013-01-07 19:57:04 -05:00 |
|
Devin Howard
|
954ce2009b
|
got editing of synapses working. Also tidied up selection code.
|
2013-01-07 19:43:12 -05:00 |
|
Connor Turland
|
ea54bacea3
|
added shift+click and ability to take different kinds of actions on selected nodes and edges
|
2013-01-07 00:17:39 -05:00 |
|
Connor Turland
|
9dabcb7fc1
|
too many changes to say
|
2013-01-06 18:40:48 -05:00 |
|
Connor Turland
|
995f342f98
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 23:42:37 -05:00 |
|
Connor Turland
|
db3320aaf6
|
changed map to only show synapses that appear on the map
|
2013-01-05 23:42:22 -05:00 |
|
Devin Howard
|
b3ccbbbd74
|
can now remove synapses from maps with R key, although you can't really tell if you reload the page
|
2013-01-05 23:37:24 -05:00 |
|
Devin Howard
|
8f0df0a891
|
Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002
|
2013-01-05 23:13:35 -05:00 |
|
Devin Howard
|
64e93c8326
|
don't highlight synapses when mouse is over a node
|
2013-01-05 23:12:32 -05:00 |
|
Connor Turland
|
e0a2df285f
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 23:03:30 -05:00 |
|
Connor Turland
|
30f84d4f09
|
set limits on scaling
|
2013-01-05 23:03:05 -05:00 |
|
Devin Howard
|
6226930c98
|
added a bunch of code to select/deselect edges. I think it should all work intuitively at this point
|
2013-01-05 22:40:31 -05:00 |
|
Devin Howard
|
01fe14dbd1
|
remove all mappings from a synapse on destroy in controller. Haven't added stuff to remove mappings to controller
|
2013-01-05 22:40:10 -05:00 |
|
Devin Howard
|
c739f58b4b
|
added destroy.js.erb for responding to synapse destruction. Also select edges by default on creation in create.js.erb
|
2013-01-05 22:39:35 -05:00 |
|
Connor Turland
|
34ffc8c6b6
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 20:20:18 -05:00 |
|
Connor Turland
|
76fd9b14da
|
added assets for staging
|
2013-01-05 17:50:40 -05:00 |
|
Devin Howard
|
4e7c7f5d1b
|
implemented mouseEnter and mouseLeave for edges and made them get all highlighted on mouse over
|
2013-01-05 17:31:38 -05:00 |
|
Devin Howard
|
01ca6263e9
|
cursor when hovering edge
|
2013-01-05 16:28:04 -05:00 |
|
Connor Turland
|
e5076533c0
|
disabled awkward panning and zooming bugs by editing jit code
|
2013-01-05 16:21:11 -05:00 |
|
Connor Turland
|
8260fdf7e0
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 14:08:05 -05:00 |
|
Connor Turland
|
804483beac
|
made mousewheel scrolling for metacode selection work, and also added ability to use up and down arrow keys to pick metacode
|
2013-01-05 14:07:46 -05:00 |
|
Devin Howard
|
db3836360a
|
Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002
|
2013-01-05 13:05:06 -05:00 |
|
Devin Howard
|
93d9d7db07
|
updated link editing ajax callback
|
2013-01-05 12:56:44 -05:00 |
|
Connor Turland
|
1f2ac7611c
|
removed assets
|
2013-01-05 12:52:05 -05:00 |
|
Connor Turland
|
c6bc121fa0
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-05 12:51:48 -05:00 |
|
Connor Turland
|
a18ad58208
|
updated the edit description field, and the way that the card shows, and it stops the glitchy behaviour on topic editing
|
2013-01-05 12:50:19 -05:00 |
|
Devin Howard
|
d90954e3a7
|
got links working via best_in_place
|
2013-01-05 12:45:02 -05:00 |
|
Devin Howard
|
8f13413ab7
|
callbacks now working - incluing to update card at top of topic view pages
|
2013-01-05 11:57:25 -05:00 |
|
Devin Howard
|
d316df3192
|
added span around title text on topic view top cards
|
2013-01-05 11:51:36 -05:00 |
|
Devin Howard
|
8b7017df22
|
added class to the focus div telling us what topic page we're on
|
2013-01-05 11:39:44 -05:00 |
|
Connor Turland
|
d2e2176fd9
|
fixed blemishes on generic images
|
2013-01-05 00:00:14 -05:00 |
|
Connor Turland
|
168881ad86
|
changed 'find' to 'seek'
|
2013-01-04 21:45:47 -05:00 |
|
Connor Turland
|
b31906823a
|
minor error in controller for deleting mappings
|
2013-01-04 21:44:16 -05:00 |
|
Connor Turland
|
e593bbc8b2
|
added ability to hide topics from canvas, remove topics from map, and delete topics, all from the graph.
|
2013-01-04 21:39:16 -05:00 |
|
Connor Turland
|
ea19ce5375
|
changed the mechanism for realtime so that it only pulls in new information
|
2013-01-04 16:51:37 -05:00 |
|
Connor Turland
|
2be0bc6fa3
|
reduced the speed again, caused a crash
|
2013-01-04 01:31:13 -05:00 |
|
Connor Turland
|
f447334563
|
took out the part about adjencies for realtime
|
2013-01-04 01:08:06 -05:00 |
|
Connor Turland
|
bba4ec2cf3
|
polished up and sped up realtime
|
2013-01-04 01:01:54 -05:00 |
|
Connor Turland
|
8180742ec4
|
added an attempt at real time updates on maps
|
2013-01-04 00:20:43 -05:00 |
|
Connor Turland
|
7497688724
|
fixed a bunch of strange behaviours, and made synapse and topic creation work on all major browsers except haven't tested it out fully with opera yet, Devin will do that. added, but hid the framework for using analyze and organize functions on the left hand side.
|
2013-01-03 18:21:46 -05:00 |
|
Connor Turland
|
5389f54867
|
merged graphsettings
|
2013-01-03 04:01:18 -05:00 |
|
Connor Turland
|
940c6f02a5
|
too tired cause I stayed up to stupid late to say something intelligeblle here see.
|
2013-01-03 03:53:25 -05:00 |
|
Devin Howard
|
d1e1125c80
|
set things up for the link's data-activator to work, but it doesn't work yet since I don't know what to put in the data-activator field
|
2013-01-02 23:25:33 -05:00 |
|
Devin Howard
|
a9462d0f0e
|
Merge branch 'master' into devel
|
2013-01-02 23:02:14 -05:00 |
|
Devin Howard
|
9f9061d908
|
made a few more detaily fixes
|
2013-01-02 23:01:38 -05:00 |
|
Connor Turland
|
9cb11c08d4
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-01-02 22:48:34 -05:00 |
|
Connor Turland
|
87ead9bcbe
|
fixed metacode choosing, and searching by topic name typing issue
|
2013-01-02 22:48:08 -05:00 |
|
Devin Howard
|
4ea435dfee
|
added a close button, also the image is now updated when you change metacodes
|
2013-01-02 22:39:10 -05:00 |
|
Devin Howard
|
8305beaaa7
|
organized the metacodes list
|
2013-01-02 21:55:47 -05:00 |
|
Devin Howard
|
7e6294a705
|
Getting closer to working in-place editing. TODO: Fix the way the links work, fix click-dragging on text, run callbacks on change of the metacode or link, and organize the metacode list
|
2013-01-02 21:49:00 -05:00 |
|
Devin Howard
|
0384c3f866
|
added rudimentary editing on link and desc fields TODO: some kind of best in place callbacks, buttons that seperate links from editing
|
2013-01-02 21:02:41 -05:00 |
|
Devin Howard
|
50dd586fbe
|
removed showcard routes, html.erb, and controller entries/files since it's back in javascript
|
2013-01-02 21:01:56 -05:00 |
|
Devin Howard
|
84c8494f2b
|
fixed the metacode editing. TODO: Description, Link
|
2013-01-02 20:46:01 -05:00 |
|
Devin Howard
|
c62f99d0fb
|
serious progress on graphsettings.js's best_in_place stuff - have metacode stuff not working, and title stuff working
|
2013-01-02 20:37:49 -05:00 |
|
Devin Howard
|
4c8c7d272a
|
updated items controller and graphsettings to allow in-place editing of the description on cards. Pretty cool
|
2013-01-01 23:57:32 -05:00 |
|
Connor Turland
|
26cf745517
|
converted all references to items to topics
|
2013-01-01 17:45:51 -05:00 |
|
Connor Turland
|
131e27aefe
|
converted all references to items to topics
|
2013-01-01 17:45:35 -05:00 |
|
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
|
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 |
|