Commit graph

2559 commits

Author SHA1 Message Date
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
Devin Howard
9e4a7b821f cleanup topic model a bit 2015-12-17 09:34:49 +08:00
Devin Howard
86b79c1e55 add brief testing docs 2015-12-17 09:34:34 +08:00
Devin Howard
696bac17e6 map spec 2015-12-17 09:16:02 +08:00
Devin Howard
2525a6fb65 add permission service, refactor map model a bit, add validations 2015-12-17 09:10:52 +08:00
Devin Howard
bfd4e4f228 add permission service, add validations to map.rb 2015-12-17 09:03:51 +08:00
Devin Howard
b3ba6d3a80 add shoulda-matchers gem 2015-12-17 08:53:45 +08:00
Devin Howard
1ff235f547 who needs routing specs bah 2015-12-16 22:36:41 +08:00
Devin Howard
4dbff85443 default value if no request.env in application controller passes the rspec test woot. Only 80 more tests to implement 2015-12-16 22:36:12 +08:00
Devin Howard
a93473f2c9 rubocop spec folder 2015-12-16 22:33:29 +08:00
Devin Howard
846d04dd0d rubocop style updates 2015-12-16 22:19:58 +08:00
Devin Howard
ae1117338a set up devise authentication more srsly. Still doesn't pass the test though haha 2015-12-16 22:16:02 +08:00
Devin Howard
be3924aa54 setup bare minimum devise authentication in tests 2015-12-16 21:32:50 +08:00
Devin Howard
6148f55e1c handle nil unsafe_uri in app conttroller function 2015-12-16 21:05:18 +08:00
Devin Howard
235d4f6c24 remove unneeded NEW tests, fix test.rb environment 2015-12-15 22:33:48 +08:00
Devin Howard
229b7d2cc5 Merge branch 'develop' into feature/rspec-tests 2015-12-15 22:12:30 +08:00
Devin Howard
b2aa2074a7 update generation calcuation code, incl. fix user signup bug 2015-12-15 12:33:22 +08:00