Commit graph

1878 commits

Author SHA1 Message Date
Devin Howard 0b64b6371f fix pull changes docs 2016-09-13 15:19:01 +08:00
Connor Turland 6b2887e8da namespace the event listeners to turn them off (#637) 2016-09-11 18:47:59 -04:00
Connor Turland 4a8b017144 add nvmrc 2016-09-10 20:30:58 -04:00
Connor Turland 9070bfc836 use a subset of the simplest metacodes for new users (#633)
* use a subset of the simplest ones for new users

* Update user_preference.rb

* Update user_preference.rb
2016-09-09 20:36:49 -04:00
Connor Turland d3bc3e3d18 dont change home link in the mapper profile case 2016-09-10 00:29:10 +00:00
Connor Turland 75260496be annoying scroll issue fix (#634) 2016-09-09 17:06:05 -04:00
Devin Howard 61465ff148 Merge pull request #630 from metamaps/feature/mapping-policy
add mapping policy
2016-09-05 18:58:38 +08:00
Devin Howard 8d372f780d Merge pull request #626 from metamaps/bug/detached
shouldn't reference relatives that are connected in private ways
2016-09-05 11:58:08 +08:00
Devin Howard 3e38fba215 remove relatives1 and relatives2 2016-09-05 11:55:19 +08:00
Devin Howard e761e1693c use Topic.relatives scope to get all relatives 2016-09-05 11:52:35 +08:00
Devin Howard 158e2d5383 add mapping policy 2016-09-05 10:47:11 +08:00
Connor Turland 7de89cfa0f shouldn't reference relatives that are connected in private ways 2016-09-02 12:37:01 -04:00
Connor Turland 4a2f3203bd Update clean.css.erb 2016-09-01 15:41:20 -04:00
Devin Howard 8a55491dab forgot last updated 2016-09-01 15:48:47 +08:00
Devin Howard b36dc03f59 bump version to 2.9.0 2016-09-01 10:14:02 +08:00
Connor Turland 549c086af4 styleee (#620) 2016-08-31 18:57:19 -04:00
Connor Turland 19dabe81cc Enable users to star maps, and to see their starred collection (#615)
* enable starring

* users should be able to star others maps

* proper star icon

* starred maps display as starred without refreshing

* oops

* make phrasing clearer
2016-08-31 16:58:49 -04:00
Connor Turland 370499e453 avoid prompt 2016-08-30 17:00:14 -04:00
Connor Turland d7759c8c07 Redo all of explore together in React (#617)
* unify explore in react

* no more need for manual scroll reseting

* we're not opening/closing the search anymore
2016-08-21 21:02:49 -04:00
Connor Turland c89a6771ea Fix mapper page bugs + other things (#611)
* fix centering of explore headers

* make sure the mobile map title updates

* styling was broken on admin pages

* fixup callbacks when fetching user

* enable loading more
2016-08-17 10:00:37 -04:00
Connor Turland 4cb1dfe401 include link to create new map in mobile menu 2016-08-16 15:45:54 +00:00
Connor Turland 21e2418281 move apps header out of exploreMapsHeader 2016-08-16 15:38:05 +00:00
Connor Turland b8c8f25c83 fixup applications page 2016-08-16 14:30:10 +00:00
Connor Turland b58f55353a switch so that backbone router is opt-in, not opt-out (#610) 2016-08-16 10:25:07 -04:00
Devin Howard 03e98e617b fix login redirect loop - fixes #602 (#609) 2016-08-16 08:03:22 -04:00
Connor Turland 57181e208f layout tweaks (#607)
* new map creation pops to new window

* hide the search on logged out homepage

* add { }

* just writing the same code better

* remove that old code
2016-08-16 08:03:06 -04:00
Connor Turland da30078ef4 er, we use a static/modded version of best_in_place (#608) 2016-08-15 17:01:24 -04:00
Connor Turland 5b5fc86a3b enable text overflow for title on mob (#606) 2016-08-14 12:50:44 -04:00
Devin Howard 15ca43d49f Merge pull request #601 from metamaps/fix/nil-mapping-export
I think this fixes issue #566 but I'm not sure
2016-08-14 14:14:51 +08:00
Connor Turland 0140d68e87 adjusted media query breakpoints 2016-08-14 00:31:48 +00:00
Connor Turland d4d992a0da improve styling for mobile of map list (#605) 2016-08-13 20:10:23 -04:00
Connor Turland 34ecf4f70b enable panning (#603) 2016-08-12 11:07:59 -04:00
Devin Howard c77e3b2da5 Merge pull request #578 from metamaps/paring.down
remove all traces of Famous and improve mobile
2016-08-12 13:42:57 +08:00
Devin Howard 6eff5e640e Metamaps.Mobile.js dependencies comment 2016-08-12 13:32:51 +08:00
Connor Turland ceb335e728 use border radius on profile image 2016-08-12 05:09:10 +00:00
Connor Turland dc60c3f3ed add profile image and fix exploreMaps bar 2016-08-12 05:03:28 +00:00
Devin Howard 796f4d57a1 I think this fixes issue #566 but I'm not sure 2016-08-12 12:39:30 +08:00
Connor Turland b4c75649ba all teh mobile things 2016-08-12 04:04:18 +00:00
Devin Howard f4eb9250ad npm update 2016-08-12 10:51:14 +08:00
Connor Turland 449c2084bb make maps go under explore bar 2016-08-11 17:26:11 -04:00
Connor Turland 44bb0020bc Merge branch 'develop' into paring.down 2016-08-11 15:59:45 -04:00
Devin Howard fae69133be try fixing react warnings again 2016-08-11 11:42:35 +08:00
Connor Turland bdac00bc10 fix typo 2016-08-11 01:44:40 +00:00
Connor Turland 848bb11c08 needed to clear div switching between map view and topic view 2016-08-10 18:37:26 +00:00
Connor Turland d5cec3844b make sure toast hides again 2016-08-10 18:08:48 +00:00
Connor Turland a3f1d51bc6 make the toast work 2016-08-10 18:06:28 +00:00
Connor Turland da090e60db remove homepage changes 2016-08-10 17:32:43 +00:00
Connor Turland c308e276e8 Merge branch 'develop' into paring.down 2016-08-10 17:16:33 +00:00
Devin Howard 63b528c8bf don't import into textarea elements either - fix #579 (#598) 2016-08-10 13:14:33 -04:00
Devin Howard 9db5ce551e inject NODE_ENV into webpack - probably fixes #595 (#599) 2016-08-10 13:13:54 -04:00