Connor Turland
820096e853
merged raymons changes
2014-06-11 08:42:12 -04:00
Raymon Johnstone
6f2d19c570
Addition of scrollbar to search results
2014-06-10 17:41:34 -04:00
Connor Turland
a46d097da9
ability to switch metacode sets from mapping page
2014-06-04 15:24:16 -04:00
Connor Turland
f121661858
merge changes on user settings page
2014-05-30 09:25:29 -04:00
Raymon Johnstone
2a59d67d79
removed extra files
2014-05-17 16:10:44 -04:00
Connor Turland
48dc11b53d
added ability for an admin to add metacodes and metacode sets
2014-05-17 14:57:03 -04:00
Raymon Johnstone
dc6295328a
Fixed issue where setting your settings would log you out.
2014-05-15 18:28:30 -04:00
Raymon Johnstone
0e25fb4cdb
removed backup files as well as further mods for settings page
2014-05-14 16:51:16 -04:00
Connor Turland
8c1c4e3202
fixed registration issues
2014-03-03 10:28:16 -08:00
Connor Turland
72724c8da5
recently active maps
2014-03-03 01:11:04 -08:00
Connor Turland
19df96cb77
reworked logged in homepage
2014-03-03 00:25:47 -08:00
Connor Turland
2cf04f96cb
removed last_edited from map model, and set up code to update map updated_at column whenever certain events happen that update the map
2014-02-26 12:23:29 -08:00
Connor Turland
c9aea733ad
fixed explore maps floating left issue
2014-02-26 12:00:18 -08:00
Connor Turland
4362e4f126
set the background back to normal, fixed the user sign up issue
2014-02-26 11:53:20 -08:00
Connor Turland
d093ebeeba
adding tooltips, added maps topic appears on pages.
2014-02-20 17:22:13 -08:00
Robert Best
f721441f11
Update main_controller.rb
...
Made edits to what results end up in the @topics array... THis should add more results, and not exclude incorrectly... and I made the default to search the desc and the link text too.
I hope I have done the array manipulation right with:
@topics = @topics + (@topics2 - @topics)
2014-02-18 23:33:09 -05:00
Robert Best
7cff0fb6fe
Update main_controller.rb
...
Made the changes from earlier comments... mostly just adding '%' to many of the searches
2014-02-18 22:44:10 -05:00
Connoropolous
2fdcb5dcc5
Update main_controller.rb
...
realized these lines we're duplicated
2014-02-18 16:45:11 -08:00
Connoropolous
f9166119f3
Update topics_controller.rb
2014-02-15 09:52:56 -08:00
Robert Best
350df8a410
Update main_controller.rb
...
changes comments to be same as others
2014-02-13 22:46:13 -05:00
Robert Best
2050e137bf
Update topics_controller.rb
...
We were missing the .downcase on term, so no queries with a capital ever find a match
See !connor
2014-02-13 22:32:51 -05:00
Robert Best
7c28e20b00
Update main_controller.rb
...
I commented notifications to you connor with !connor.... I havent looked at how to sort better yet, but my markups should make the pre-sort results a little better
2014-02-13 22:22:01 -05:00
Connor Turland
f26d13fb5f
fixed best_in_place issue, fixed toolbar functionality
2014-02-10 19:32:05 -05:00
Connor Turland
4e8fc6fe06
added tips to cards
2014-02-10 01:29:02 -05:00
Connor Turland
5181c91aa7
restyled PAQ and Request pages.
2014-02-09 23:36:23 -05:00
Connor Turland
ac12c2a9ae
added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states
2014-02-09 18:54:45 -05:00
Connor Turland
1c49a805bd
removed more old files, styled request invite page
2014-02-07 18:13:51 -05:00
Connor Turland
ae46c27bec
started styling map forms
2014-02-05 12:37:21 -05:00
Connor Turland
4350c0df1b
added lightboxes
2014-02-05 00:03:44 -05:00
Connor Turland
6a63b1fe47
removed assets
2014-02-04 22:03:24 -05:00
Connor Turland
fdcee3ae40
synapse autocomplete working
2014-02-04 20:28:06 -05:00
Connor Turland
285c87ade7
configured for redistogo and uncommented realtime messages
2014-02-04 12:08:09 -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
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
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
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
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
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
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
eaa9ba4d88
formatting in synapses_controller
2013-02-28 21:46:08 -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
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
d325cb0088
renamed mapping_controller to mappings_controller
2013-02-28 20:08:55 -05:00
Devin Howard
101f49b9e6
added mapping_controller and routes, but only implemented create
2013-02-28 19:56:27 -05:00
Devin Howard
fcc1a6968c
lowercase in commons searching for topic names
2013-02-21 21:36:33 -05:00
Connor Turland
50bc2b53a9
added url for embedding maps
2013-02-19 09:44:43 -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
Connor Turland
a1c5a82ac4
fixed autocomplete bugginess, fixed synapse half opacity bug
2013-02-15 20:00:05 -05:00
Devin Howard
1ea2317ab4
nicer formatting on savelayout in maps_controller.rb
2013-02-14 22:36:08 -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
Devin Howard
dfa2b2eb83
merged in changes from github and merged with synapse editng code
2013-01-30 19:51:55 -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
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
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
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
e481dcd822
changed maps controller so it accepts synapses as a csv list
2013-01-07 22:04:53 -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
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
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
Connor Turland
76fd9b14da
added assets for staging
2013-01-05 17:50:40 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
967cbb3f51
t
2012-10-30 00:40:37 -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
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
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
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
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
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
4d09fb6fc8
added ability to add synapses
2012-10-09 20:23:45 -04:00
Connor Turland
452a86795e
added data graph visualization of synapses.
2012-10-08 23:18:00 -04:00
Connor Turland
9c0f12a55a
updated location styling and output. increased card size. made links open in new tabs. removed create account link. added ability to see list of your personal objects that you've added.
2012-10-08 01:45:44 -04:00
Connor Turland
a7d89bf798
fixed bug where wasn't setting person location on create. updated so that items don't change users when they're edited by someone else.
2012-10-03 21:54:21 -04:00
Connor Turland
66d13159f0
added ability to add parents and children to everything using the graphic interface
2012-09-29 23:45:14 -04:00
Connor Turland
f3ee998eee
set not authenticated to redirect to login
2012-09-23 21:38:26 -04:00
Connor Turland
ea7aa9815a
added edit abilities
2012-09-23 21:30:48 -04:00
Connor Turland
8f3164027b
added all files
2012-09-22 22:39:12 -04:00
