Commit graph

1625 commits

Author SHA1 Message Date
Devin Howard
f4b2e34627 Merge pull request #455 from metamaps/feature/dotenv-for-reals
dotenv for reals
2016-01-07 12:10:47 +08:00
Devin Howard
7d7003a1bc get more hard headed about having development values in .example-env 2016-01-06 23:16:34 +08:00
Devin Howard
bf21dcc3e6 merge develop into rspec tests 2016-01-06 23:03:34 +08:00
Devin Howard
3cdab531a6 move more config into .example-env 2016-01-06 22:57:01 +08:00
Devin Howard
70f5a5db11 centralize config in .env file, which includes remaving database.yml.default and overriding that file's local changes in favour of env variables. In future, all instance config can go in .env 2016-01-06 22:36:29 +08:00
Devin Howard
062522bfdc remove unnecessary step from windows docs 2016-01-06 11:25:55 +08:00
Devin Howard
75d9339010 make mapping polymorphism migration handle mapping problems 2016-01-06 10:23:01 +08:00
Devin Howard
21aba2fe5e more modular database.yml.default 2015-12-24 16:36:58 +08:00
Devin Howard
844a52fc52 Merge pull request #450 from metamaps/feature/fix-searchbox
fix searchbox
2015-12-24 15:44:12 +08:00
Devin Howard
40561c629a fix handleResultClick on search box 2015-12-24 15:42:51 +08:00
Devin Howard
a45d0f7791 fix search box on authenticated homepage 2015-12-24 15:19:03 +08:00
Connor Turland
6db91ea703 broken funnnnnction 2015-12-23 11:34:52 +08:00
Connor Turland
26bc04262a broken funnnnnction 2015-12-22 22:28:03 -05:00
Connor Turland
5ad1504494 handle socketio reconnect situation 2015-12-22 18:05:13 -05:00
Connor Turland
64283850e3 add junto spinner for call in progress 2015-12-22 17:46:19 -05:00
Connor Turland
dfc94b4079 fix up styling on chat text input 2015-12-22 16:34:30 -05:00
Connor Turland
49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Connor Turland
8d85f8d308 videos positioning decently. chats loading more smoothly 2015-12-22 12:43:50 -05:00
Devin Howard
8394e0ce86 re-add regular uservoice code 2015-12-22 07:13:26 +08:00
Devin Howard
c58b2c805e syntax error 2015-12-21 21:38:02 +08:00
Devin Howard
d96e991de3 don't use // for heroku either 2015-12-21 21:29:15 +08:00
Devin Howard
6e10b4c508 make use of realtime.metamaps.cc server 2015-12-21 21:28:18 +08:00
Devin Howard
914ff46bb9 syntax error in development.rb 2015-12-21 11:40:30 +08:00
Devin Howard
7ea91273c8 remove random string spec helper function in favour of factory girl sequences 2015-12-21 10:59:20 +08:00
Devin Howard
61c03e2736 Merge pull request #448 from metamaps/feature/https-preparation
https preparation
2015-12-21 10:18:46 +08:00
Devin Howard
603b9dc52e remove uservoice code 2015-12-21 10:16:51 +08:00
Devin Howard
9a7ef25afc Merge branch 'develop' into feature/https-preparation 2015-12-20 22:28:43 +08:00
Devin Howard
888edae6f6 finish remove asset_path_icon whoops 2015-12-20 22:28:05 +08:00
Devin Howard
c79a5f0072 Merge branch 'develop' into feature/https-preparation 2015-12-20 22:24:47 +08:00
Devin Howard
96ec672779 Merge branch 'develop' into feature/rspec-tests 2015-12-20 22:24:39 +08:00
Devin Howard
df485002b1 remove redundant asset_path_icon function 2015-12-20 22:22:01 +08:00
Devin Howard
7930f1a216 one test in metacode spec 2015-12-20 22:20:51 +08:00
Devin Howard
fe8794e814 fix topic spec 2015-12-20 22:18:40 +08:00
Devin Howard
f85bf74b2e synapse desc validation 2015-12-20 21:55:10 +08:00
Devin Howard
d33f4bffb1 typekit https 2015-12-20 20:19:24 +08:00
Devin Howard
f35d4d51a9 s3 over https by default 2015-12-20 20:19:09 +08:00
Devin Howard
e2bf1d5eb1 try to make metamaps more tls friendly 2015-12-20 18:36:57 +08:00
Devin Howard
c7f7fa1d1b reorganize synapse spec pendingness 2015-12-18 09:35:56 +08:00
Devin Howard
63e4939592 remove TODO 2015-12-18 09:35:40 +08:00
Devin Howard
6bb8ac7e1f fix dumb errors - only 2 topic specs fail now 2015-12-18 09:33:16 +08:00
Devin Howard
ca282f7879 topic spec owner 2015-12-18 09:28:28 +08:00
Devin Howard
d2680fd9f3 permissions on synapse spec 2015-12-18 09:28:20 +08:00
Devin Howard
acd048bd0d can't properly use rspec on a boolean field validation 2015-12-18 09:28:08 +08:00
Devin Howard
4b22a856c3 synapse spec 2015-12-18 09:26:15 +08:00
Devin Howard
a4c309a677 finish topic spec 2015-12-18 09:26:07 +08:00
Devin Howard
c4be57e525 topic and synapse validate permission 2015-12-18 09:25:54 +08:00
Devin Howard
cf6411988d topic spec - need to add permissions and fix 2 failing tests 2015-12-17 23:45:38 +08:00
Devin Howard
9522c30273 finish map spec permissions 2015-12-17 23:20:53 +08:00
Devin Howard
006acac6b5 remove redundant authorize_to_view function 2015-12-17 23:20:19 +08:00
Devin Howard
d5f66487b7 update map spec - add authorize_to_delete. TODO: add other map authorize specs 2015-12-17 09:44:48 +08:00