glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2400 commits 40 branches 27 tags 58 MiB
Commit graph

1543 commits

Author SHA1 Message Date
Devin Howard
32311e3610 fix has_many relationships in map & mapping models for rails 4 2015-12-03 16:57:22 -05:00
Devin Howard
8bf2eb31f3 remove old jquery-ui file 2015-12-03 16:57:22 -05:00
Devin Howard
371851cb89 remove attr_accessible 2015-12-03 16:57:22 -05:00
Devin Howard
8425e72101 fix filter bug 2015-11-30 10:01:33 +08:00
Devin Howard
8505d26182 search box css fixes 2015-11-28 23:03:48 +08:00
Devin Howard
6b6ad1b660 fix error with mapper search rendering 2015-11-28 22:07:57 +08:00
Devin Howard
3aaf501b03 fix up user model json output function 2015-11-28 21:51:28 +08:00
Devin Howard
9afc8bc7c4 refactor search css into scss for clearer organization, plus do some fixes to the typeahead css 2015-11-28 21:40:09 +08:00
Devin Howard
98e11c0a7d split search css out into its own file 2015-11-28 20:17:14 +08:00
Devin Howard
1f82238362 more fixes 2015-11-08 23:14:53 +08:00
Devin Howard
7136f46ec3 get autocomplete working again with new typeahead.js, but not the CSS 2015-11-08 22:53:34 +08:00
Devin Howard
fe0d38ec67 syntax error 2015-11-07 01:34:08 +08:00
Connor Turland
53de063bfc fix cannot set readonly property highlight 2015-11-07 01:33:18 +08:00
Connor Turland
03ab04050d switching metacode sets was being caught by Metamaps.Router.intercept 2015-11-07 01:33:18 +08:00
Connor Turland
3216106660 styling of the vertical tab selectors needed improvement 2015-11-07 01:33:18 +08:00
Connor Turland
e29ab4bca3 had to update because jquery ui version changed 2015-11-07 01:33:18 +08:00
Devin Howard
fa017a8559 sandi metz function simplification 2015-11-06 17:08:42 +08:00
Devin Howard
7ec7f9f892 fix #465, metacode sort problem 2015-11-04 17:22:46 +08:00
Connor Turland
86c467b2f1 current_user can be nil 2015-11-04 00:14:14 -05:00
Devin Howard
660ee52292 make invite link use REQUEST_URI 2015-11-03 22:22:53 +08:00
Devin Howard
8b456f5a31 css fixes for heroku 2015-11-03 21:10:05 +08:00
Devin Howard
62ae38e70d fix devise integration for rails 4 2015-11-03 20:56:50 +08:00
Devin Howard
6487202e6f remove secrets.yml stuff because it doesn't work with heroku 2015-10-30 14:30:24 +08:00
Devin Howard
e2a8e0331d fix references to Rails.application.secrets 2015-10-30 14:18:50 +08:00
Devin Howard
8e1ae0a1fc use secrets.yml to allow overriding config variables 2015-10-29 16:23:41 +08:00
Connor Turland
6e79b58e16 updated files to use amazon assets 2015-10-27 21:46:07 -07:00
Devin Howard
eea2bf30df fix 2015-10-27 18:16:35 +08:00
Devin Howard
43c851e6b4 does this fix missing-map.png? 2015-10-26 21:12:18 +08:00
Devin Howard
5ce460e967 metacode asset_path calls 2015-10-26 21:04:07 +08:00
Devin Howard
9916975e2e add highlight to typeahead 2015-10-26 21:01:13 +08:00
Devin Howard
fb848b29d5 bugfix 2015-10-26 20:41:37 +08:00
Devin Howard
9d6372c7b9 see if we can make missing-map.png show up 2015-10-26 20:16:49 +08:00
Devin Howard
b0327da649 try to fix custom metacode icon path 2015-10-26 18:28:25 +08:00
Devin Howard
20f4497064 whoops again 2015-10-26 12:39:40 +08:00
Devin Howard
06d06f8f55 whoops 2015-10-26 12:27:22 +08:00
Devin Howard
6c27623b80 change css files to use asset_data_uri 2015-10-26 12:22:40 +08:00
Devin Howard
6b8686c4e2 only run metacode.icon through asset_path if the path doesn't start with http 2015-10-26 12:12:07 +08:00
Devin Howard
6d4481979f woot fix metacodes 2015-10-26 11:53:54 +08:00
Devin Howard
0dbb37eaa4 metacodes#index map in asset_path 2015-10-25 17:14:56 +08:00
Devin Howard
fcd866c05e add asset_path calls 2015-10-25 16:50:07 +08:00
Devin Howard
da98a53a3e asset_path 2015-10-23 23:56:29 +08:00
Devin Howard
b00784731b remove binding.pry 2015-10-23 23:42:21 +08:00
Devin Howard
46dd54a1d7 asset_path in css erb files 2015-10-23 23:34:18 +08:00
Devin Howard
1670235172 change some css to erb 2015-10-23 23:19:25 +08:00
Devin Howard
837abbe9ee asset_path doesn't work in models 2015-10-23 23:09:14 +08:00
Devin Howard
d539846c61 asset_path 2015-10-23 23:06:24 +08:00
Devin Howard
2e51c3c118 syntax 2015-10-23 23:01:02 +08:00
Devin Howard
b070bb9e46 convert javascript to asset_path syntax 2015-10-23 22:56:09 +08:00
Devin Howard
ad47275f72 rename js files to js.erb files 2015-10-23 22:51:16 +08:00
Devin Howard
96871cadab brute force prevent nil synapse descriptions 2015-10-23 22:17:08 +08:00
Devin Howard
588b62b942 fix problem with mappings and forking maps 2015-10-23 22:07:44 +08:00
Devin Howard
63db41698e function naming 2015-10-23 21:04:16 +08:00
Devin Howard
ddfb3aa98f fix mapping problem 2015-10-23 21:03:49 +08:00
Devin Howard
85b3012cd9 fix a few more mappable/topic/synapse things in JS 2015-10-02 18:54:17 +08:00
Devin Howard
6d1e382d5c change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-10-02 16:32:16 +08:00
Devin Howard
69f4b8c645 migrate to polymorphic mappings - DB MIGRATION 2015-10-02 16:22:16 +08:00
Devin Howard
c80569a449 bg color on EXisting synapses heading 2015-10-02 15:53:06 +08:00
Devin Howard
120edfc278 fix typo + debug statements to make existingSynapse autocomplete work 2015-10-02 15:46:48 +08:00
Devin Howard
80b2b1876a deal with https://github.com/twitter/typeahead.js/issues/1195 2015-10-02 14:39:17 +08:00
Devin Howard
a51777b0ba working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-10-02 13:36:51 +08:00
Devin Howard
14eeb0cbe6 upgrade typeahead to 1.10 and new syntax 2015-10-01 14:55:26 +08:00
Devin Howard
d895bca1a4 code tweaks to searchsynapses 2015-10-01 12:33:38 +08:00
Devin Howard
b3b065e623 Revert "upgrade typeahead to allow new syntax" 
This reverts commit 347d77df82.
 2015-10-01 11:34:19 +08:00
