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

868 commits

Author SHA1 Message Date
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
Devin Howard d778016571 fix selection box on radial view - fix #463 2016-08-07 13:17:25 +08:00
Connor Turland 17da8441f4 fixup react setup 2016-08-04 13:58:59 -04:00
Connor Turland 4005b301ac uncomment commented header lines 2016-08-04 13:58:59 -04:00
Connor Turland 804afc3e1d remove famous leftovers 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 a6951920eb fix module.exports javascript bug 2016-08-04 17:08:10 +08:00
Devin Howard 6df8da16bc Merge branch 'master' into develop 2016-08-04 10:51:36 +08: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
Devin Howard 6997142fd9 finish integrating npm. move underscore/backbone into npm management (#577) 
* finish integrating npm. move underscore/backbone into npm management

* update docs for npm integration

* allow jsx or js extension

* change underscore version
 2016-08-01 15:59:53 -04:00
Devin Howard 5fe03641cb move frontend code into a folder, and setup react build tooling with es6 transforms (#576) 2016-07-31 14:51:06 -04:00
Devin Howard e5c9af8f95 use Wildcard if no metacode 2016-07-24 13:43:12 +08:00
Devin Howard 27942546b8 fix 2 bugs on develop (#565) 
* fix js bug

* if mappable is nil it causes an error
 2016-07-02 16:32:02 +08:00
Devin Howard 872ae90832 submit new map form on Enter - fixes #555 (#562) 
* submit new map form on Enter - fixes #555

* update divs too
 2016-07-01 16:48:38 +08:00
Connor Turland c08868a5c1 user presence event (#552) 2016-04-26 08:08:12 -04:00
Devin Howard 45adda93b1 set up scaffolding for js tests (#553) 2016-04-26 10:22:32 +08: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 c1d963d669 remove .erb from files that don't need it 2016-04-15 09:18:17 +08:00
Devin Howard 8bb96d12a6 Metamaps.Control 2016-04-15 09:13:01 +08:00
Devin Howard 6a8921ae6d standard-format Metamaps.JIT.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard 074eaf0bd3 alphabetize dependecies 2016-04-15 09:13:01 +08:00
Devin Howard 324719e531 Metamaps.Filter 2016-04-15 09:13:01 +08:00
Devin Howard b10f0cef0e Metamaps.Listeners.js.erb 2016-04-15 09:13:01 +08:00
Devin Howard a5bd0440a8 Metamaps.Organize 2016-04-15 09:13:01 +08:00
Devin Howard ca5928113d whoops don't forget standard format 2016-04-15 09:13:01 +08:00
Devin Howard de62a08307 Metamaps.Topic 2016-04-15 09:13:01 +08:00
Devin Howard 4833dd8da6 Metamaps.Synapse 2016-04-15 09:13:01 +08:00
Devin Howard 11a87582c7 Metamaps.Map 2016-04-15 09:13:01 +08:00
Devin Howard 13d6ab56e5 factor out two more small view modules 2016-04-15 09:13:01 +08:00
Connor Turland 7bb7f345f1 added an event for conversations starting (#547) 
* added an event for conversations starting

* switch to post
 2016-04-14 14:35:28 -04:00
Devin Howard 6653d10edf Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT 2016-04-13 16:06:01 +08:00
Devin Howard be99ad8285 factor out Metamaps.Admin 2016-04-13 16:04:15 +08:00
Devin Howard 799f6e4623 Metamaps.Router standard style 2016-04-13 15:58:54 +08:00
Devin Howard df9c0a93bc Metamaps.Views standard style 2016-04-13 15:58:54 +08:00
Devin Howard e8c55df4e8 Metamaps.Backbone standard style 2016-04-13 15:58:54 +08:00
Devin Howard 5a3ab025b7 Metamaps.Import standard style 2016-04-13 15:58:54 +08:00
Devin Howard a2ce20b564 versioncode fix 2016-04-13 10:48:34 +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
Connor Turland 8a6d434fc3 Junto Sounds 
* awesome news sounnndzzzz

* prevent double sound

* bug fixes and chat sounds on by default
 2016-04-04 10:50:02 -04:00
Devin Howard 7d6acb7014 fix json import 2016-03-31 13:03:14 +08:00
Devin Howard ccd07ddd19 import fixes 2016-03-31 09:25:14 +08:00
Devin Howard 8a6e702c12 fix js error 2016-03-27 15:32:18 +08:00
Devin Howard 30d327f07a solution using backbone events instead of setTimeout 2016-03-27 15:20:09 +08:00
Devin Howard f9e6249615 Fix up import - want more backboney event listening though 2016-03-27 15:09:08 +08:00
Devin Howard 53867caae8 allow JSON or TSV parsing 2016-03-26 15:03:44 +08:00
Devin Howard 92f78aa56a update tsv code to handle new export code at the very least. 
next step will be allowing json input too
 2016-03-26 12:49:26 +08:00
Devin Howard 387c863222 fix a bug with synapses and use cid to link new topics with synapses 
Synapses are now created client-side, but still rejected server-side
 2016-03-25 16:48:14 +08:00
Devin Howard c77cc32734 import fixes 
- better abort logic & messaging
 - handle \r line delim
 - better example format at top
 2016-03-25 16:48:14 +08:00
Devin Howard 0c1e12a301 use state machine to implement smarter topic/synapse import 
also include better auto-layout of new topics if x/y not specified
 2016-03-25 16:46:05 +08:00
Devin Howard b47ed7b5b4 don't ask about adding 0 topics 2016-03-25 16:46:05 +08:00
Devin Howard 6df7fa849a bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself 2016-03-25 16:46:05 +08:00
Connor Turland 14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland baa5439f0f auto position videos which haven't been manually positioned 2016-03-23 16:12:23 -07:00
Connor Turland 617dec72b9 hide sound option. green 'in call' dot. tooltip 2016-03-21 13:08:34 -07:00
Connor Turland 1ee33b843f Merge branch 'develop' into feature/realtime.video 2016-03-14 21:40:25 +11:00
Connor Turland f24def8be6 fix up javascript errors 2016-03-14 21:36:16 +11:00
Connor Turland 4ed00240eb api: revert silly js change 2016-03-12 11:15:14 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Connor Turland ef60aefe88 fix js bug 2016-03-11 07:59:22 +11:00
Connor Turland 26025d6ee9 store the right number of mappers in conversation 2016-03-01 12:30:49 +13:00
Connor Turland bd5c88fb0b display initial state of call to new mapper 2016-03-01 12:25:38 +13:00
Connor Turland 4e92d4c2c5 change video border width 2016-02-29 17:05:36 +13:00
Connor Turland d50923b6bd fix js bug 2016-02-29 17:05:11 +13:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13: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
Connor Turland f9b23499dc styling. add self to participants 2016-02-26 12:43:27 +13:00
Devin Howard e1b2ddde7d add another TODO... 2016-02-23 19:04:39 +08:00
Devin Howard 09ceb8ceec move 4 global variables into Metamaps namespace 2016-02-23 19:04:30 +08:00
Connor Turland 2f4b3b3761 call was ending in wrong situation 2016-02-17 13:49:48 +13:00
Connor Turland d82288c9f2 fixed up call ending/starting events 2016-02-17 13:27:22 +13:00
Devin Howard 9ff6375e62 don't need to create synapse on canvas click 2016-02-14 15:19:36 +08:00
Devin Howard 9469b08ffa cancel synapse creation with esc, backspace, or delete 2016-02-14 15:19:35 +08:00
Devin Howard 056ef2b5b6 smoother synapse creation with clicks/tabs 2016-02-14 15:19:35 +08:00
Devin Howard 48863ce246 create synapse if you click away from the synapse title form 2016-02-14 15:19:35 +08:00
Connor Turland e29b683b38 new junto images 2016-02-09 09:14:33 +13:00
Devin Howard f42b30e8b5 Merge branch 'feature/auto.synapse' into release/v2.8 2016-02-08 09:57:58 +08:00
Devin Howard 83551e317e create synapse if you click away from the synapse title form 2016-02-06 13:03:47 +08:00
Devin Howard 786eeae72a Merge branch 'develop' into feature/realtime.video 2016-02-06 12:56:23 +08:00
Devin Howard 798035107f Merge branch 'master' into develop 2016-02-06 10:11:55 +08:00
Devin Howard 67da49c1be max height on search results so they scroll 2016-02-05 22:13:23 +08:00
Devin Howard 57a8b654ba smoother 'added by me' filtering 2016-02-05 21:25:20 +08:00
Devin Howard 3fe93be987 Merge branch 'master' into develop 2016-02-05 20:21:31 +08:00
Devin Howard 6b9aa52224 well, the loading icon mostly works now too 2016-02-05 20:09:00 +08:00
Devin Howard 5f90843da2 gross, but it works. checkboxes in search results work 2016-02-05 20:02:57 +08:00
Devin Howard c427e7fd7e mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable 2016-02-05 19:54:38 +08:00
Devin Howard 353872001f vertical align no results 2016-02-05 19:21:09 +08:00
Devin Howard aabdaaf21b nicer icon positioning 2016-02-05 19:19:16 +08:00
Devin Howard f1f56f9286 centre topic icons if there are results 2016-02-05 19:11:19 +08:00
Devin Howard 461b62628d fix minimizing search results 2016-02-05 19:06:57 +08:00
Devin Howard 3405bf5942 fix the problem where it always closes on you 2016-02-05 18:56:16 +08:00
Devin Howard a05fe70eda topic headers on resultnoresults 2016-02-05 18:35:45 +08:00