Commit graph

1711 commits

Author SHA1 Message Date
Devin Howard 1d12aed3eb switch to dotenv-rails 2016-06-07 12:55:49 +08:00
Devin Howard 11f921b058 remove secret key from source control - fixme on production.
This will expire all cookies, but make our install more secure from
hackers who know their way around Github
2016-06-07 12:54:55 +08:00
Connor Turland c08868a5c1 user presence event (#552) 2016-04-26 08:08:12 -04:00
Devin Howard 45adda93b1 set up scaffolding for js tests (#553) 2016-04-26 10:22:32 +08:00
Connor Turland 2a3fa80540 wording needed updating 2016-04-24 12:15:40 -04:00
Connor Turland 8c51108a0c enable shared private and public maps (#530)
* enable shared private and public maps

* change the list

* yeehaw add collaborators

* I believe this fixes the error connor brought up

* when topic or synapse is no longer on a map, don't defer

* needs to be before?

* just do it in the controller

* make recommendation they sign in and retry

* better email

* config for mailer previews

* improve wording

* shouldn't have included that

* switch to green

* don't execute if there's no map

* wasn't including the right people in some circumstances

* Finish breaking out JS files (#551)

* metamaps.Realtime refactor

* Metamaps.Util

* Metamaps.Visualize

* Metamaps.SynapseCard

* Metamaps.TopicCard

* Metamaps.Create.js

* Remove erb extension from Metamaps.Map.js

* Metmaps.Account and Metamaps.GlobalUI remove extension

* Metamaps.JIT no more erb extension

* move Backbone.init; standard-format on Metamaps.js.erb

* factor out canvas support check function

* some llittle template bugs

* remove featured from signed in explore maps bar

* don't let it overflow off the page
2016-04-24 11:50:35 -04:00
Devin Howard 44ae6730a6 fix user search error 2016-04-21 00:30:11 -04:00
Devin Howard e569a0376d Merge pull request #548 from metamaps/feature/refactor-javascript
split out all javascript files
2016-04-20 11:24:20 +08:00
Devin Howard af4a958f59 Merge pull request #549 from metamaps/fix/map-fork
fix map forking (fix #540)
2016-04-20 09:36:52 +08:00
Devin Howard da0da1a117 Merge pull request #546 from metamaps/feature/exception-notification
slack exception notifications
2016-04-20 09:06:42 +08:00
Devin Howard 837e4bde1b fix map forking (fix #540) 2016-04-20 09:00:45 +08:00
Devin Howard c1d963d669 remove .erb from files that don't need it 2016-04-15 09:18:17 +08:00
Devin Howard 8bb96d12a6 Metamaps.Control 2016-04-15 09:13:01 +08:00
Devin Howard 6a8921ae6d standard-format Metamaps.JIT.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard 074eaf0bd3 alphabetize dependecies 2016-04-15 09:13:01 +08:00
Devin Howard 324719e531 Metamaps.Filter 2016-04-15 09:13:01 +08:00
Devin Howard b10f0cef0e Metamaps.Listeners.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard a5bd0440a8 Metamaps.Organize 2016-04-15 09:13:01 +08:00
Devin Howard ca5928113d whoops don't forget standard format 2016-04-15 09:13:01 +08:00
Devin Howard de62a08307 Metamaps.Topic 2016-04-15 09:13:01 +08:00
Devin Howard 4833dd8da6 Metamaps.Synapse 2016-04-15 09:13:01 +08:00
Devin Howard 11a87582c7 Metamaps.Map 2016-04-15 09:13:01 +08:00
Devin Howard 13d6ab56e5 factor out two more small view modules 2016-04-15 09:13:01 +08:00
Connor Turland 7bb7f345f1 added an event for conversations starting (#547)
* added an event for conversations starting

* switch to post
2016-04-14 14:35:28 -04:00
Devin Howard 317f0c245e Merge pull request #545 from metamaps/feature/refactor-javascript
JS refactoring part 1 of many!
2016-04-14 12:35:21 +08:00
Devin Howard fb80f56a7d slack exception notifications 2016-04-13 17:20:01 +08:00
Devin Howard 134d4171f8 alphabetize gemfile 2016-04-13 17:07:23 +08:00
Devin Howard 6653d10edf Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT 2016-04-13 16:06:01 +08:00
Devin Howard be99ad8285 factor out Metamaps.Admin 2016-04-13 16:04:15 +08:00
Devin Howard 799f6e4623 Metamaps.Router standard style 2016-04-13 15:58:54 +08:00
Devin Howard df9c0a93bc Metamaps.Views standard style 2016-04-13 15:58:54 +08:00
Devin Howard e8c55df4e8 Metamaps.Backbone standard style 2016-04-13 15:58:54 +08:00
Devin Howard 5a3ab025b7 Metamaps.Import standard style 2016-04-13 15:58:54 +08:00
Devin Howard d2d67d5d6c Merge pull request #544 from metamaps/fix/versioncode
quick fix to version code code
2016-04-13 10:53:31 +08:00
Devin Howard e6c4313184 reindent upperelements template + fix input tag 2016-04-13 10:50:51 +08:00
Devin Howard a2ce20b564 versioncode fix 2016-04-13 10:48:34 +08:00
Devin Howard 3040c004f0 ruby gemset 2016-04-13 10:32:27 +08:00
Devin Howard 5ed1fd3156 v2.8.4 2016-04-13 10:19:35 +08:00
Devin Howard 0a9a1c27d8 Merge pull request #543 from metamaps/feature/rename-repo
rename repo
2016-04-13 10:17:30 +08:00
Devin Howard c9bba0cdb2 rename repo 2016-04-13 10:16:54 +08:00
Devin Howard 6659a97f28 Merge pull request #536 from metamaps/feature/metamaps.debug
metamaps.debug function, and move VERSION into a rails constant initializer.
2016-04-13 10:14:23 +08:00
Devin Howard fd9c27c631 Merge pull request #535 from metamaps/feature/cors
add rack-cors; fix #531
2016-04-13 10:13:16 +08:00
Devin Howard e27d64e643 only allow cors on api routes 2016-04-06 20:09:25 +08:00
Devin Howard 2e6f04d0be metamaps.debug function, and move VERSION into a rails constant initializer.
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
2016-04-06 10:27:31 +08:00
Devin Howard 7de642ccb2 add rack-cors; fix #531 2016-04-05 10:12:12 +08:00
Connor Turland 8a6d434fc3 Junto Sounds
* awesome news sounnndzzzz

* prevent double sound

* bug fixes and chat sounds on by default
2016-04-04 10:50:02 -04:00
Devin Howard f21a3d114f Merge pull request #529 from metamaps/fix/import-fixes
fix json import
2016-04-01 13:37:43 +08:00
Devin Howard 7eb8ae37ee Merge pull request #526 from metamaps/fix/invite-link
fix invite link
2016-04-01 13:37:33 +08:00
Devin Howard 7d6acb7014 fix json import 2016-03-31 13:03:14 +08:00
Devin Howard b9b9e57c41 Merge pull request #528 from metamaps/fix/import-fixes
import fixes
2016-03-31 10:04:33 +08:00