Devin Howard
347d77df82 upgrade typeahead to allow new syntax 2015-10-01 11:14:25 +08:00
Devin Howard
b0efe6aea8 Merge branch 'develop' into rails4 2015-10-01 11:05:27 +08:00
Devin Howard
9e43cc2e96 dependent destroy models for topics/maps/synapses on mappings 2015-10-01 11:02:39 +08:00
Devin Howard
a9b034637b only autocomplete topic/synapse if the user types more than 2 characters 2015-09-30 13:55:23 +08:00
Devin Howard
8f8f40c0e4 replace the obvious spots with asset_path 2015-09-22 22:27:34 +08:00
Devin Howard
086acb09af select metacodes with one query instead of n queries, move logic to application_helper 2015-09-19 20:17:56 +08:00
Devin Howard
62035ed015 fix other controllers needing create/update changed for rails 4 2015-09-19 20:05:36 +08:00
Devin Howard
e14001061c fiddle with topic and mapping controllers so they work again 2015-09-19 20:01:44 +08:00
Devin Howard
31015295f8 fix best in place deprecation warnings in map info box 2015-09-19 17:11:48 +08:00
Devin Howard
6692c28965 delete_if threw errors, so convert things to arrays for it 2015-09-19 17:08:12 +08:00
Devin Howard
2f9b09db86 fix map/mapping associations that I broke 2015-09-19 16:48:24 +08:00
Devin Howard
c361349c20 add required params to all controllers 2015-09-19 16:26:34 +08:00
Devin Howard
a31a92b321 Merge branch 'develop' into rails4 2015-09-15 20:37:47 +08:00
Devin Howard
a8cef723a2 fix has_many relationships in map & mapping models for rails 4 2015-09-10 22:48:35 +08:00
Devin Howard
d67d098b2a remove old jquery-ui file 2015-09-10 22:40:45 +08:00
Devin Howard
dc51d0080e remove attr_accessible 2015-09-10 22:12:50 +08:00
Connor Turland
6767771d7d dont show the embedly share links 2015-08-03 14:12:47 -04:00
Connor Turland
5cd4db66c6 needed to update embedly 2015-08-03 14:02:30 -04:00
Connor Turland
499f6349e6 add ability for admin to delete any topics and synapses 2015-04-28 18:43:47 -04:00
Connor Turland
fb8c006be1 fixed small alignment bug on tooltips in firefox 2015-02-01 12:29:16 -05:00
Connor Turland
aec2a97704 fixed the alignment of the tutorial video links 2015-02-01 11:56:54 -05:00
Connor Turland
9ed0d412df .width() returned wrong result in firefox, causing the map to load with off dimensions 2015-02-01 11:50:22 -05:00
Connor Turland
531f09c6d3 active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time 2015-01-31 12:39:48 -05:00
Connor Turland
4d7695a767 this will clear up any remaining issues with urls ending up wrong 2015-01-30 21:08:37 -05:00
Connor Turland
4ca12c70ab explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow 2015-01-30 20:49:30 -05:00
Connor Turland
5cf75f3ea2 prevented map from loading before all metacode images were loaded 2015-01-30 00:09:45 -05:00
Connor Turland
670dd5d874 added user feedback, and moved the edge actually hiding into the if statement where it should be 2015-01-29 22:23:24 -05:00
Connor Turland
a048c87356 mapper who doesn't own a topic or synapse should not be able to delete it. 2015-01-28 22:35:03 -05:00
Connor Turland
5a31c91597 Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling 2015-01-28 21:39:33 -05:00
Connor Turland
5d9305fb11 adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded 2015-01-28 21:38:44 -05:00
Connor Turland
dbfc0e4f4d Merge pull request #380 from metamaps/bug-labelsDisappearing 
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
 2015-01-28 21:35:20 -05:00
Connor Turland
d2e9d87037 when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render 2015-01-28 21:04:00 -05:00
Connor Turland
bb99583622 updated embedly library, and data-card-chrome was now causing a breaking change 2015-01-28 19:19:07 -05:00
Connor Turland
0f526d1696 Merge pull request #376 from metamaps/bug-removeNodes 
maps were crashing when topics were removed
 2015-01-22 21:52:06 -05:00
