glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1848 commits 40 branches 27 tags 58 MiB
Commit graph

863 commits

Author SHA1 Message Date
Devin Howard 1370b63311 Merge pull request #639 from metamaps/feature/paste-url 
Allow pasting URLs into the map to create a new topic
 2016-09-22 09:16:03 +08:00
Connor Turland 2219e0d0dd Update Metamaps.Topic.js 2016-09-21 14:53:17 -04:00
Devin Howard 3843cab643 rails 5 + api v2 + raml api docs (#593) 
* update Gemfile to rails 5 and ruby 2.3.0

* fiddle with javascripts and add sprockets manifest file

* update config directory for rails 5

* fix some errors with controllers/serializers

* fix travis and rspec

* new serializers renamed to serializers

* module Api::V1

* reusable embedding code

* add index/collections/paging. overriding most of snorlax now |:)

* raml api documentation + rspec tests to verify schemas/examples

* add sorting by ?sort and searching by ?q. Add pagination Link headers

* api v1 => v2

* fill out synapse api

* alphabetize map policy

* fix page thing

* fill out maps api

* formParameters => properties, and fiddle with map api

* more raml 1.0 stuff i'm learning about

* deprecate v1 api

* rails 5 uses ApplicationRecord class for app-wide model config

* Update topic spec for api v2

* workaround for user_preference.rb issue

* get ready for token api docs. also TODO is mapping api docs

* spec out mapping api

* map/mapping/synapse spec, plus other bugs

* awesome, token specs/apis are done

* add sanity checks to the api tests

* more cleanup

* devise fix

* fix starred map error
 2016-09-21 13:22:40 -04:00
Devin Howard 1efd78ad7b initial attempt at focussing input field when entering multiple topics 2016-09-21 14:27:49 +08:00
Devin Howard 49084b98dd omg import bookmarks 😍 2016-09-21 10:48:47 +08:00
Devin Howard fac59f346f fix topic init function 2016-09-21 10:24:57 +08:00
Devin Howard ec96d69876 refactor import view: 
-Paste Input wrapper class to abstract away getting input
-Add ability to drop files in PasteInput
-Add ability to drop .webloc files or paste a link to create a new topic with that link in the link and desc fields
 2016-09-21 10:11:08 +08:00
Devin Howard 9515152315 move auto layout function into its own file 2016-09-21 10:10:08 +08:00
Connor Turland aace6796f5 allow topic carousel to be pinned open (#643) 
* so that rapid topic creation can happen in succession

* close when map closes
 2016-09-19 20:30:34 -04:00
Connor Turland 61e27a4dcb height shouldn't stay hard set. fixes 622 2016-09-17 23:45:04 +00:00
Connor Turland 823c0c5990 no room is created if anon user (#642) 2016-09-17 15:06:54 -04:00
Devin Howard 4bbb9df5af can't use ` with uglify 2016-09-14 10:45:42 +08:00
Devin Howard 40cb7606e3 enable metamaps.debug whoops 2016-09-13 15:21:00 +08:00
Connor Turland 6b2887e8da namespace the event listeners to turn them off (#637) 2016-09-11 18:47:59 -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
Connor Turland 4a2f3203bd Update clean.css.erb 2016-09-01 15:41:20 -04: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 21e2418281 move apps header out of exploreMapsHeader 2016-08-16 15:38:05 +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
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 5b5fc86a3b enable text overflow for title on mob (#606) 2016-08-14 12:50:44 -04: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 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
Connor Turland b4c75649ba all teh mobile things 2016-08-12 04:04:18 +00: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
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
Connor Turland f71d552504 Merge branch 'develop' into paring.down 2016-08-10 17:09:37 +00:00
Devin Howard beb52bc471 fix topic view keyboard shortcuts (#597) 
* fix topic view selection crash on centerAndReveal

* topic view shortcuts switch to Alt

* change delete behaviour to be smarter

* fetchRelatives recursively handles arrays

* update topic url and Metamaps.Active.Topic when you center

* make heroku work 4 realz
 2016-08-09 11:53:50 -04:00
Devin Howard 3b24165fd0 Merge pull request #589 from metamaps/feature/topicview-remove-topics 
enable removal of topics from topic view - fixes #467
 2016-08-08 21:46:15 +08:00
Devin Howard 9cedf69432 fetch siblings & center topic keyboard shortcuts - fixes #466 (#588) 
* fetch siblings & center topic keyboard shortcuts - fixes #466

* add keyboard shortcut labels

* update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and update docs

* zoom extents back to Ctrl+E and use e.preventDefault
 2016-08-08 21:46:05 +08:00
Devin Howard 3050f1413a Merge pull request #587 from metamaps/feature/topicview-selection-box 
fix selection box on radial view - fix #463
 2016-08-08 21:43:22 +08:00
Devin Howard 5510cb2e99 enable removal of topics from topic view - fixes #467 2016-08-08 21:40:55 +08:00
Devin Howard 77e8716588 Merge branch 'master' into develop 2016-08-07 17:23:57 +08:00
Devin Howard 23543ac7ad fix: synapse import fails if synapses are missing desc 2016-08-07 17:18:54 +08:00