Connor Turland
9a560ff829
styled carousel autocomplete results. moved tooltips. built out map info box
2014-02-03 20:43:31 -05:00
Connor Turland
4e3c9fc439
added tooltips on search results, added icon for change metacode set, did further styling of open topic card
2014-02-03 00:35:21 -05:00
Connor Turland
6538577387
added ability to limit search results to just your own, and to minimize the different sections of search results
2014-02-02 14:56:07 -05:00
Connor Turland
9c3c7c5e01
enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card
2014-02-01 03:57:19 -05:00
Connor Turland
d3500b0ce9
adjusted user model to not prevent sign ups
2014-01-31 11:58:32 -05:00
Connor Turland
7412b0a1b1
fixed one spot where it was trying to send realtime message over redis from the maps controller in save layout
2014-01-30 21:39:24 -05:00
Connor Turland
021fffe11f
added right click menu icons, did text wrap on labels
2014-01-30 21:28:10 -05:00
Connor Turland
9ca9e56536
improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones.
2014-01-30 19:32:15 -05:00
Connor Turland
efcc449471
fixed issue where settings page was redirecting to nonexistent user profile page
2014-01-28 23:53:13 -05:00
Connor Turland
fbdfff6b83
temporarily commented out lines that send realtime messages via redis
2014-01-28 23:34:50 -05:00
Connor Turland
d6d428df60
perhaps fixed login error
2014-01-28 23:27:32 -05:00
Connor Turland
414e59e280
this is a lot of changes. too many to say here, oops
2014-01-28 22:46:58 -05:00
Connor Turland
e44d57a6d9
updated the home page
2013-12-01 20:47:28 -05:00
Connor Turland
adcdea5d5e
fixed selecting things on the radial view, and the weird synapse autocomplete bug
2013-11-14 12:28:31 -05:00
Connor Turland
6e433683c7
updated user sign up advice on the invite page finally
2013-09-18 20:04:58 -04:00
Connor Turland
f32378398a
removed extra files
2013-07-11 11:16:06 -04:00
Connor Turland
b218d898ea
added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console
2013-07-11 11:13:27 -04:00
Connor Turland
41044140b7
added completely new logging in system
2013-07-10 14:02:38 -04:00
Connor Turland
2545126b0b
fixed up some styling. extended rgraph radius. added show/hide labels
2013-07-09 12:32:13 -04:00
Connor Turland
1e6210a117
fixed the realtime bug where things were moving around unexpectedly
2013-06-27 14:15:28 -04:00
Connor Turland
f657a61327
added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card
2013-04-26 00:07:29 -04:00
Connor Turland
1491c20895
shift+click for box selecting topics
2013-03-29 02:38:13 -04:00
Devin Howard
c93c74094c
merge esc key handler stuff and fixing dragging topics
2013-03-28 21:10:35 -04:00
Devin Howard
5f86d879ac
allow dragging on topic view
2013-03-28 21:09:07 -04:00
Devin Howard
1f096cf5a5
esc deselects all nodes/synapses
2013-03-28 18:56:34 -04:00
Connor Turland
24269a10b9
developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky
2013-03-22 02:37:56 -04:00
Devin Howard
600e5814f0
fix #172 , unless the problem applies to topics as well which I haven't investigated further
2013-03-21 22:18:20 -04:00
Devin Howard
45f856fc05
fix #170
2013-03-21 21:58:32 -04:00
Devin Howard
71047ecac4
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-03-21 21:34:26 -04:00
Devin Howard
e5095093ec
added Keep Selected button to console, map view, topic view
2013-03-21 21:33:42 -04:00
Devin Howard
6ac05fa2c6
allow Enter to keep all selected nodes in commons
2013-03-21 21:29:09 -04:00
Connor Turland
41333c1991
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
2013-03-17 05:20:12 -04:00
Connor Turland
9187112754
fixed labels all up. made it so only one showcard exists
2013-03-17 05:18:30 -04:00
Connor Turland
1f7588f1ce
added ability to use touch to drag nodes, pan, and zoom. fixed label glitch for the most part
2013-03-17 02:29:17 -04:00
Devin Howard
f714212423
implement synapse autocomplete controller function to make the results distinct. fixes #139
2013-03-16 13:30:54 -04:00
Devin Howard
6ed19db3ec
undo the bug I introduced in the last commit; also change selectNodeOnClickHandler to selectNode to prevent a couple errors in topics/create.js.erb
2013-03-16 12:56:26 -04:00
Devin Howard
0049ae88d1
hide synapse autocomplete after synapse creation - didn't we fix this already?
2013-03-16 12:51:56 -04:00
Devin Howard
86895836a0
changed some disposeLabels to hideLabels - fix #156
2013-03-14 22:55:28 -04:00
Devin Howard
1c3aa6c973
more onCanvas/inCommons => whiteCircle/greenCircle changes in views. Also changed a thing in main/search.js.erb about the "temp" node being undefined instead of null that may fix an issue or not
2013-03-14 21:01:09 -04:00
Devin Howard
610286cee7
changed onCanvas to whiteCircle and inCommons to greenCircle in node data. Also a few other minor/helpful tweaks
2013-03-14 20:53:01 -04:00
Devin Howard
e54c4e24ed
fixed problems with multiple node selection dragging ( #79 )
2013-03-11 22:50:17 -04:00
Devin Howard
88a230dccf
Revert "Revert "Drag around all selected nodes, not just one - implements #79 ""
...
This reverts commit 0a1b5d51d8
.
2013-03-11 22:25:22 -04:00
Devin Howard
0a1b5d51d8
Revert "Drag around all selected nodes, not just one - implements #79 "
...
This reverts commit fa789dff2e
.
2013-03-11 22:24:17 -04:00
Devin Howard
fa789dff2e
Drag around all selected nodes, not just one - implements #79
2013-03-11 21:54:38 -04:00
Devin Howard
ddf449502b
fix #145 - autocomplete widget fades out on topic creation
2013-03-07 20:09:18 -05:00
Devin Howard
16d46ffd28
made permission editing card less stupid
2013-02-28 21:49:09 -05:00
Devin Howard
eaa9ba4d88
formatting in synapses_controller
2013-02-28 21:46:08 -05:00
Devin Howard
8f59fc34d1
added permission to synapse dataset in js in two spots: creating new edge, grabbing edge from commons
2013-02-28 21:45:42 -05:00
Devin Howard
02cff2e138
ok added edge permissions editing back in. still todo: make it look better, make it work for synapses brought in from the commons
2013-02-28 21:36:02 -05:00
Devin Howard
49d761c81c
comments
2013-02-28 21:00:09 -05:00
Devin Howard
e0e505de1d
ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results
2013-02-28 20:56:57 -05:00
Devin Howard
0280b5bb21
don't fruitlessly create a million mappings when you double click nodes already in the canvas
2013-02-28 20:43:07 -05:00
Devin Howard
2cff8ce37e
ajax post that creates a mapping when you double click on a in commons node in the map
2013-02-28 20:42:09 -05:00
Devin Howard
564d18df4d
finished mappings#create except it doesn't authenticate...
2013-02-28 20:41:30 -05:00
Devin Howard
4e5fb95c7e
fixed a few problems with mappings_controller.rb
2013-02-28 20:16:04 -05:00
Devin Howard
a55fc2242c
added blank views files for mappings
2013-02-28 20:15:25 -05:00
Devin Howard
d325cb0088
renamed mapping_controller to mappings_controller
2013-02-28 20:08:55 -05:00
Devin Howard
6bcb575578
added supporting files to mapping controller - could be reverted with no problems probably
2013-02-28 19:57:04 -05:00
Devin Howard
101f49b9e6
added mapping_controller and routes, but only implemented create
2013-02-28 19:56:27 -05:00
Devin Howard
8a9b84c7f3
fixed save to map to filter by metacode too
2013-02-22 18:48:01 -05:00
Devin Howard
b336af1d53
added selectNode and deselectNode functions
2013-02-22 18:33:18 -05:00
Devin Howard
88522be80c
now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet
2013-02-22 18:27:11 -05:00
Devin Howard
d283797deb
made the metamaps model cooler
2013-02-22 18:08:03 -05:00
Devin Howard
195889e6fe
added clear canvas button back to topics view, including javascript code to back it up
2013-02-22 18:01:15 -05:00
Devin Howard
e2c28da81e
changed checkbox logic in find.js
2013-02-21 21:37:00 -05:00
Devin Howard
fcc1a6968c
lowercase in commons searching for topic names
2013-02-21 21:36:33 -05:00
Devin Howard
a248a866c1
changed some variable names and removed commented code in find.js
2013-02-21 21:10:11 -05:00
Devin Howard
28170035b0
fixed more indentation in find.js
2013-02-21 20:52:46 -05:00
Devin Howard
e670861f3e
added data-nil to showard links
2013-02-21 20:32:43 -05:00
Devin Howard
3e4368c0f4
This commit did three things:
...
1) Make Seek case insensitive for topic name search
2) Changed indentation in find.js
3) Removed some commented code in onCanvasSearch - if you want to recover it, it's in this commit
2013-02-21 19:59:59 -05:00
Connor Turland
5fd9af3dfd
fixed menu sizing bug and permissions sizing bug
2013-02-20 17:52:25 -05:00
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
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
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
704bb2f0f7
fixed images (mostly) and fixed accidental topic double creation
2012-12-26 23:00:05 -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
475ccad493
increased line size. fixed ability to see synapses on Rgraph pages
2012-12-25 22:47:02 -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
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
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
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
3931fdd40e
got Rgraph working
2012-12-16 15:00:43 -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
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
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
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
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
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
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
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
Connor Turland
698690effd
fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it.
2012-12-09 19:06:36 -05:00
Connor Turland
4ab7fe76ca
fixed synapse created on arranged maps
2012-12-07 15:06:00 -05:00
Connor Turland
696d094118
fixed filters on arranged map pages
2012-12-05 16:04:55 -05:00
Connor Turland
8d54c1272e
test for caching oddity
2012-12-03 19:21:06 -05:00
Connor Turland
ae2cdf20be
removed cached files
2012-12-03 18:50:38 -05:00
Connor Turland
30b5b94037
fixed delete map bug. made it so that if the user hasn't saved a layout to a map, it continues to render as forcedirected
2012-12-03 18:40:14 -05:00
Connor Turland
e8404de01a
added ability to save layout of maps.
2012-12-01 18:05:17 -05:00
Connor Turland
e493bbe2c9
fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently
2012-11-24 17:48:26 -08:00
Connor Turland
b34962b4f5
added hideAll showAll filters!
2012-11-23 11:00:00 -08:00
Connor Turland
53ec317cd0
nice clean version of JIT2.0.0 working with extra code cleaned out
2012-11-23 08:56:22 -08:00
Connor Turland
13fc7d829f
fixed directionality and set circle radius to corrent length
2012-11-18 14:40:06 -05:00
Connor Turland
f725b607d3
temporarily hid the connection descriptions
2012-11-05 14:54:30 -05:00
Connor Turland
5839ca191c
corrected directionality to point right way
2012-11-03 20:43:05 -04:00
Connor Turland
08c7c3b517
temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server
2012-11-03 20:35:37 -04:00
Connor Turland
3a96fdeac3
added directionality to graphs on Force Directed types
2012-11-03 20:21:33 -04:00
Connor Turland
1d32749848
got directionality working on the RGraph type
2012-11-03 20:14:21 -04:00
Devin Howard
c523c17111
changed our syntax so that the find :first commands actually work :)
2012-11-03 13:57:42 -04:00
Devin Howard
77420bcb09
made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database
2012-11-03 13:45:08 -04:00
Devin Howard
4787ca23c5
removed dependence on having a sample map by adding empty text ("shucks")
2012-11-03 13:34:38 -04:00
Devin Howard
c9d0ea889c
if feedback map doesn't exist don't put up feedback button
2012-11-03 13:30:20 -04:00
Devin Howard
b07004299f
removed .DS_Store files - whoops\!
2012-11-03 11:52:37 -04:00
Devin Howard
eb0c8f1b8a
removed home.html.erb and configured new databases and changed background image
2012-11-03 11:51:49 -04:00
Connor Turland
42a9edb407
limited network load size to 4 degrees of connectivity
2012-11-01 15:59:54 -04:00
Connor Turland
3b2214017f
added little scrollbars on cards whose text was getting too big.
2012-10-31 18:53:11 -04:00
Connor Turland
69b2fe87cc
fixed add topic bug, wasn't adding topics when on pages other than maps.
2012-10-31 00:25:56 -04:00
Connor Turland
c7dfd836f1
added favicon and google analytics
2012-10-30 18:32:48 -04:00
Connor Turland
283ddf25c5
showing existing synapses on maps
2012-10-30 12:15:45 -04:00
Connor Turland
967cbb3f51
t
2012-10-30 00:40:37 -04:00
Connor Turland
f5015de9df
added blank option to add existing
2012-10-30 00:30:56 -04:00
Connor Turland
aeb0e99971
changed 'add Item' to add Topic.
2012-10-29 23:48:17 -04:00
Connor Turland
d2f7fef835
added ability to add existing topics to map. also the ability to remove topics from a map that you've added by mistake or don't wan't there anymore.
2012-10-29 23:40:38 -04:00
Connor Turland
f9c355cddb
added link to feedback. removed bolding on fonts that we're looking bad.
2012-10-29 14:57:11 -04:00
Connor Turland
baf440afda
debugged users/new issue. I was logged in and trying to navigate to that page, and it was trying to redirect to a page that doesn't exist anymore.
2012-10-29 14:21:36 -04:00
Connor Turland
f3fb5c5326
added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account.
2012-10-29 13:52:29 -04:00
Connor Turland
f81ea7489f
fixed logout path issue. now returns you to homepage when you log out.
2012-10-28 14:48:42 -04:00
Connor Turland
9e7c6b0f02
updated header to have dropdown menus. fixed synapses that were showing up blue. ensured that when creating new synapses, you can only see the list for which you have permissions to see
2012-10-28 14:37:46 -04:00
Connor Turland
d4c3898f5f
fixed focus heading
2012-10-27 17:48:54 -04:00
Connor Turland
7efac0bfd6
fixed styling bugs
2012-10-27 17:07:01 -04:00
Connor Turland
b83bcd65a4
updated styling
2012-10-27 15:51:22 -04:00
Connor Turland
6b8a99eb01
implemented a radical overhaul of permissions, so that it actually hides content that it's supposed to
2012-10-27 04:30:56 -04:00
Connor Turland
402786a7c6
removed extra migrate file and made user show profile correctly
2012-10-26 06:59:45 -04:00
Connor Turland
112708eb52
made show user show whoevers page you're on
2012-10-26 06:43:01 -04:00
Connor Turland
81851df633
just trying
2012-10-26 06:17:55 -04:00
Connor Turland
5c195bd548
added maps, permissions, show user cards
2012-10-26 06:04:52 -04:00
Connor Turland
dfb92b89a5
added ability to add synapse from any page on which there is a map
2012-10-24 02:47:08 -04:00
Connor Turland
adf24530d8
fixed filtering on multi word item categories
2012-10-23 10:46:06 -04:00
Connor Turland
37c0be907b
changed synapse view to work, and initialize force direccted graph using initFD
2012-10-22 21:48:49 -04:00
Connor Turland
099bba0d49
removed extraneous log files
2012-10-22 21:00:35 -04:00
Connor Turland
6808cc517f
fixed filtering bug
2012-10-21 21:25:26 -04:00
Connor Turland
587a2a3b2a
added filtering
2012-10-21 21:10:43 -04:00
Connor Turland
851b133ed1
added ability to add node on rgraph pages
2012-10-21 16:08:41 -04:00
Connor Turland
1bc69512de
switched show topic view to rgraph. coolest. shit. ever
2012-10-21 15:57:48 -04:00
Connor Turland
e32e2a25d7
reduced edge width
2012-10-21 15:14:28 -04:00
Connor Turland
23f7db2e1c
fixed bugs for adding new topic on any page
2012-10-21 14:32:17 -04:00
Connor Turland
ded6ffe7e5
node add to map tweak
2012-10-21 13:46:27 -04:00
Connor Turland
480a9bcf99
changed node adding so that it happens directly to the graph
2012-10-21 13:19:59 -04:00
Connor Turland
b6260d7015
updated my-synapses to only show synapses that you've made between items, even if the items weren't added by you. added function that recurses through data finding all items connected to a starting point. set item show page to return that kind of network
2012-10-19 17:26:46 -04:00
Connor Turland
bd396e93d8
fixed url of cards to not be 'localhost:3000'
2012-10-19 09:57:13 -04:00
Connor Turland
5784828931
changed the home view
2012-10-19 00:06:16 -04:00
Connor Turland
7d45a83776
added ability to delete items
2012-10-18 14:24:07 -04:00
Connor Turland
26c4e9cffc
fixed ability to edit topics
2012-10-18 09:33:16 -04:00
Connor Turland
3fa535b95b
initial commit
2012-10-17 21:01:23 -04:00
Connor Turland
775d97cdbb
initial commit
2012-10-17 20:51:54 -04:00
Connor Turland
c5d080b9a2
created new background
2012-10-14 21:23:50 -04:00
Connor Turland
606b59b644
updated graph styling and json generate code. updated add synapses page to not have all three forms in the same place.
2012-10-10 11:52:50 -04:00
Connor Turland
4d09fb6fc8
added ability to add synapses
2012-10-09 20:23:45 -04:00