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

571 commits

Author SHA1 Message Date
Devin Howard f8c11f234d more rubocop updates 2016-09-24 12:27:34 +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
Devin Howard 8a55491dab forgot last updated 2016-09-01 15:48:47 +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 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
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
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 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 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 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
Connor Turland 17da8441f4 fixup react setup 2016-08-04 13:58:59 -04:00
Connor Turland ede1dfb91c made the header more generic to serve other functions 2016-08-04 13:58:59 -04:00
Connor Turland 30e9a27663 almost rid of famous completely 2016-08-04 13:58:06 -04:00
Connor Turland aed423214f started using react instead of famous 2016-08-04 13:57:35 -04:00
Connor Turland 6b2386a545 progress onthe home page 2016-08-04 13:56:39 -04:00
Connor Turland 293e68da05 remove old stuff 2016-08-04 13:56:39 -04:00
Devin Howard 720f67cee7 move metacode loading earlier, and add a query string to work around amazon aws CORS issues 2016-08-03 08:54:10 +08:00
Connor Turland 2a3fa80540 wording needed updating 2016-04-24 12:15:40 -04:00
Connor Turland 8c51108a0c enable shared private and public maps (#530) 
* enable shared private and public maps

* change the list

* yeehaw add collaborators

* I believe this fixes the error connor brought up

* when topic or synapse is no longer on a map, don't defer

* needs to be before?

* just do it in the controller

* make recommendation they sign in and retry

* better email

* config for mailer previews

* improve wording

* shouldn't have included that

* switch to green

* don't execute if there's no map

* wasn't including the right people in some circumstances

* Finish breaking out JS files (#551)

* metamaps.Realtime refactor

* Metamaps.Util

* Metamaps.Visualize

* Metamaps.SynapseCard

* Metamaps.TopicCard

* Metamaps.Create.js

* Remove erb extension from Metamaps.Map.js

* Metmaps.Account and Metamaps.GlobalUI remove extension

* Metamaps.JIT no more erb extension

* move Backbone.init; standard-format on Metamaps.js.erb

* factor out canvas support check function

* some llittle template bugs

* remove featured from signed in explore maps bar

* don't let it overflow off the page
 2016-04-24 11:50:35 -04:00
Devin Howard e6c4313184 reindent upperelements template + fix input tag 2016-04-13 10:50:51 +08:00
Devin Howard a2ce20b564 versioncode fix 2016-04-13 10:48:34 +08:00
Devin Howard c9bba0cdb2 rename repo 2016-04-13 10:16:54 +08:00
Devin Howard 2e6f04d0be metamaps.debug function, and move VERSION into a rails constant initializer. 
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
 2016-04-06 10:27:31 +08:00
Devin Howard d3649f1d26 DRY map exporting with policy_scoping 2016-03-26 12:46:43 +08:00
Devin Howard ea677f8a6b DRY up csv/xls rendering, put it into model 2016-03-25 16:48:14 +08:00
Devin Howard 8f532708ce update xls/csv format to better serialize topics and synapses 2016-03-25 16:47:35 +08:00
Connor Turland fc1dc591f3 Merge branch 'copy/version.and.peers' into develop 2016-03-24 21:28:24 -07:00
Connor Turland 415c9b8ac3 final touchups on oauth 2016-03-24 21:26:07 -07:00
Connor Turland 14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland b6fac7d49b Merge pull request #420 from metamaps/feature/realtime.video 
JUUUUUUUUNTOOOO
 2016-03-23 17:46:35 -07:00
Connor Turland 70bc0959b0 update version, date, and peers 2016-03-23 16:52:53 -07:00
Devin Howard 756fe75664 call for developers in Inspect Element window 2016-03-15 16:06:37 +08:00
Connor Turland 8664cc0bd9 Merge branch 'develop' into feature/realtime.video 2016-03-14 11:11:11 +11:00
Connor Turland 579c36ec75 ensure the search box opens 2016-03-14 11:10:18 +11:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland 2d53922f1c can load maps 2016-03-12 11:46:01 +11:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard e64a16f1b8 main#home view simplify for only unauthenticated users 2016-02-28 18:55:48 +08:00
Devin Howard bc7db85c8c update map index views 2016-02-28 13:14:34 +08:00
Devin Howard 8916ff20b6 Merge pull request #477 from metamaps/feature/metacode-icon-on-aws 
metacode icons on aws (fixes #445)
 2016-02-28 12:19:00 +08:00
Devin Howard ac1d4f70b6 show old image on metacode edit form; tweak css of admin area 2016-02-26 14:06:37 +08:00
Devin Howard 40cd1ebb5c modify metacodes to instead have two fields, and validate that only one is present. Manual icons can be entered through rake tasks or on the rails console or in db seed 2016-02-25 14:49:48 +08:00
Devin Howard 59f84cfe20 cleanup TODO lines 2016-02-23 18:59:45 +08:00
Devin Howard 7a74668c8d tweaks to lightboxes view post-SSL 2016-02-23 18:56:50 +08:00
Devin Howard 295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION 2016-02-23 14:58:20 +08:00
Devin Howard dc1aa1e28e document synapse cancellation in cheatsheet 2016-02-14 15:19:36 +08:00
Devin Howard 987cd7f5a0 Merge branch 'feature/xls.export' into release/v2.8 2016-02-08 09:58:09 +08:00
Devin Howard 0ae8ea0ca5 implement csv/xls export 2016-02-07 13:12:18 +08:00
Devin Howard 786eeae72a Merge branch 'develop' into feature/realtime.video 2016-02-06 12:56:23 +08:00
Devin Howard 3fe93be987 Merge branch 'master' into develop 2016-02-05 20:21:31 +08:00
Devin Howard 48ec4a024e mark 2.7.1 2016-02-05 20:12:05 +08:00
Devin Howard b3d321c7e9 topic icon <-- 2016-02-05 18:27:26 +08:00
Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video 2016-02-05 16:27:43 +08:00
Devin Howard f2cbde50ca dos2unix on the whole repo 2016-02-05 11:43:15 +08:00
Devin Howard 3e28831595 Merge branch 'develop' into feature/realtime.video 2016-02-05 11:38:19 +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
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard 14a292331b two tweaks to help production deploy 2016-01-19 14:27:25 +08:00
Devin Howard 3cdab531a6 move more config into .example-env 2016-01-06 22:57:01 +08:00
Devin Howard a45d0f7791 fix search box on authenticated homepage 2015-12-24 15:19:03 +08:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Devin Howard 8394e0ce86 re-add regular uservoice code 2015-12-22 07:13:26 +08:00
Devin Howard 603b9dc52e remove uservoice code 2015-12-21 10:16:51 +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
Connor Turland 8b090be0b3 convert to something more 'call' style 2015-12-12 19:00:51 -05:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Connor Turland 2929547736 position the chat box, and remove the old junto panel 2015-12-03 17:15:15 -05:00
Connor Turland 5b0e7ffcde switching metacode sets was being caught by Metamaps.Router.intercept 2015-12-03 16:57:30 -05:00
Devin Howard 75700f06a9 make invite link use REQUEST_URI 2015-12-03 16:57:29 -05:00
Devin Howard 96f5e6ac35 add asset_path calls 2015-12-03 16:57:26 -05:00
Devin Howard 29411cf1e5 asset_path 2015-12-03 16:57:26 -05:00
Devin Howard c782c4d0bb remove binding.pry 2015-12-03 16:57:26 -05:00
Devin Howard a7e512e25a working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-12-03 16:57:24 -05:00
Devin Howard b395bd0b50 replace the obvious spots with asset_path 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 e34b5bd2ad fix best in place deprecation warnings in map info box 2015-12-03 16:57:22 -05:00
Connor Turland 03ab04050d switching metacode sets was being caught by Metamaps.Router.intercept 2015-11-07 01:33:18 +08:00
Devin Howard 660ee52292 make invite link use REQUEST_URI 2015-11-03 22:22:53 +08:00
Devin Howard fcd866c05e add asset_path calls 2015-10-25 16:50:07 +08:00
Devin Howard da98a53a3e asset_path 2015-10-23 23:56:29 +08:00
Devin Howard b00784731b remove binding.pry 2015-10-23 23:42:21 +08:00
Devin Howard a51777b0ba working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-10-02 13:36:51 +08:00
Devin Howard 8f8f40c0e4 replace the obvious spots with asset_path 2015-09-22 22:27:34 +08:00
Devin Howard 086acb09af select metacodes with one query instead of n queries, move logic to application_helper 2015-09-19 20:17:56 +08:00
Devin Howard 31015295f8 fix best in place deprecation warnings in map info box 2015-09-19 17:11:48 +08:00
Connor Turland 48cab05d7c Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2014-12-02 13:32:48 -05:00