Commit graph

928 commits

Author SHA1 Message Date
Devin Howard f2cbde50ca dos2unix on the whole repo 2016-02-05 11:43:15 +08:00
Devin Howard c80efac7de tag v2.8 2016-02-05 11:37:33 +08:00
Devin Howard e73ade0442 tag v2.7 2016-02-05 11:29:05 +08:00
poietic c8d6563f45 changed links from old uservoice url.
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
2016-01-29 16:00:30 -08:00
Devin Howard 14a292331b two tweaks to help production deploy 2016-01-19 14:27:25 +08:00
Devin Howard 4842856358 merge develop into rspec-tests 2016-01-07 16:04:23 +08:00
Devin Howard 4469b29ec2 in user model 2016-01-07 15:32:19 +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 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
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 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 d33f4bffb1 typekit https 2015-12-20 20:19:24 +08:00
Devin Howard e2bf1d5eb1 try to make metamaps more tls friendly 2015-12-20 18:36:57 +08:00
Devin Howard c4be57e525 topic and synapse validate permission 2015-12-18 09:25:54 +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 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 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 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 b2aa2074a7 update generation calcuation code, incl. fix user signup bug 2015-12-15 12:33:22 +08:00
Devin Howard b037c84f15 fix small error in user model
need to use the parent's generation to calculate generation!
2015-12-07 11:44:08 +08:00
Devin Howard 8425e72101 fix filter bug 2015-11-30 10:01:33 +08:00
Devin Howard 8505d26182 search box css fixes 2015-11-28 23:03:48 +08:00
Devin Howard 6b6ad1b660 fix error with mapper search rendering 2015-11-28 22:07:57 +08:00
Devin Howard 3aaf501b03 fix up user model json output function 2015-11-28 21:51:28 +08:00
Devin Howard 9afc8bc7c4 refactor search css into scss for clearer organization, plus do some fixes to the typeahead css 2015-11-28 21:40:09 +08:00
Devin Howard 98e11c0a7d split search css out into its own file 2015-11-28 20:17:14 +08:00
Devin Howard 1f82238362 more fixes 2015-11-08 23:14:53 +08:00
Devin Howard 7136f46ec3 get autocomplete working again with new typeahead.js, but not the CSS 2015-11-08 22:53:34 +08:00
Devin Howard fe0d38ec67 syntax error 2015-11-07 01:34:08 +08:00
Connor Turland 53de063bfc fix cannot set readonly property highlight 2015-11-07 01:33:18 +08:00
Connor Turland 03ab04050d switching metacode sets was being caught by Metamaps.Router.intercept 2015-11-07 01:33:18 +08:00
Connor Turland 3216106660 styling of the vertical tab selectors needed improvement 2015-11-07 01:33:18 +08:00