Connor Turland
1b9dd6dc14 fix z-index for firefox 2015-01-22 21:42:45 -05:00
Connor Turland
595ff893f3 removed console logs 2015-01-22 21:42:21 -05:00
Connor Turland
263eef52ce maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events 2015-01-11 13:30:05 -05:00
Connor Turland
48cab05d7c Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2014-12-02 13:32:48 -05:00
Connor Turland
eece1446f2 added tutorial 2014-12-02 13:32:36 -05:00
poietic
8a8123c3c2 copy changes to homepage 2014-11-30 16:55:48 -08:00
poietic
9b415e4e6d fixed partners & supporters 2014-11-30 12:09:49 -08:00
poietic
44e98e00a7 fixed metacode file name 2014-11-30 11:57:06 -08:00
poietic
6a08d7e86f supported by 2014-11-30 11:53:44 -08:00
Connor Turland
bcf7edb880 changed other references to connoropolous/metamaps_gen002 to metamaps/metamaps_gen002 2014-11-30 14:27:20 -05:00
Connor Turland
f62efa0d68 fixed terms of service link for live site 2014-11-30 14:06:59 -05:00
Connor Turland
7548c1953f Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2014-11-30 13:52:32 -05:00
Connor Turland
ce7bec98ed fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo 2014-11-30 13:47:41 -05:00
poietic
2b7d70dfe8 changed metacodes 2014-11-29 21:12:07 -08:00
Bashar Jabbour
2aacd545ec solved text bolding issue on mac 2014-11-29 17:27:33 -05:00
Bashar Jabbour
b883d03b4e make synapse card mapper icon link to mapper profile 2014-11-29 16:36:57 -05:00
Bashar Jabbour
12dd2f32b4 fixed conflict 2014-11-29 16:28:42 -05:00
Bashar Jabbour
0e3486ddc5 make topic card mapper icon link to mapper profile 2014-11-29 16:27:43 -05:00
Connor Turland
411efa9692 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 16:06:04 -05:00
Connor Turland
694d36b6a6 ctrl+click doesn't zoom awkwardly 2014-11-29 16:05:56 -05:00
Bashar Jabbour
10dedaa169 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-29 15:57:42 -05:00
Bashar Jabbour
ce3ab9903a make map contributor list dropdown into links to profiles 2014-11-29 15:56:38 -05:00
Devin Howard
8b146fccab Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 2014-11-29 15:53:53 -05:00
Devin Howard
739eba71bb only one router setTimeout function at a time - make it erase old functions if new one 2014-11-29 15:51:31 -05:00
Connor Turland
93227f0e2f fixed synapse selection and removal of multiple topics bugs 2014-11-29 15:36:03 -05:00
Devin Howard
fe3d280862 remove console.log from Connor 2014-11-29 15:29:16 -05:00
Devin Howard
5f347bff67 remove console.logs whoops 2014-11-29 15:24:34 -05:00
Devin Howard
453758a9ff use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/<mapid> 2014-11-29 15:23:53 -05:00
Connor Turland
f938ffade3 homepage changes 2014-11-29 12:25:11 -05:00
Connor Turland
0f0db1662e one semicolon 2014-11-29 11:34:20 -05:00
Connor Turland
e3bf41b133 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 11:26:55 -05:00
Connor Turland
da087a4c72 css for lightbox links 2014-11-29 11:26:47 -05:00
poietic
6ae98169e0 box shadow for lightboxes 2014-11-29 08:20:17 -08:00
Connor Turland
f9d3292891 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 11:17:33 -05:00
Connor Turland
f02aa53637 fixed feedback tab, added support us button 2014-11-29 11:17:11 -05:00
poietic
99b0fa0c68 links in light boxes 2014-11-29 08:06:12 -08:00
Connor Turland
09d8fbacb6 disabled tutorials tab for now 2014-11-29 10:51:27 -05:00
Connor Turland
9f65fffe5f showed help button on logged in home page 2014-11-29 10:24:57 -05:00
Connor Turland
61c6c8c5c1 added empty canvas helper message 2014-11-29 10:18:18 -05:00
Connor Turland
cb3db06406 switched home page to active maps instead of my maps 2014-11-29 01:37:06 -05:00
Connor Turland
870b4e2829 hid elements from homepage 2014-11-27 21:45:04 -05:00
Connor Turland
da6a7aadfb fixed synapse creation. replaced homepage bg image 2014-11-27 21:32:04 -05:00
Connor Turland
0e3393e1b5 fixed metacode select lists to be flexible to metacodes 2014-11-27 18:10:17 -05:00
Connor Turland
caa80c067b links to maps go through without refresh from topic card. 2014-11-27 17:27:22 -05:00
poietic
6408f81d08 updated feedback & partner logo images 2014-11-27 12:10:38 -08:00
Bashar Jabbour
a284889593 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-27 15:02:58 -05:00
Bashar Jabbour
78743fbba5 updated the tooltip of maps topic appears in 2014-11-27 15:02:44 -05:00
poietic
47b5e9c288 fixed search alignment & drop shadow 2014-11-27 11:56:45 -08:00
Connor Turland
7cc6fb6c2d added right click keyboard shortcuts and spacer/border 2014-11-27 11:21:25 -05:00
Connor Turland
f6fdd72cf8 fixed sign in form to use correct size for anonymous user image 2014-11-26 16:49:56 -05:00
Connor Turland
2829005d4e Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 16:37:50 -05:00
Connor Turland
377138c483 fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions 2014-11-26 16:37:13 -05:00
Bashar Jabbour
363ca365c1 added tooltip to see topics synapses 2014-11-26 15:23:32 -05:00
Connor Turland
ab53e996d4 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 14:49:16 -05:00
Connor Turland
36aeead2aa homepage updates. updated the 'last updated' text. fixed map cards 2014-11-26 14:49:01 -05:00
Bashar Jabbour
814a804dd8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-26 14:44:42 -05:00
Bashar Jabbour
085bf78b0e added tooltip for maps that topic appears in 2014-11-26 14:44:31 -05:00
Connor Turland
a003e203af big home change revisions. not 100% complete 2014-11-26 12:58:20 -05:00
Connor Turland
dbf4152a81 updated map delete sprite 2014-11-26 10:51:05 -05:00
Connor Turland
d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -05:00
Connor Turland
e9114a309f fixed up map info box issues, finished up search tooltips 2014-11-23 22:28:29 -05:00
Bashar Jabbour
b077dd6010 added tooltip in search results for map 2014-11-22 23:05:31 -05:00
Bashar Jabbour
13118d0ea9 fixed firefox synapse card styling 2014-11-22 20:49:59 -05:00
Bashar Jabbour
7bf87c7a4b fixed label placement on safari 2014-11-22 20:04:23 -05:00
Bashar Jabbour
5725007e78 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-22 19:35:15 -05:00
Bashar Jabbour
23510f2f87 added user image stack for map search results and associated tooltip 2014-11-22 19:35:03 -05:00
Connor Turland
c1728b9ecb fixed mouse mappings 2014-11-22 16:47:09 -05:00
Connor Turland
2de697bcca ensured that new users can sign up with other new users invite codes 2014-11-21 17:24:08 -05:00
Connor Turland
a9e488d9cb NOTE: rake db:migrate required. added generation column to users 2014-11-21 16:50:42 -05:00
Connor Turland
0ebc3dbc37 filter and realtime button active states. zoomExtents excludes filtered topics 2014-11-21 15:45:44 -05:00
Connor Turland
e9a39f9838 made map contributors toggle visibility on click 2014-11-20 22:50:47 -05:00
Connor Turland
a20f6b760f finished up map info box in terms of dynamically switching pages to other maps. styled other tips. 2014-11-19 22:42:14 -05:00
Connor Turland
2fe33f0f57 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-19 13:02:02 -05:00
Bashar Jabbour
0d709cecac updated the map contributors tooltip to match pseudo css 2014-11-18 23:24:43 -05:00
Connor Turland
604b01ba7d Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-18 20:48:05 -05:00
Connor Turland
d48bf872e4 updated user image to square one in topic helper 2014-11-18 20:47:54 -05:00
Bashar Jabbour
c4de02a958 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-18 14:50:17 -05:00
Bashar Jabbour
818042aeae added tooltip of map contributors in mapinfo lightbox 2014-11-18 14:48:50 -05:00
Connor Turland
4831307fe7 fixed user image proportions in synapse autocomplete 2014-11-16 15:22:29 -05:00
Connor Turland
fe5d682fc2 finished synapse autocomplete styling 2014-11-16 15:17:32 -05:00
Connor Turland
7182996134 removed other sidekiq stuff. 2014-11-16 12:39:41 -05:00
Connor Turland
951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -05:00
Connor Turland
23d5527adc lots of little fixes 2014-11-15 17:43:24 -05:00
Connor Turland
2cf91d39b4 another test for uservoice auto signout. this time with iframe and json 2014-11-14 21:19:14 -05:00
Connor Turland
beb05f1f39 another test for uservoice auto signout. this time with iframe 2014-11-14 21:11:51 -05:00
Connor Turland
dc37b280e1 another test for uservoice auto signout 2014-11-14 21:03:24 -05:00
Connor Turland
e0c9aba857 auto sign out of uservoice 2014-11-14 20:54:51 -05:00
Connor Turland
4e8dabba36 removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code 2014-11-14 20:21:16 -05:00
Connor Turland
ac40c0af48 touched up tooltips 2014-11-14 08:21:09 -05:00
Bashar Jabbour
508fc5c481 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-13 15:41:35 -05:00
Bashar Jabbour
79c5b88547 contributor tooltip styling 2014-11-13 15:41:24 -05:00
poietic
73fe5607db metacode icons 2014-11-12 18:52:05 -08:00
Bashar Jabbour
78455c6a35 Added capture screenshot tooltip 2014-11-12 13:40:00 -05:00
Bashar Jabbour
02d49c166a upated tooltips 2014-11-12 13:36:41 -05:00
Metamaps
842313bb07 updated the tooltips 2014-11-12 13:31:15 -05:00
poietic
a5aaa4ef3d added open data icons 2014-11-11 12:28:24 -08:00
Connor Turland
5175028ec1 added image for 'center topic' and 'get siblings' 2014-11-11 07:51:02 -05:00
Connor Turland
f1135854a0 fix for when mappings are corrupt 2014-11-11 07:23:44 -05:00
Connor Turland
8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland
534bdae495 little lightbox fix 2014-11-11 02:27:34 -05:00
Connor Turland
7a9f737fdb Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-11 02:23:48 -05:00
Connor Turland
9b0304c403 added filtering back to topic view 2014-11-11 02:23:39 -05:00
poietic
c285f53a57 added link to our collaborative spaces 2014-11-10 18:27:38 -08:00
poietic
cfe2ef9adb couple more tweaks. 2014-11-10 17:05:37 -08:00
poietic
1658c5fb5d lightbox content tweaks 2014-11-10 17:02:07 -08:00
Connor Turland
3bb8256f8f updated missing map image. added topic description signifier and relocated topic link signifier to top left. added synapse count signifier. 2014-11-10 17:58:15 -05:00
Connor Turland
20a6a9f443 another attempt at cross origin 2014-11-10 11:20:56 -05:00
Connor Turland
218716dee3 fixed cross origin image draw, so that canvas.toDataURL can work 2014-11-10 11:06:57 -05:00
Connor Turland
4adf0081b8 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-09 22:10:21 -05:00
Connor Turland
44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -05:00
poietic
0058002e02 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-11-08 21:59:17 -08:00
poietic
4437270a6b misc css tweaks 2014-11-08 21:52:46 -08:00
Connor Turland
d73fa37f57 tweaked donate and get involved html 2014-11-08 15:00:12 -05:00
Connor Turland
f124bcfdf3 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-08 14:08:05 -05:00
poietic
ea689f182c added Donate lightbox! more content changes 
of about, get involved sections
 2014-11-06 12:42:26 -08:00
