Devin Howard
1d12aed3eb
switch to dotenv-rails
2016-06-07 12:55:49 +08: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
fb80f56a7d
slack exception notifications
2016-04-13 17:20:01 +08:00
Devin Howard
7de642ccb2
add rack-cors; fix #531
2016-04-05 10:12:12 +08:00
Connor Turland
49f4b2030e
gemfile.lock needed to change for travis to be happy
2016-03-27 00:21:32 -07:00
Connor Turland
540b35c757
Merge branch 'feature/no-cancancan' into develop
2016-03-24 20:47:35 -07:00
Devin Howard
34d3a80db1
use new pundit-enabled snorlax
2016-03-25 10:07:57 +08:00
Connor Turland
e6ac4b1dcb
make metamaps an oauth provider
2016-03-19 13:28:55 +11:00
Connor Turland
ac9460be77
do still need cancan
2016-03-14 21:44:50 +11:00
Devin Howard
88c070cbbd
no cancan
2016-03-14 10:55:26 +08:00
Connor Turland
77d69dd2a3
turns out we do need delayed_job
2016-03-13 11:56:18 +11:00
Connor Turland
11e57c1b37
rebase onto develop which now has API and pundit
2016-03-13 10:36:38 +11:00
Connor Turland
669b337d04
changes for api
2016-03-12 09:37:18 +11:00
Connor Turland
e6017c4129
Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit
2016-03-12 07:19:19 +11:00
Connor Turland
059591b78b
first pass at important API endpoints, token auth
2016-03-11 17:16:04 +11:00
Devin Howard
66f1d2ec0b
install pundit
2016-02-28 12:30:41 +08:00
Devin Howard
295534e4ab
migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION
2016-02-23 14:58:20 +08:00
Devin Howard
7956e6d289
check map#contains matches json schema in spec
2016-02-09 11:20:39 +08:00
Devin Howard
80a6bcbca2
remove annoying rcov gem
2016-02-08 11:19:40 +08:00
Devin Howard
b3f8f6652a
simplecov added
2016-02-08 11:19:36 +08:00
Devin Howard
b3ba6d3a80
add shoulda-matchers gem
2015-12-17 08:53:45 +08:00
Devin Howard
1597665be5
merge develop with rails4 stuff
2015-12-07 13:58:42 +08:00
Devin Howard
45e09a27bd
gc tuning
2015-11-25 11:59:56 +08:00
Devin Howard
d3d0c97e7e
add .ruby-gemset file - you may need to reinstall gems if using rvm
2015-11-23 18:22:34 +08:00
Connor Turland
1bbaa47b80
getting uploads working
...
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-11-07 01:33:18 +08:00
Devin Howard
5b4bd9724b
Gemfile.lock
2015-11-02 00:06:12 +08:00
Devin Howard
6f518be51d
rspec tests rails4 Gemfile.lock
2015-10-27 18:23:25 +08:00
Devin Howard
3440826d51
binding_of_caller gem for devel debug
2015-10-26 11:53:50 +08:00
Devin Howard
dc66ac10a9
pry byebug
2015-10-23 22:27:33 +08:00
Devin Howard
0d2ddbd9b6
add rspec to Gemfile
2015-10-12 11:24:30 +08:00
Devin Howard
c0d29e54bd
Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4
2015-09-28 14:43:16 +08:00
Devin Howard
741c584651
Merge branch 'develop' into rails4
2015-09-20 13:55:21 +08:00
Connor Turland
f5dbfd5d72
configuration for production environments like heroku
2015-09-19 14:10:43 -04:00
Connor Turland
869fb816e9
this enables the vagrant port forwarding
2015-09-19 13:16:07 -04:00
Devin Howard
b2e15c6483
cancan => cancancan
2015-09-19 20:25:07 +08:00
Devin Howard
1aa4d862a1
whoo new gems for development. binding.pry is so cool
2015-09-19 17:01:27 +08:00
Devin Howard
8cf8277573
add jquery_ui to gemfile
2015-09-10 22:13:10 +08:00
Devin Howard
5848af7765
update Gemfile for rails 4
2015-09-10 17:43:48 +08:00
mix irving
7a1b68960d
install dotenv to help managed env vars
2015-03-09 08:50:24 +13:00
Connor Turland
951bd8d4a5
removed sidekiq leftovers. altered synapse results to only return unique
2014-11-16 12:35:06 -05:00
Connor Turland
47132f3e60
ruby 2.1
2014-10-08 01:21:02 -04:00
Connor Turland
84d926149c
removed barometer.js
2014-10-07 21:30:25 -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
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
6eca81487a
started styling of map cards and topic card, removed new maps section
2014-08-15 18:04:22 -04:00
Robert Best
b09eed715b
specify redis gem version number
2014-08-02 14:32:07 -04:00
Connor Turland
96197130e1
added rmagick and ruby number for heroku
2014-07-07 21:02:43 -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
