Connor Turland
|
50bc2b53a9
|
added url for embedding maps
|
2013-02-19 09:44:43 -05:00 |
|
Connor Turland
|
1b29eb1eb3
|
hid clearcanvas and seek tabs on topic pages as they had broken functionality
|
2013-02-16 19:23:36 -05:00 |
|
Connor Turland
|
667d86083c
|
fixed autocomplete bugginess further
|
2013-02-16 19:08:19 -05:00 |
|
Connor Turland
|
210c73e81b
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-02-16 19:03:48 -05:00 |
|
Connor Turland
|
c7f44d34a7
|
fixed console issue
|
2013-02-16 19:03:21 -05:00 |
|
Devin Howard
|
d289d77b5a
|
added seek/analyse/organize tabs to topic view. Was that a good idea? Who knows.
|
2013-02-16 17:52:38 -05:00 |
|
Devin Howard
|
f1a7e040fb
|
fixed & error on synapse desc display
|
2013-02-16 17:32:50 -05:00 |
|
Connor Turland
|
a1c5a82ac4
|
fixed autocomplete bugginess, fixed synapse half opacity bug
|
2013-02-15 20:00:05 -05:00 |
|
Connor Turland
|
759e6aa0bd
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2013-02-15 08:51:11 -05:00 |
|
Devin Howard
|
1ea2317ab4
|
nicer formatting on savelayout in maps_controller.rb
|
2013-02-14 22:36:08 -05:00 |
|
Devin Howard
|
5e051ebff2
|
allow showcards to disappear when you click on the canvas. also fixed a couple other bugs related to showcards that make code a little more logical
|
2013-02-14 22:23:14 -05:00 |
|
Devin Howard
|
e762be0be3
|
implemented clear canvas too... sort of
|
2013-02-14 21:58:55 -05:00 |
|
Devin Howard
|
35dd8c1816
|
partway to save to map functionality on topic view
|
2013-02-14 21:29:45 -05:00 |
|
Devin Howard
|
dee531e3ef
|
hide synapse editing card on topic view too
|
2013-02-14 21:08:58 -05:00 |
|
Connor Turland
|
0bad3ec1de
|
production config file
|
2013-02-10 21:04:11 -05:00 |
|
Devin Howard
|
cd3f02d676
|
fixed save layout bug issue #90
|
2013-02-10 20:22:18 -05:00 |
|
Devin Howard
|
87d74fd3c2
|
ok you can edit nodes with whitespace now
|
2013-02-07 18:55:10 -05:00 |
|
Devin Howard
|
e1f454c4f4
|
set up data nil. still need to make sure nodes with only whitespace in their description field are editable
|
2013-02-07 18:51:41 -05:00 |
|
Connor Turland
|
9160ae305e
|
finished devins piece editing synapse directionality
|
2013-02-03 21:12:15 -05:00 |
|
Connor Turland
|
8167708383
|
added link to Click Me topic in logged out menu, and made it the place you go when you log in
|
2013-02-03 20:20:29 -05:00 |
|
Connor Turland
|
4bbb838cd4
|
reformatted home page, fixed text-overflow, added request invite page and a link to the blog
|
2013-02-03 19:13:21 -05:00 |
|
Connor Turland
|
5abe7ef173
|
fixed graphsettings file
|
2013-02-03 13:04:01 -05:00 |
|
Devin Howard
|
dfa2b2eb83
|
merged in changes from github and merged with synapse editng code
|
2013-01-30 19:51:55 -05:00 |
|
Devin Howard
|
9e8fdd5138
|
committing edit edge form without permission capabilities so it can go up now
|
2013-01-30 19:01:28 -05:00 |
|
Devin Howard
|
2a785b350a
|
added synapse editing css to base.css
|
2013-01-30 18:58:51 -05:00 |
|
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 |
|