Connor Turland
af65f8cb47 reset JIT for working with chrome and safari 2014-11-05 16:25:10 -05:00
Connor Turland
22695e53b8 restored graph plotting to normal 2014-11-05 15:47:43 -05:00
Connor Turland
dc4392ee95 trying requestAnimationFrame 2014-11-05 14:41:49 -05:00
Connor Turland
7193d2a386 fixed small render node issue 2014-11-05 13:26:14 -05:00
Connor Turland
b7ecf4ca8c added star to edges to indicate that there's multiple synapses there 2014-11-05 11:41:26 -05:00
Connor Turland
0b7702062f added little link icon next to metacode to indicate a link within a topic 2014-11-05 11:01:18 -05:00
Connor Turland
3b2e23b1e0 removed flicker from topic creation 2014-11-05 10:09:37 -05:00
Connor Turland
2bbe2b8eff improvements to realtime 2014-11-04 21:27:40 -05:00
Connor Turland
c5907914e3 fixed user images, set up map updates for realtime 2014-11-04 12:37:17 -05:00
Connor Turland
28fb9a8bae little fix for profile picture uploading 2014-11-04 08:52:45 -05:00
Connor Turland
6a052f9ea1 added loading icon to account page while image uploads 2014-11-03 21:59:15 -05:00
Connor Turland
4646bf9668 client side image crop for profile pics 2014-11-03 21:26:08 -05:00
Connor Turland
6ecdd1076e topic card description overflow improvement, handle invalid links in topic card 2014-11-03 17:48:02 -05:00
Connor Turland
ee1ca7853f removed embed. fixed switch metacode set lightbox overflow. disabled topic creation and topic deletion from public maps by non-owner 2014-11-03 08:46:22 -05:00
Connor Turland
2a9a27c6c5 stops user from creating map with empty name, or topic with empty name. sets max length on topic name. allows enter key to create map 2014-11-02 16:04:53 -05:00
Connor Turland
3bebc62873 blocked empty topic creation with message to add title 2014-11-02 14:59:23 -05:00
Connor Turland
7805871ec2 made IE lightbox auto display when on IE 2014-11-02 14:32:42 -05:00
Connor Turland
fed09404e6 fixed firefox add topic bug 2014-10-28 12:46:56 -04:00
Connor Turland
12e65c638b changes for reset password form 2014-10-27 18:24:30 -04:00
Connor Turland
33202b5243 checking cheatsheet content 2014-10-27 17:37:42 -04:00
Connor Turland
8b97c098f7 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-10-27 17:34:28 -04:00
Connor Turland
c35174a99e removed extraneous typekit codes 2014-10-27 17:34:15 -04:00
poietic
ad2a02bb8c removed extra div 2014-10-27 13:43:06 -04:00
poietic
e898633d69 updated shortcuts + user actions. 2014-10-27 13:42:15 -04:00
Connor Turland
acfd55a258 add authorize to delete to controller, fix private map message, fix new map css issue 2014-10-27 13:26:24 -04:00
Connor Turland
f58db49bc1 realtime 2014-10-27 12:03:55 -04:00
Connor Turland
cbf71ca2da four little styling bugs 2014-10-24 12:10:56 -04:00
Connor Turland
1aaecd0a8f improved sign up error display, fixed styling for firefox, fixed page stuck on loading spinner bug 2014-10-24 11:30:26 -04:00
Robert Best
852f62f85e Fixed single synapse selection 
Synapses were not being selected when simply clicked on.
 2014-10-23 17:01:34 -04:00
Connor Turland
c6195956ca fixed topright sprite and fixed typekits for develop 2014-10-22 21:32:38 -04:00
Connor Turland
6af8a13c6f Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-10-22 21:09:08 -04:00
poietic
3a8e0c08a6 changed order of "delete, remove, hide from map" 2014-10-22 21:06:42 -04:00
Connor Turland
fdfa720849 fixed ga code, and updated topright_sprite image with one that doesn't have littl glitches 2014-10-22 21:04:28 -04:00
poietic
875f37c480 changed order of "delete, remove, hide from map" 2014-10-22 20:48:01 -04:00
poietic
89b6305be8 updated bitcoin widget with correct wallet info 2014-10-22 17:07:41 -04:00
Connor Turland
49c0af3add Merge pull request #371 from Connoropolous/wip-MouseStuff 
Changes to Mouse Functionality
 2014-10-22 11:34:51 -04:00
Robert Best
7e6092070a Update JIT.js 
Commented out the console logs for now.
 2014-10-22 09:41:21 -04:00
Robert Best
ba2888420e Update Metamaps.JIT.js 
Commented out the console logs for now.
 2014-10-22 09:39:14 -04:00
