Commit graph

154 commits

Author SHA1 Message Date
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard 914ff46bb9 syntax error in development.rb 2015-12-21 11:40:30 +08:00
Devin Howard f35d4d51a9 s3 over https by default 2015-12-20 20:19:09 +08:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Connor Turland dcbe24bb7e getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-12-03 16:57:30 -05:00
Devin Howard f4456d06ef fix devise integration for rails 4 2015-12-03 16:57:29 -05:00
Devin Howard 20e698f69d devise locale text 2015-12-03 16:57:29 -05:00
Devin Howard 6df2f22080 update devise.rb with new changes 2015-12-03 16:57:29 -05:00
Devin Howard 3674aefb04 remove secrets.yml stuff because it doesn't work with heroku 2015-12-03 16:57:29 -05:00
Devin Howard 570fa931b7 use secrets.yml to allow overriding config variables 2015-12-03 16:57:28 -05:00
Devin Howard 8e427ea8f2 add secrets.yml.default 2015-12-03 16:57:28 -05:00
Devin Howard a972074306 environment assets config 2015-12-03 16:57:27 -05:00
Devin Howard bd60f68cfe try to compile but not compress assets 2015-12-03 16:57:26 -05:00
Connor Turland 1a01d3b568 configuration for production environments like heroku 2015-12-03 16:57:23 -05:00
Connor Turland 8b7ec73f48 this enables the vagrant port forwarding 2015-12-03 16:57:23 -05:00
Devin Howard 50d9866939 fix problem with join route 2015-12-03 16:57:23 -05:00
Devin Howard 919fc0a60f fiddle with topic and mapping controllers so they work again 2015-12-03 16:57:23 -05:00
Devin Howard 13b70be653 secret_token => secret_key_base 2015-12-03 16:57:22 -05:00
Devin Howard 61159dc44c remove match method from routes.rb 2015-12-03 16:57:22 -05:00
Devin Howard 558ced62a8 asset precompiling simpler in rails 4 2015-12-03 16:57:22 -05:00
Devin Howard 62e96d574c some config changes for rails 4 found on the Internet 2015-12-03 16:57:21 -05: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 62ae38e70d fix devise integration for rails 4 2015-11-03 20:56:50 +08:00
Devin Howard 9613145e99 devise locale text 2015-11-02 00:07:52 +08:00
Devin Howard c86422dc68 update devise.rb with new changes 2015-11-02 00:05:57 +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 8e1ae0a1fc use secrets.yml to allow overriding config variables 2015-10-29 16:23:41 +08:00
Devin Howard 12c6765f8b add secrets.yml.default 2015-10-27 18:17:04 +08:00
Devin Howard e40f6ededc environment assets config 2015-10-25 17:09:57 +08:00
Devin Howard ac0faae843 try to compile but not compress assets 2015-10-25 16:51:47 +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 1fbd16ac95 fix problem with join route 2015-09-19 20:46:10 +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 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
mix irving c17cc39880 extract email settings into ENV ✂️ fixes #405 2015-03-04 11:30:23 +13:00
Connor Turland d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -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 951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -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 44923eb660 added new map screenshot capture method 2014-11-09 22:10:13 -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 12e65c638b changes for reset password form 2014-10-27 18:24:30 -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
Connor Turland bac631ba73 config sidekiq 2014-10-08 01:42:16 -04:00
Connor Turland cf01e711dd merge with devin 2014-10-07 19:19:24 -04:00
Devin Howard c5601686c2 actually commented sidekiq route 2014-10-07 19:01:41 -04:00