Commit graph

825 commits

Author SHA1 Message Date
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