Connor Turland
a7328526a8 got profile picture uploading working, as well as profile picture removing, as well as password changing 2014-10-21 20:31:59 -04:00
Raymon Johnstone
4db8dd90a2 Changed a bunch of mouse functionality mappings. LeftDrag+CTRL+SHIFT to zoom to box (Or rightDrag + CTRL). The rest of left dragging is for selection 2014-10-18 20:28:16 -04:00
Raymon Johnstone
6840d69747 lightboxes and stylesheet changes 2014-10-18 13:56:45 -04:00
Connor Turland
fbfe695998 adding topics to map from search results happens in a spiral 2014-10-16 23:54:26 -04:00
Connor Turland
1cceaceb06 cannow handle multiple metacodes with same names 2014-10-16 21:03:11 -04:00
Connor Turland
0449e28177 right click menus position nicely 2014-10-15 19:32:15 -04:00
Connor Turland
79daaf705b made metacode selecct for topic card always accessible, for when you move the card near the right or bottom of screen 2014-10-15 18:25:31 -04:00
Connor Turland
e43b7fca87 one small fix for hiding 'share map' on map info box viewing a private map 2014-10-14 23:58:05 -04:00
Connor Turland
d9c01db056 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 23:45:39 -04:00
Raymon Johnstone
bbbbe57c1b new library 2014-10-14 23:43:25 -04:00
Connor Turland
86bd12ca09 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 23:20:46 -04:00
Connor Turland
c37c846fbd ensured map info box action buttons only show at proper times. enabled deletion of maps 2014-10-14 23:20:40 -04:00
Raymon Johnstone
a9414c29d2 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-14 23:20:20 -04:00
Raymon Johnstone
3c7db77395 backing up bitcoin 2014-10-14 23:19:58 -04:00
Connor Turland
bfc8c796c7 border radius for map card images 2014-10-14 17:00:17 -04:00
Connor Turland
0ebb02bc0b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-14 16:34:26 -04:00
Connor Turland
f9f147304f styling for map info box mostly complete 2014-10-14 16:34:09 -04:00
Raymon Johnstone
0e5e814065 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-13 23:21:53 -04:00
Raymon Johnstone
b1ae75a896 updates to all walkthroughs about the fact that we now use rails 2.1.2 as well as a couple changes to the get involved lightbox 2014-10-13 23:18:25 -04:00
Connor Turland
51221ee3f7 improvements to map info card, as well as small changes to the permission changers in the topic and synapse cards 2014-10-13 19:27:30 -04:00
Connor Turland
e17cfb4f12 border radius for map created prompt 2014-10-11 23:08:31 -04:00
Connor Turland
cd4474a0f0 created map prompt 2014-10-11 22:49:44 -04:00
Connor Turland
fcdc6d57b2 setup for automatic config for urls 2014-10-10 21:24:31 -04:00
Connor Turland
7e182b8beb figured out phantom? 2014-10-08 03:24:08 -04:00
Connor Turland
c90721ad5c nothing 2014-10-08 02:34:17 -04:00
Connor Turland
51cb54a6e0 no change" 2014-10-08 02:21:32 -04:00
Connor Turland
841e6fb3ab update phantom settings 2014-10-08 00:47:17 -04:00
Connor Turland
cde771e007 got map screenshot working decent 2014-10-08 00:07:54 -04:00
Connor Turland
4f94f44a1f Merge branch 'wip-phantomjs' of https://github.com/Connoropolous/metamaps_gen002 into phantom 2014-10-07 21:30:42 -04:00
Connor Turland
84d926149c removed barometer.js 2014-10-07 21:30:25 -04:00
Devin Howard
68e1a8042a Added animationDone event to Metamaps.JIT.js, tried to hook into it from phantomjs, failed 
still have debugging stuff in this commit. it's currently rendering the image so I can check output

It doesn't seem to be responding to the event, and it's stopped hiding the UI elements around the edge
 2014-10-07 20:25:45 -04:00
Connor Turland
cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00
Connor Turland
db3a4b66ad fixed issue that others might end up having with sso_key 2014-10-07 19:14:25 -04:00
Devin Howard
c6c05085ad Added phantomjs script to save an image - this doesn't totally work yet, it has a error with famous 
Added worker process to call the phantomjs script in app/workers
Added hook in models/map.rb to call the worker
Added calls to map.touch in mappings_controller.rb so it would get triggered correctly - I'm not sure how this will proceed moving forward
 2014-10-07 19:11:55 -04:00
