Commit graph

1413 commits

Author SHA1 Message Date
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
8cf8277573 add jquery_ui to gemfile 2015-09-10 22:13:10 +08:00
Devin Howard
dc51d0080e remove attr_accessible 2015-09-10 22:12:50 +08:00
Devin Howard
f81fdbf8cc secret_token => secret_key_base 2015-09-10 22:12:39 +08:00
Devin Howard
7a73f3bc07 remove match method from routes.rb 2015-09-10 22:06:58 +08:00
Devin Howard
c250f5d395 asset precompiling simpler in rails 4 2015-09-10 22:03:39 +08:00
Devin Howard
3c0bdff823 some config changes for rails 4 found on the Internet 2015-09-10 17:43:58 +08:00
Devin Howard
5848af7765 update Gemfile for rails 4 2015-09-10 17:43:48 +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
Devin Howard
3f5d2bd7f3 add gem install bundler to configure.sh 2015-05-09 23:22:23 -04:00
Connor Turland
499f6349e6 add ability for admin to delete any topics and synapses 2015-04-28 18:43:47 -04:00
mix irving
7a1b68960d install dotenv to help managed env vars 2015-03-09 08:50:24 +13:00
Connor Turland
9ce81df9f9 Merge pull request #406 from s01us/extract_mail_env
extract email settings into ENV ✂️
2015-03-07 15:01:53 -05:00
mix irving
c17cc39880 extract email settings into ENV ✂️ fixes #405 2015-03-04 11:30:23 +13:00
Connor Turland
8816031b20 Merge pull request #404 from s01us/add_ruby_version
add .ruby-version for rbenv support
2015-03-03 09:33:59 -05:00
mix irving
4d311cb371 add .reuby-version for rbenv support 2015-03-03 23:15:44 +13:00
Connor Turland
253ceb4b48 added imagemagick to vagrantfile 2015-02-19 19:03:22 -05: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
84e03d5475 Merge pull request #381 from metamaps/dont.delete
mapper who wasn't creator of a topic or synapse should not be able to delete it
2015-01-29 22:25:21 -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
cc66a851bd Merge pull request #382 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-01-29 17:59:23 -05:00
The Gitter Badger
4857a02e45 Added Gitter badge 2015-01-29 20:35:48 +00: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
c61de991af re-added buildpack file for heroku 2015-01-28 21:49:58 -05:00
Connor Turland
463a25f0a4 re-added procfile for heroku 2015-01-28 21:48:18 -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
40cebf572c Merge pull request #378 from metamaps/embedly
updated embedly library, and data-card-chrome was now causing a breaking change
2015-01-28 19:33:54 -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
07e0aac7fd Update README.md 2015-01-22 23:02:11 -05:00
Connor Turland
36e84d61fd Update UbuntuInstallation.md 2015-01-22 22:59:11 -05:00
Connor Turland
bf7b25f7de Update README.md 2015-01-22 22:56:36 -05:00
Connor Turland
89e31d14b2 Delete codeguide.txt 2015-01-22 22:43:31 -05:00
Connor Turland
ebfe8257bd Delete .buildpacks 2015-01-22 22:43:04 -05:00
Connor Turland
f7d537ed64 Delete Procfile 2015-01-22 22:42:52 -05:00
Connor Turland
84e9eb385c Delete LiveSiteUpdatesNotes.txt 2015-01-22 22:42:29 -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
f3569d17aa more commented code removed from realtime 2015-01-22 21:45:52 -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