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
|
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 |
|
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 |
|
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
|
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
|
ddf449502b
|
fix #145 - autocomplete widget fades out on topic creation
|
2013-03-07 20:09:18 -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
|
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
|
6bcb575578
|
added supporting files to mapping controller - could be reverted with no problems probably
|
2013-02-28 19:57:04 -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
|
195889e6fe
|
added clear canvas button back to topics view, including javascript code to back it up
|
2013-02-22 18:01:15 -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 |
|
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
|
35dd8c1816
|
partway to save to map functionality on topic view
|
2013-02-14 21:29:45 -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 |
|
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 |
|
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
|
9bc07b04fa
|
improved so many things
|
2013-01-25 00:47:32 -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
|
d2383e50db
|
make description field not have save/cancel buttons for best_in_place
|
2013-01-10 19:13:18 -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
|
a7d4debd02
|
added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller
|
2013-01-07 22:05:27 -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 |
|
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 |
|
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
|
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 |
|
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
|
168881ad86
|
changed 'find' to 'seek'
|
2013-01-04 21:45:47 -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
|
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
|
9f9061d908
|
made a few more detaily fixes
|
2013-01-02 23:01:38 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
5e1ec6ea26
|
added topic searching in the upper bar
|
2012-12-14 02:16:17 -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 |
|
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
|
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 |
|