Connor Turland
a8d173ff1d made http protocol for uservoice redirect consistent 2014-10-07 18:49:14 -04:00
Connor Turland
9a250d0034 got redirect for single sign on with uservoice working 2014-10-07 18:38:33 -04:00
Connor Turland
d4c481aac0 internet explorer get browser links open in new tabs 2014-10-07 17:57:12 -04:00
Connor Turland
e756b29baa Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 17:46:34 -04:00
Connor Turland
629a6a4172 fixed sign in redirects 2014-10-07 17:46:09 -04:00
Bashar Jabbour
c8bda1bdf1 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 16:14:14 -04:00
Bashar Jabbour
8a70d209d1 fixed the links in noIE lightbox 2014-10-07 16:14:00 -04:00
Connor Turland
9ba6daec90 further fixed uservoice to identify user 2014-10-07 15:39:11 -04:00
Connor Turland
6eec187eee Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-07 15:19:30 -04:00
Connor Turland
b5068b6bc4 finalized uservoice config 2014-10-07 15:19:10 -04:00
Bashar Jabbour
e3c677fa5b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-07 14:47:18 -04:00
Bashar Jabbour
e405cc5a5d updated the noIE lightbox 2014-10-07 14:47:06 -04:00
Raymon Johnstone
fbdef0108e Merge commit 'stash' into develop 2014-10-07 12:39:43 -04:00
Raymon Johnstone
3cb5c4ce3a index on develop: d30417f fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-07 12:39:14 -04:00
Connor Turland
f591baf4c9 ability to switch between multiple synapses between two topics 2014-10-05 18:39:07 -04:00
Connor Turland
ecc2ee9fea fixes #347. changes ctrl-r for remove from map to ctrl-m 2014-10-05 14:27:16 -04:00
Connor Turland
5c05c6bb83 404 page updates, synapse card 90% 2014-10-05 13:58:05 -04:00
Connor Turland
ad2d79a7ea Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-05 09:44:28 -04:00
Robert Best
ef39443eb0 Relocated keyboard shortcut code to Metamaps.Listeners.... Then added CTRL+ R , +H, and +D shortcuts for remove, hide and delete 2014-10-05 01:03:54 -04:00
Connor Turland
509e9dd6f0 heroku 2014-10-04 00:17:00 -04:00
Connor Turland
d30417f958 fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar 2014-10-04 00:15:47 -04:00
Connor Turland
fae7f9996d Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-03 11:26:49 -04:00
Bashar Jabbour
cad8af2c1f updated the cheatsheet 2014-10-02 22:33:28 -04:00
Bashar Jabbour
6785a61fd0 updated 404 page 2014-10-02 15:55:51 -04:00
Connor Turland
10e5228488 finalized cheatsheet move help button back into the corner 2014-10-01 23:41:39 -04:00
Bashar Jabbour
80221f1dd4 small updates to colophone 2014-10-01 23:25:49 -04:00
Bashar Jabbour
b70681ea6e updated the 404 page 2014-10-01 23:21:05 -04:00
Shai Mor
1a4330ec19 metamaps support resources links 2014-10-01 22:55:59 -04:00
Bashar Jabbour
179cee8456 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 20:43:23 -04:00
Bashar Jabbour
8caabb6ce1 update the colophone page 2014-10-01 20:43:11 -04:00
Connor Turland
9169293323 small fix for minimizing search results 2014-10-01 20:00:03 -04:00
Connor Turland
eb57e555e9 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-10-01 19:52:14 -04:00
Connor Turland
b6700f77f8 synapse fixes 2014-10-01 19:52:08 -04:00
Shai Mor
ff4a64665e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-10-01 18:09:15 -04:00
Shai Mor
4ba9a26c2b style sidebar search mapper stats 2014-10-01 18:07:05 -04:00
Connor Turland
a1925b3573 heroku 2014-10-01 17:20:02 -04:00
Connor Turland
b577f4fd19 improved z-indexes 2014-10-01 17:15:35 -04:00
Connor Turland
999dae34ea switched add link section on topic card to be without upload file for now 2014-10-01 16:44:11 -04:00
Connor Turland
8ef56735bf switch metacode set styling complete 2014-10-01 16:23:59 -04:00
Bashar Jabbour
427fa99a0c Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-10-01 15:15:43 -04:00
Connor Turland
a382e0c35d account page image border radius, fixed filters not working on first click issue 2014-10-01 14:07:48 -04:00
Connor Turland
031f97ba42 search results styling 2014-10-01 13:18:24 -04:00
Shai Mor
db719abf0f merge with develop 2014-10-01 09:57:40 -04:00
Shai Mor
57fb6a15c4 start on search results styling, pulled in external js libraries and css 2014-10-01 09:54:56 -04:00
Connor Turland
eccc433627 fixed realtime bug where couldn't populate filters because it was missing a new mapper model that just added something 2014-09-30 18:13:49 -04:00
Connor Turland
81f31ea10e heroku 2014-09-30 16:59:19 -04:00
Connor Turland
86e78919b3 initial code for realtime, got new topic, new synapse, and topic drag working 2014-09-30 16:55:25 -04:00
Bashar Jabbour
bf36c31e4d Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 2014-09-30 15:51:28 -04:00
Bashar Jabbour
bc59c282a7 fixed the google analytics tracking code 2014-09-30 15:34:35 -04:00
Connor Turland
c1885615cd remove tilda file 2014-09-29 22:26:50 -04:00
Connor Turland
2138aa89f3 closes #368. ability to add in metacode colors 2014-09-29 22:26:12 -04:00
Connor Turland
f14bdfac57 fixed error in _filterBox that was causing maps not to load when a synapse had a nil description. for real this time 2014-09-29 16:50:41 -04:00
Connor Turland
f9a24058aa fixed error in _filterBox that was causing maps not to load when a synapse had a nil description 2014-09-29 16:45:59 -04:00
Connor Turland
2d2f98373e fixed error in _filterBox that was causing maps not to load when a synapse had a nil description 2014-09-29 16:41:16 -04:00
Connor Turland
06f18215dd bug fixes for mapping experience. able to store multiple references to synapses on each edge 2014-09-29 16:04:36 -04:00
Connor Turland
96d883bde7 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-29 10:45:15 -04:00
Connor Turland
2b16123a4f fixed field type error on user edit form 2014-09-29 10:45:08 -04:00
Robert Best
2de7167c2c A bunch of fixes for selection with box, and zoom to extents 2014-09-28 15:29:22 -04:00
Robert Best
66ee35e364 Fixed merge conflicts with wip-zoomextents code 2014-09-26 23:34:27 -04:00
Robert Best
0160f56238 partially finished fixes to zoomextents 2014-09-26 22:40:31 -04:00
Connor Turland
32908c7717 style changes for account pages 2014-09-26 22:31:06 -04:00
BasharJabbour
14eb7562b1 fixed edit user account page 2014-09-26 08:42:11 -04:00
Connor Turland
c46ab1a98b added hover to edit photo 2014-09-25 13:41:37 -04:00
Connor Turland
71247a8f04 fixes for account pages 2014-09-25 13:26:09 -04:00
Connor Turland
3f901074ec Merge branch 'forgetpass' of https://github.com/Connoropolous/metamaps_gen002 into accounts 2014-09-25 12:31:29 -04:00
BasharJabbour
6f62d59b66 Sign In, Sign Up, Edit User pages have been changed. Edit User page needs lots of work still. 2014-09-25 12:25:46 -04:00
Connor Turland
c817622984 for heroku 2014-09-24 17:15:39 -04:00
Connor Turland
265295a8a8 added color generator for each collaborator 2014-09-24 17:14:46 -04:00
Shai Mor
4ec9c4cb98 add zoom and pas events for multiple peers and label direction for compassCollab 2014-09-24 16:25:22 -04:00
Connor Turland
74b4659836 broke out functionality for positionPeerIcon from updatePeerCoords 2014-09-24 14:05:18 -04:00
Shai Mor
d5598819fd add arrowCompass for collab: direction indication of other users on the map 2014-09-24 11:00:22 -04:00
Connor Turland
b163442163 collab compass nowrap 2014-09-24 08:45:46 -04:00
Connor Turland
58ff70717e heroku 2014-09-23 10:37:08 -04:00
Connor Turland
dd6a21191a heroku 2014-09-22 23:56:47 -04:00
Connor Turland
c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-22 23:42:37 -04:00
Connor Turland
aaf2e4c521 right click styling 2014-09-22 23:42:26 -04:00
Shai Mor
1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor
d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Bashar
5e76b44b80 centered reset password box 2014-09-21 20:47:09 -04:00
Connor Turland
ff6eef7807 synapse form styling and positioning 2014-09-21 01:02:21 -04:00
Connor Turland
90e974164d added more resources into help lightbox 2014-09-20 15:11:58 -04:00
Connor Turland
ac867d00ab m 2014-09-18 02:39:00 -04:00
Connor Turland
683b459eeb Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-18 02:33:44 -04:00
Connor Turland
af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Shai Mor
0bf28410e6 switch metaset view changes 2014-09-17 10:59:36 -04:00
Connor Turland
f62ca67d9f prevent self showing up on realtime problem 2014-09-15 22:04:44 -04:00
Connor Turland
b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland
6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-12 15:07:52 -04:00
Shai Mor
b722dc911b help qr tutorials 2014-09-12 11:45:53 -04:00
Connor Turland
0941b43391 fixed spacing on abuot lightbox 2014-09-11 08:39:56 -04:00
Connor Turland
30d82ba870 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-11 08:35:29 -04:00
Connor Turland
90f2477566 fixed map update controller 2014-09-11 08:35:16 -04:00
Shai Mor
f49f45e856 about, invite, getInvolved 2014-09-10 18:12:21 -04:00
Shai Mor
23385a946e Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into develop 2014-09-10 16:32:36 -04:00
Shai Mor
f91728cdb6 get involved lightbox styling 2014-09-10 16:32:18 -04:00
Connor Turland
4f8a8e2fde for heroku 2014-09-10 15:18:20 -04:00
Connor Turland
3d35d44c3f realtime improvement 2014-09-10 15:17:43 -04:00
Connor Turland
ac8c589a77 config for heroku 2014-09-10 15:07:34 -04:00
Connor Turland
28bfb8ac21 better architecture for entering and exiting maps from the home page 2014-09-10 15:06:39 -04:00
Connor Turland
3a7501cc7a merge shai's changes 2014-09-09 18:20:17 -04:00
Connor Turland
d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Shai Mor
d18806bb18 merge in connors css 2014-09-09 15:17:49 -04:00
Shai Mor
4f85055c74 styled create map forms 2014-09-09 15:13:53 -04:00
Connor Turland
901c028d52 configure for heroku 2014-09-03 19:07:45 -04:00
Connor Turland
eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland
1ccaccdb32 small css syntax fix 2014-08-26 23:01:08 -04:00
Connor Turland
fdf0c28daf sprites 2014-08-26 22:51:50 -04:00
Connor Turland
f6245df997 added 20 at a time loading for explore maps pages 2014-08-20 15:37:18 -04:00
Connor Turland
2d338bb785 fixed right click menu and also added change metacodes to it 2014-08-19 14:13:45 -04:00
Connor Turland
1557c7d4e9 config for heroku 2014-08-18 12:41:49 -04:00
Connor Turland
7df57cd013 feedback tab and explore maps pages styling 2014-08-18 12:40:51 -04:00
Connor Turland
ff03fb19a1 adding a few icons 2014-08-18 11:17:01 -04:00
Connor Turland
45828d048e added some of the icons 2014-08-17 14:46:07 -04:00
Robert Best
b15da256fa Included title box size in zoom to extents and put a limits on the zooming 2014-08-16 12:46:06 -04:00
Connor Turland
5cfbb82760 configured for local dev 2014-08-15 22:46:36 -04:00
Connor Turland
987f3c3ab5 added first pass ishans icons, removed old unnecessary icons 2014-08-15 18:27:40 -04:00
Connor Turland
6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland
46380a17e0 got maps wrapper working 2014-08-12 19:20:46 -04:00
Connor Turland
6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Connor Turland
35835fcc80 fixed home page difference between being logged in and logged out 2014-08-12 13:45:29 -04:00
Connor Turland
6bdc6ec397 fix for filtering when no edge or node is returned from the topic or synapse 2014-08-12 13:30:56 -04:00
Connor Turland
c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse 2014-08-12 13:22:29 -04:00
Shai Mor
304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-12 12:56:20 -04:00
Shai Mor
f8e6be70e1 fixed topic card css 2014-08-12 12:56:13 -04:00
Connor Turland
173179d682 fixed filters, updated ruby models further for returning json 2014-08-12 12:01:01 -04:00
Connor Turland
f0eb4da6a9 realtime for heroku 2014-08-12 11:10:32 -04:00
Connor Turland
e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -04:00
Connor Turland
9d6cf2c3c8 further improved explore maps switching 2014-08-11 22:47:38 -04:00
Connor Turland
5627b59d59 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-11 22:31:44 -04:00
Connor Turland
278b6213bb improved explore maps pages 2014-08-11 22:31:28 -04:00
Shai Mor
65c8cb2ea7 embed attachments 2014-08-11 21:59:02 -04:00
Shai Mor
3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland
bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor
4541196ffe part way through add links to topic cards 2014-08-11 18:56:03 -04:00
Shai Mor
85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland
f4cbd9b25d added background 2014-08-11 12:12:46 -04:00
Connor Turland
995d49a5bd reseting the filter box when you switch dynamically between maps 2014-08-11 12:04:06 -04:00
Connor Turland
22e07e4ca8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-11 11:03:08 -04:00
Connor Turland
8bc1e0c9ee added background file 2014-08-11 11:03:00 -04:00
Connor Turland
39140a06e6 moved famous files 2014-08-10 19:52:39 -04:00
Connor Turland
34500b3255 little fix for Util.splitLine 2014-08-10 19:44:53 -04:00
Connor Turland
b596228782 restructuring for famous 2014-08-10 19:35:18 -04:00
Connor Turland
465b95753c reorganize for functional famous operation 2014-08-10 19:24:39 -04:00
Connor Turland
8fdae123d2 application.css issue 2014-08-10 19:17:32 -04:00
Connor Turland
afed3657c2 removed vendor plugins 2014-08-10 19:15:01 -04:00
Connor Turland
341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Shai
6182ba4e14 data validation 2014-08-10 16:52:49 -04:00
Connor Turland
a90eb90822 small fixes in backbone 2014-08-10 16:20:21 -04:00
Connor Turland
bc593fe614 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-10 13:07:27 -04:00
Connor Turland
06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Robert Best
a9fc2f19f4 Added zoom to selected nodes feature 2014-08-07 08:21:13 -04:00
Connor Turland
d14d505c3a pulling in Connors work on routers 
Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new
 2014-08-06 10:16:53 -04:00
