Commit graph

1402 commits

Author SHA1 Message Date
Devin Howard 50d9866939 fix problem with join route 2015-12-03 16:57:23 -05:00
Devin Howard 95e1806500 cancan => cancancan 2015-12-03 16:57:23 -05:00
Devin Howard 2369c9ce5e select metacodes with one query instead of n queries, move logic to application_helper 2015-12-03 16:57:23 -05:00
Devin Howard 7c28070978 fix other controllers needing create/update changed for rails 4 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 e34b5bd2ad fix best in place deprecation warnings in map info box 2015-12-03 16:57:22 -05:00
Devin Howard 7877e5bdbc delete_if threw errors, so convert things to arrays for it 2015-12-03 16:57:22 -05:00
Devin Howard d4f72bac65 whoo new gems for development. binding.pry is so cool 2015-12-03 16:57:22 -05:00
Devin Howard 7d738b7abf fix map/mapping associations that I broke 2015-12-03 16:57:22 -05:00
Devin Howard e9cb8561fa add required params to all controllers 2015-12-03 16:57:22 -05:00
Devin Howard 32311e3610 fix has_many relationships in map & mapping models for rails 4 2015-12-03 16:57:22 -05:00
Devin Howard 8bf2eb31f3 remove old jquery-ui file 2015-12-03 16:57:22 -05:00
Devin Howard 7b199983d8 add jquery_ui to gemfile 2015-12-03 16:57:22 -05:00
Devin Howard 371851cb89 remove attr_accessible 2015-12-03 16:57:22 -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
Devin Howard 562dd17b36 update Gemfile for rails 4 2015-12-03 16:57:21 -05:00
Connor Turland 3b89a2a13f Merge pull request #440 from metamaps/feature/fix.fork.filter.bug
fix filter bug
2015-11-30 11:10:57 -05: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 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
Devin Howard 94412b21d2 merge documentation changes 2015-11-23 09:54:36 +08:00
Devin Howard f58412b715 Update windows installer docs 2015-11-20 14:34:05 +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
Connor Turland e29ab4bca3 had to update because jquery ui version changed 2015-11-07 01:33:18 +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 fa017a8559 sandi metz function simplification 2015-11-06 17:08:42 +08:00
Devin Howard 7ec7f9f892 fix #465, metacode sort problem 2015-11-04 17:22:46 +08:00
Connor Turland 86c467b2f1 current_user can be nil 2015-11-04 00:14:14 -05:00
Devin Howard 3eff850336 reorganize documentation 2015-11-04 11:41:04 +08:00
Devin Howard 6f8c18cd46 reorganize metamaps-qa-steps a bit 2015-11-04 11:40:52 +08:00
Devin Howard 660ee52292 make invite link use REQUEST_URI 2015-11-03 22:22:53 +08:00
Devin Howard 8b456f5a31 css fixes for heroku 2015-11-03 21:10:05 +08:00
Devin Howard 62ae38e70d fix devise integration for rails 4 2015-11-03 20:56:50 +08:00
Devin Howard d9133b1e29 update WindowsInstallation.md 2015-11-03 19:10:21 +08:00
Devin Howard 9613145e99 devise locale text 2015-11-02 00:07:52 +08:00
Devin Howard 5b4bd9724b Gemfile.lock 2015-11-02 00:06:12 +08:00
Devin Howard c86422dc68 update devise.rb with new changes 2015-11-02 00:05:57 +08:00