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

967 commits

Author SHA1 Message Date
Connor Turland c46e85529e little style tweaks to css and content 2016-12-16 16:21:01 -05:00
Devin Howard 85408a14d3 Initial notification centre using mailboxer 2016-12-16 16:20:53 -05:00
Devin Howard 01cd624bfa add polyfill so chrome 49 can upload map thumbnail screenshots (#946) 2016-12-06 12:36:06 -05:00
Devin Howard 4da3a9d55f hide mobile menu if browser is resized to full size (#937) 2016-11-28 13:53:29 -05:00
Devin Howard 4533a0f2fe merge changes from metamapscc instance branch (#913) 
* homepage video fallback

* public/50x.html

* remove blog from public/ html pages

* remove video file since it's on metamaps.cc server

* eslint
 2016-11-09 09:34:10 -05:00
Devin Howard 518782e1c7 remove Metamaps.Erb 2016-11-07 14:55:20 -05:00
Devin Howard 814c1acc0f a few markdown style updates (#885) 
* markdown block padding

* a few more markdown style updates
 2016-10-31 15:38:16 +08:00
Devin Howard 62e2acdd52 add about lightbox again (#884) 
* add about lightbox again

* fix about lightbox style
 2016-10-31 15:38:09 +08:00
Devin Howard bc1f212c93 fix tab/shift-tab for metacode selection (#879) 2016-10-30 00:08:51 +08:00
Devin Howard 4dc32d7d2e fix metacodes page scrolling (#862) 
* fix metacodes page scrolling

use scheme from
http://brandonhilkert.com/blog/page-specific-javascript-in-rails/

* switch overflow:hidden to be on explicit controllers
 2016-10-28 10:55:04 +08:00
Devin Howard 6b1220b533 overflow-y: hidden on body to prevent openLightbox from showing a scrollbar (#859) 2016-10-27 18:40:42 -04:00
Devin Howard e640048386 fix topic card title word break css (#844) 2016-10-26 17:01:05 +08:00
Connor Turland ce1205f6d7 one more mapper card style fix 2016-10-24 14:35:23 +00:00
Connor Turland 96d25cc91d mapper profile mobile styling 2016-10-24 14:23:05 +00:00
Connor Turland a9ef6feebd mapper page bug fix and styling 2016-10-24 13:42:26 +00:00
Connor Turland 98e2de68da oooh was using ineffective media queries for desktop 2016-10-23 16:49:16 -04:00
Connor Turland cda0c21a0b make it responsive (#820) 2016-10-23 16:12:07 -04:00
Connor Turland aa96d074af dont show import on topic page 2016-10-23 11:21:38 -04:00
Devin Howard a63cd02bc6 fix develop branch bug 2016-10-23 22:51:16 +08:00
Devin Howard 5db8e27496 make metacode selector reliable after switching metacode sets (#816) 2016-10-23 22:11:26 +08:00
Devin Howard 87dc20fa50 stop showing map info box on topic view (#815) 2016-10-23 22:07:38 +08:00
Connor Turland d359eb063a fixed the oauth redirect bug and a bit more (#796) 2016-10-22 16:46:39 +08:00
Connor Turland 4187dbd803 fix it up (#804) 2016-10-22 03:58:19 -04:00
Connor Turland d549083cce prefer variable height lightbox over scrolling visually 2016-10-22 03:10:33 -04:00
Connor Turland 8e38469b1f add border radius to mapper list 2016-10-21 18:10:37 -04:00
Connor Turland be8efa6025 add card features (#793) 2016-10-21 17:42:21 -04:00
Connor Turland fb427a11f0 [WIP] keep client fresh with junto info globally (#791) 
* push state to client

* junto status is live on map cards XD

* little fixes

* eslint stuff

* remove object rest spread

* i think this makes realtime work without needing babel-node
 2016-10-21 09:29:04 -04:00
Connor Turland 52c340b8f5 center the explore maps div! (#787) 
* ooh baby

* will add displayStyle again later if we actually build it
 2016-10-19 14:40:42 -04:00
Devin Howard 261ed49977 replace uservoice with docs.metamaps.cc + Hylo (#777) 
* replace uservoice with docs.metamaps.cc + Hylo

* re-add the feedback tab as link to hylo
 2016-10-19 13:39:57 -04:00
Connor Turland 139837e997 restructure realtime server for clarity (#780) 
* restructure realtime server for clarity

* better indenting on signal.js

* don't need it because socketioconnection is being imported now
 2016-10-18 20:29:21 -04:00
Connor Turland 517cfcb913 remove static lib files in favor of npm ones (#773) 
* remove static lib files in favor of npm ones

* update howler to work correctly

* patch npm modules to not use window
 2016-10-17 10:39:08 -04:00
Devin Howard 0ee1b3284a fix check-canvas-support require 2016-10-17 13:47:42 +08:00
Devin Howard b976c13db2 Merge pull request #770 from metamaps/feature/remove-canvas-function 
remove check-canvas-support.js
 2016-10-17 13:40:34 +08:00
Connor Turland 332bb2ec08 Map Card changes (#769) 
* map card rewrite underway

* star count

* css fix
 2016-10-16 23:46:55 -04:00
Devin Howard 179849b639 remove check-canvas-support.js 2016-10-17 11:42:11 +08:00
Connor Turland 4602ded8a4 access requests (#762) 
* start on access requests

* set up access requests further

* set default values for approved and answered
 2016-10-16 20:22:00 -04:00
Devin Howard 9ac24f7468 Merge pull request #744 from metamaps/feature/markdown-in-topic-cards 
markdown in topic card description field
 2016-10-08 16:58:32 +08:00
Devin Howard fe1c57b458 further updates - make Enter update bip fields whaaat 2016-10-08 16:55:46 +08:00
Devin Howard 0764133d11 Merge pull request #661 from metamaps/feature/file-upload-component 
set up a dialog box to help with import/export
 2016-10-08 12:34:28 +08:00
Devin Howard f775629371 showCard .desc css for ul and a tags 2016-10-08 09:24:17 +08:00
Devin Howard 0085ce71e6 upgrade to best in place 3.0.0 alpha 2016-10-08 09:24:16 +08:00
Devin Howard 20da1ef39f fiddle with import icon 2016-10-08 00:21:04 +08:00
Devin Howard 42bb2cd86a look and feel updates 2016-10-08 00:16:37 +08:00
Connor Turland 85dcad928f enable pulling in of references to maps through typeahead (#636) 2016-10-06 09:12:01 -04:00
Devin Howard 38c323a18a global lightbox css changes 2016-10-06 16:22:22 +08:00
Devin Howard 518773d6e1 pop up a lightbox using React to help you export 2016-10-06 16:22:21 +08:00
Devin Howard eb4073c228 word wrap on chat message text. Fixes #726 2016-10-06 11:18:55 +08:00
Connor Turland 98fae4b721 fixes #711 toast button styling 2016-10-05 22:28:37 -04:00
Devin Howard 5819447828 fix git versioning 2016-09-25 19:35:37 +08:00
Devin Howard bda740491c moved JIT to npm. tests pass. whoop whoop 2016-09-23 11:59:23 +08:00
Devin Howard 07e4ac3865 attempt to get npm testing working; fail 2016-09-23 10:37:59 +08:00
Connor Turland f59a5775ae tweaks to import/exports 2016-09-22 20:16:18 -04:00
Devin Howard 30894a313f move views to their own frontend folder 2016-09-23 00:07:30 +08:00
Devin Howard a4d31241a8 move Metamaps code into webpack 2016-09-22 14:28:20 +08:00
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