Connor Turland
fe3536e20b remove console log 2014-08-06 10:16:43 -04:00
Connor Turland
e9863c0192 merge with Robs changes 2014-08-06 10:14:17 -04:00
Connor Turland
e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -04:00
Robert Best
f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() 2014-08-06 04:22:06 -04:00
Tadasu85
9cab20dc2a Merge robs changes 
Merge remote-tracking branch 'origin/develop' into new
 2014-08-04 12:21:09 -04:00
Tadasu85
e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Robert Best
c7b768d7f4 Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes 2014-08-03 18:34:22 -04:00
Tadasu85
581ba8b78f Merge remote-tracking branch 'origin/develop' into new 2014-08-02 13:51:54 -04:00
Tadasu85
2b267ea0c6 filterbox progress 2014-08-02 13:49:51 -04:00
Connor Turland
0a29bed856 fixed topics and synapses placing on map issue 2014-08-02 13:48:41 -04:00
Connor Turland
e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland
3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland
e702f7023f renamed application to not be ISSAD, now Metamaps 2014-07-30 01:24:20 -04:00
Connor Turland
9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically 2014-07-30 01:02:47 -04:00
Connor Turland
f817ce772c changed approach to map creation. reorganized code to suit that. 2014-07-29 23:18:43 -04:00
Connor Turland
ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland
de2c7372fd removed extra files 2014-07-27 15:59:02 -04:00
Connor Turland
b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland
eceb1174c3 removed ccircular image processor to test 2014-07-08 00:21:43 -04:00
Connor Turland
aa5e3d522b set proper socket for heroku 2014-07-07 21:08:14 -04:00
Connor Turland
96197130e1 added rmagick and ruby number for heroku 2014-07-07 21:02:43 -04:00
Connor Turland
e5ba207711 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-06-15 14:41:11 -04:00
Connor Turland
9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break 2014-06-15 14:39:42 -04:00
poietic
a0cdad2138 Update _cheatsheet.html.erb 
a couple of small switches
 2014-06-15 10:52:38 -04:00
Connor Turland
0982916e10 hid topic view tab which was mistakenly showing 2014-06-14 18:25:37 -04:00
Connor Turland
bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland
2bb5c7a6bd added homepage image 2014-06-11 22:38:48 -04:00
Connor Turland
e9b25be060 blurred input when closing search so that typing in it is no longer possible 2014-06-11 19:29:05 -04:00
Connor Turland
e67a520a24 added EsC key to cancel search 2014-06-11 19:18:59 -04:00
Connor Turland
60e9a85140 fixed issue where adding multiple versions of the same person to the realtime list 2014-06-11 18:42:39 -04:00
Connor Turland
0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland
ceb30ee5d6 error in selectEdgeOnClickHandler fixed 2014-06-11 11:05:04 -04:00
Connor Turland
5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland
140a526226 changed home page card styling 2014-06-11 10:25:33 -04:00
Connor Turland
820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Connor Turland
6cec71fe2c actually fixed metacode set styling issues 2014-06-10 20:30:06 -04:00
Connor Turland
3625a750fd fixed metacode sets page styling issue 2014-06-10 20:22:35 -04:00
Raymon Johnstone
3d8332056a Addition of scrollbar to search results. 2014-06-10 20:13:15 -04:00
Connor Turland
9cedf247f9 on topic pages, center on topic using alt+click 2014-06-10 19:25:24 -04:00
Connor Turland
c567f07a50 closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected 2014-06-10 18:49:06 -04:00
Raymon Johnstone
6f2d19c570 Addition of scrollbar to search results 2014-06-10 17:41:34 -04:00
Connor Turland
bfa25bc604 sped up scroll bars 2014-06-10 13:34:39 -04:00
Connor Turland
b7703e2a0f improved metacode set switcher styling 2014-06-10 13:13:21 -04:00
Connor Turland
35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland
6454a592bd custom best_in_place that completes change on hitting enter for textaareas 2014-06-09 17:56:42 -04:00
Connor Turland
f8a8f119aa for stagin 2014-06-09 16:38:29 -04:00
Connor Turland
8760cf0280 added new images and made realtime send more relevant messages including one when someone turns on realtime 2014-06-09 16:37:09 -04:00
Connor Turland
2f969bb29e for staging 2014-06-09 13:37:16 -04:00
Connor Turland
31817d31a5 closes #202, closes #301, closes #320, closes #337 2014-06-09 13:36:23 -04:00
Connor Turland
6f0150cca1 switched for production (realtime) 2014-06-08 16:27:16 -04:00
Connor Turland
2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland
f30904d828 fixed lightbox hiding 2014-06-04 16:41:02 -04:00
Connor Turland
cac3a7c93b focus on topic creator after selecting metacode set 2014-06-04 16:24:13 -04:00
Connor Turland
c2b21ecc13 change for staging site 2014-06-04 15:51:00 -04:00
Connor Turland
a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland
c1de3abf28 switched coffeescript file to javascript 2014-05-30 11:01:53 -04:00
Connor Turland
1970f794c4 code cleaning 2014-05-30 11:00:31 -04:00
Connor Turland
f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00
Raymon Johnstone
5f349305a1 Walkthrough for ubuntu added, as well as our lost default database file readded 2014-05-20 20:07:22 -04:00
Connoropolous
ce853c594f Merge pull request #319 from Tadasu85/master 
Issues Fixed
 2014-05-17 16:14:51 -04:00
Raymon Johnstone
2a59d67d79 removed extra files 2014-05-17 16:10:44 -04:00
Raymon Johnstone
b9b226fea6 removed extra files 2014-05-17 16:04:23 -04:00
Connor Turland
72b3ae625b made all changes for heroku 2014-05-17 15:02:48 -04:00
Connor Turland
48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Connor Turland
53544e05a9 changed templates to use script tag rather than div tag and that way browsers don't try and read them as html 2014-05-17 07:32:52 -04:00
Raymon Johnstone
dc6295328a Fixed issue where setting your settings would log you out. 2014-05-15 18:28:30 -04:00
Robert Best
f62107ba43 Merge pull request #317 from Connoropolous/Rob's-1-edits 
Changed search shortcut to be Ctrl+/
 2014-05-15 10:55:42 -04:00
Robert Best
af8de6aff0 Changed search shortcut to be Ctrl+/ 2014-05-15 10:50:19 -04:00
Raymon Johnstone
0e25fb4cdb removed backup files as well as further mods for settings page 2014-05-14 16:51:16 -04:00
Raymon Johnstone
02b87fdafe Filters removed from settings page 2014-05-14 16:16:26 -04:00
Raymon Johnstone
64f3bf8bbe Filter ScrollBar update fixed 2014-05-14 15:21:17 -04:00
Raymon Johnstone
2f2f6e64fe Changes to PAG for external pages to load in a new tab 2014-05-14 14:42:15 -04:00
Robert Best
2e5947a243 Fixes #312 2014-05-04 15:12:38 -04:00
Connoropolous
2e6ea8fb1e removed coming soon 2014-03-06 08:12:41 -08:00
Connoropolous
27caf6e0a8 Added tutorial video in 2014-03-06 08:08:45 -08:00
Robert Best
6cf63b4e83 Added financial support links to PAQ 2014-03-05 13:10:41 -05:00
Robert Best
6a80c021ec Update paq.html.erb 
Made a few changes, mostly just adding links.... what still remains is to add links for Flattr, Paypal, and Bitcoin
 2014-03-03 23:21:23 -05:00
Connor Turland
8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland
8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland
1c5a57d67c disabled topic and synapse creation on public map that's not yours 2014-03-03 03:05:59 -08:00
Connor Turland
d89dddb45c hopefully changed jit to not cause compile error 2014-03-03 02:23:14 -08:00
Connor Turland
ee82650e64 precompiled 2014-03-03 02:17:54 -08:00
Connor Turland
5b2c20e475 precompiled 2014-03-03 02:17:44 -08:00
Connor Turland
909a5307d0 social icons name change 2014-03-03 01:37:15 -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
7f5269bb84 added the ability to change the map permission from the map info box 2014-03-02 18:53:19 -08:00
Connor Turland
5fe3eb8f00 fixed capitalization issues. tidied up topic pages. added center this topic icon 2014-03-02 16:36:18 -08:00
Connor Turland
c20c3b0e54 added ctrl+click for mac to act as right click for nodes and synapses 2014-03-02 15:56:07 -08:00
Connor Turland
dfca29c9b3 put message above canvas 2014-03-02 15:24:13 -08:00
Connor Turland
4fc60c13e7 ability to change the permissions of multiple through the right click menu implemented 2014-03-02 15:05:03 -08:00
Connor Turland
a36d1c8aec added updated metacode images and fixed synapse pointer 2014-03-02 12:01:06 -08:00
Connor Turland
2249fc4893 added pointer to node hover, fixed synapse permission edit bug 2014-03-02 11:53:22 -08:00
Connor Turland
2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland
5dd03ab4f7 cross browser flexbox support 2014-02-26 15:52:54 -08:00
Connor Turland
428462abf5 hope to have fixed the double click to open topic card issue 2014-02-26 14:45:01 -08:00
Connor Turland
762fc21e9e Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2014-02-26 12:40:13 -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
3a88abbb1b background update test 2014-02-25 15:05:25 -08:00
Connor Turland
f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland
2e252c2647 fixed scrollbars further 2014-02-24 12:47:02 -08:00
Connor Turland
000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -08:00
Connor Turland
eb940a1f7b moved lower bars lower to bottom 2014-02-24 11:51:55 -08:00
Connor Turland
2df3bda590 added hover to homepage image 2014-02-24 11:35:48 -08:00
Connor Turland
08341e3c83 replaced background images 2014-02-23 23:22:40 -08:00
Connor Turland
d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
poietic
d2ac26cbaf Update paq.html.erb 
changed answer about "are we making money from it or do we plan to?
 2014-02-20 11:38:56 -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
poietic
f7dc8cff60 Update _lightboxes.html.erb 
evolved "about" description.
 2014-02-17 16:30:40 -08:00
poietic
841879798b Update paq.html.erb 
added in flattr button and bitcoin address, for donations - may need a bit of formatting work..
 2014-02-16 23:39:39 -08:00
poietic
1c0f2eb303 Update paq.html.erb 
tweaks to answers
 2014-02-16 23:34:01 -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
7b3311cb05 changed realtime folder 2014-02-10 02:03:06 -05:00
Connor Turland
ec9fe66bfe styled notifications 2014-02-10 01:47:48 -05:00
Connor Turland
4e8fc6fe06 added tips to cards 2014-02-10 01:29:02 -05:00
Connor Turland
fb4da722ab removed extra migrate files 2014-02-09 23:48:05 -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
bfdf706f15 cheatsheet and menu and upper right menu 2014-02-09 10:05:32 -05:00
Connor Turland
1c49a805bd removed more old files, styled request invite page 2014-02-07 18:13:51 -05:00
Connor Turland
2045220622 styled lightboxes further, changed FAQ to PAQ 2014-02-07 17:25:02 -05:00
Connor Turland
17fe5fa241 styled faq page 2014-02-07 12:55:11 -05:00
Connor Turland
ab40ddfdf4 a lot of little coloring things 2014-02-06 15:16:51 -05:00
Connor Turland
86b60048c3 styled new map forms 2014-02-06 12:40:44 -05:00
Connor Turland
47710749a8 started styling map forms 2014-02-05 12:38:17 -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
b5b147de7e fixed error in account menu 2014-02-04 22:08:41 -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
8749ba8bbe removed a bunch of unnecessary js.coffee files with nothing in them 2014-02-04 14:55:26 -05:00
Connor Turland
5271c1ea3d configuring url to connect to for realtime 2014-02-04 13:41:27 -05:00
Connor Turland
285c87ade7 configured for redistogo and uncommented realtime messages 2014-02-04 12:08:09 -05:00
Connor Turland
4b64e4bc06 fixed issue with date edited in map info box 2014-02-04 11:06:10 -05:00
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 &amp; 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