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

310 commits

Author SHA1 Message Date
Connor Turland 6d8392d2e7 Make mailboxer look good and update email templates 2016-12-16 16:24:01 -05:00
Devin Howard 0960159265 Mailboxer notification pagination 2016-12-16 16:23:49 -05:00
Devin Howard 9debcdde39 Integrate rails mailers with mailboxer 2016-12-16 16:23:17 -05:00
Robert Best b4ad51e69d reactify notification icon 2016-12-16 16:21:40 -05:00
Devin Howard 1ba339b3be subset of synapse creation changes (#970) 
* esc cancels topic and synapse creation now

* close topic/synapse creation on right click

* backspace and delete don't close synapse creation anymore

* hitting tab saves the synapse you're creating
 2016-12-11 17:15:09 -05:00
Devin Howard 6129a27ecf hit Ctrl+A a second time to select all synapses, too (#968) 2016-12-11 16:21:36 -05:00
Devin Howard d51e3f3b52 update npm deps, EXCEPT socket.io and backbone (#950) 
* update npm dependencies (with some exceptions)

* update autolinker, remove underscore
 2016-12-11 16:09:12 -05:00
Connor Turland a133702be2 Some topics and synapses were hidden from users erroneously (#944) 
* ensure topics and synapses have their permission match the map they're deferring to

* update permission of topics and synapses as map perm changes, when defer_to_map

* try enabling count threshold on rubocop

* remove unused mk_permission functions

* change *_count methods to use delegate to save lines in map.rb model

* rubocop topic.rb
 2016-12-06 16:46:46 -05:00
Devin Howard 3f161c1076 make topic titles have width of 25 chars (#933) 2016-11-29 11:00:14 -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 90c5bc26fc Active.Mapper was being initialized twice, causing errors (#934) 2016-11-27 21:12:05 -05:00
Devin Howard 5d8ff3efce realtime shouldn't poll forever if the dev server isn't up (#931) 2016-11-24 14:40:14 -05:00
Devin Howard ce2d462578 fix bugs on develop branch 2016-11-09 20:44:00 -05:00
Devin Howard 5851d57eef Merge branch 'master' into develop 2016-11-09 09:29:30 -05:00
Connor Turland e1441acde0 synapse wasn't updating calculated_permission 2016-11-08 19:50:08 +00:00
Devin Howard a176cdf231 eslint frontend folder (#923) 2016-11-07 15:25:08 -05:00
Devin Howard 2f4fe525ce Fix a bunch of errors and style issues 2016-11-07 14:55:20 -05:00
Devin Howard 518782e1c7 remove Metamaps.Erb 2016-11-07 14:55:20 -05:00
Devin Howard 7c9b6a2205 try to move all rails data into Metamaps.ServerData 
Metamaps.Erb and currentPage and currentSection are still not in; should they be?
 2016-11-07 14:55:20 -05:00
Devin Howard 8026969799 start storing data in ServerData 2016-11-07 14:55:17 -05:00
Devin Howard 4b500a4428 move Metamaps.Loading into node modules 2016-11-07 14:40:43 -05:00
Devin Howard 0778179ba7 eslint 2016-11-07 14:40:43 -05:00
Devin Howard bfd23c6d32 split Backbone.js into a bunch of different files. Still more work to do to modularize it 2016-11-07 14:40:43 -05:00
Devin Howard 9cb3074245 rename Metamaps.Backbone to Metamaps.DataModel 2016-11-07 14:40:43 -05:00
Connor Turland 887c3f7570 fixes #903 and #831 (#911) 2016-11-04 15:02:56 -07:00
Connor Turland 667f5653a7 topic descriptions from old data can be nil 2016-11-04 21:03:11 +00:00
Connor Turland 9ad4684825 firefox needs e.pageX not e.x (#906) 2016-11-02 19:20:06 -07:00
Devin Howard 644df6fcdc fix pasting urls (#901) 2016-11-01 16:01:34 +08:00
Connor Turland ed3e4780d2 bug when topic was in more than 5 maps fixes #891 (#894) 2016-10-31 17:10:44 -04:00
Connor Turland 151e96f803 Metamaps.Realtime.synapseRemoved is not a function (#880) 2016-10-29 12:10:13 -04:00
Connor Turland 6cc827d11c wasn't updating calculated_permission when updating permission (#869) 2016-10-28 18:26:40 -04:00
Devin Howard de16420796 fix logCanvasAttributes error (#863) 2016-10-28 15:20:39 +08:00
Devin Howard 4f3d12d7a5 fix import promises (#858) 2016-10-27 14:03:18 +08:00
Devin Howard 7b4a072fd8 attempt to fix import problems (#852) 2016-10-26 20:34:22 +08:00
Devin Howard b13587456d fix coordsToPixels calls even more 2016-10-26 19:11:40 +08:00
Devin Howard 98725b3ee4 fix getPastelColor function (I think) (#850) 
* fix getPastelColor function (I think)

* fix pixelsToCoords and coordsToPixels function calls

* update signature of coord/pixel functions in Util.spec.js
 2016-10-26 14:26:48 +08:00
Devin Howard 47bca5907e add tests for Metamaps.Util (#825) 
* decouple Util from other Metamaps modules

* first few Util tests

* more Util tests

* remove dead code

* eslint
 2016-10-25 12:28:51 +08:00
Robert Best 0b6348e13f This fix closes the topic creation spinner when the map is panned. (Since, sometimes a click turns into a really small pan) (#828) 2016-10-24 11:48:34 -04: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 4c68fd90ca set useful num for desc truncation on map cards 2016-10-23 16:30:54 -04:00
Connor Turland cda0c21a0b make it responsive (#820) 2016-10-23 16:12:07 -04:00
Connor Turland a44edbb17e better transition from map to explore 2016-10-23 11:44:20 -04:00
Connor Turland 4f9b9460ad don't block all right clicks 2016-10-23 11:12:43 -04:00
Devin Howard 154257d062 fix Ctrl+A (#814) 2016-10-23 18:02:59 +08:00
Connor Turland 9600983311 remove Connor thinking out loud comment 2016-10-22 11:07:50 -04:00
Robert Best c0b35280f6 Middle.mouse.click features (Open contained link & copy text to clipboard) (#792) 
* changed the code to be based off of the current dev branch

* Update JIT.js

* Update Util.js

* Update JIT.js

A few logical operators were replaced with their stricter counterpart.

* Update JIT.js

* Update index.js

* Update Util.js
 2016-10-22 02:58:13 -04:00
Robert Best 37b989c38e Update Listeners.js 2016-10-22 01:52:43 -04:00
Robert Best 759ec7845b cleaned up the window resize function even further 2016-10-22 05:50:31 +00:00
Robert Best cfb8f51214 simplified the window resize function by adding a Util function that logs the canvas attributes. 2016-10-22 05:21:32 +00:00
Robert Best 1cd7e22c40 Merge commit '858ca66d69ed9e43f4d3a4ce6be288508cf4efa1' of github.com:metamaps/metamaps into window.resize.fix 2016-10-22 05:00:10 +00:00
Robert Best ad1889dfc5 Merge branch 'develop' of github.com:metamaps/metamaps into window.resize.fix 2016-10-22 04:54:31 +00:00
Connor Turland cbc8e6cdd4 the return of the infinite scroll (#795) 2016-10-22 00:15:10 -04:00
Connor Turland f8556c30a5 resize every time it renders 2016-10-21 19:10:28 -04:00
Connor Turland be8efa6025 add card features (#793) 2016-10-21 17:42:21 -04:00
Robert Best f68deea202 changed all logical operators to be more strict 2016-10-21 20:59:16 +00:00
Robert Best b61cdb04fc Fixed the glitchyness, and made it suitable to merge with develop 2016-10-21 20:47:14 +00:00
Robert Best 5c67fcbff7 this time I actually addressed the conflicts 2016-10-21 20:38:17 +00:00
Robert Best 2eeb0a671f Fixed cherry pick conflicts 2016-10-21 20:26:42 +00: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 7a09a1c620 last commit broke stuff 2016-10-20 18:27:14 -04:00
Connor Turland 103ed5cbd7 max at 4, use fewer if not enough maps 2016-10-20 18:10:28 -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
Connor Turland 9299ca5f2c dont do translate with arrow keys till we can block conflicts 2016-10-19 17:47:10 +00:00
Devin Howard 2529e0d44f copy share invite link to clipboard automatically where possible 2016-10-19 11:07:20 +08: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 d8cd536a95 too much logging 2016-10-18 14:10:41 -04:00
Connor Turland 29913cd10b fix for heroku 2016-10-18 14:08:10 -04:00
Connor Turland d004e98ada holy insanity realtime refactor (#779) 
* all the refactoring

* make it all work
 2016-10-18 12:34:19 -04:00
Connor Turland d2e097fd05 add webrtc logging 2016-10-17 22:59:28 -04:00
Connor Turland fe0da255dd [WIP] display whether a map is live on every map card (#775) 
* tidy up

* checkwhethertosave was no longer correct
 2016-10-17 22:27:15 -04:00
Devin Howard 6c9d464a9f Global => All Maps (#774) 2016-10-17 10:53:33 -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
Connor Turland 332bb2ec08 Map Card changes (#769) 
* map card rewrite underway

* star count

* css fix
 2016-10-16 23:46:55 -04: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 8180a8cc71 fix file upload box 2016-10-14 14:45:17 +08:00
Devin Howard fc2849824f fix js syntax error 2016-10-13 16:48:46 +08:00
Devin Howard b2a4acc99d make default category explicit in import.js 2016-10-13 14:24:08 +08:00
Devin Howard 858ca66d69 eslint updates 2016-10-10 17:22:22 +08:00
Devin Howard 6e6d33abbe fix screenshot no file error 2016-10-10 12:12:42 +08:00
Devin Howard 8b1d85c3ca actually the smart option is dumb 2016-10-09 10:24:13 +08:00
Devin Howard ba9e26bc05 enable xss filtering and smart quote replacement in markdown 2016-10-09 10:20:17 +08: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 7eacda2ae7 code style 2016-10-08 09:35:05 +08:00
Devin Howard 0085ce71e6 upgrade to best in place 3.0.0 alpha 2016-10-08 09:24:16 +08:00
Devin Howard fc044294f1 add markdown to topic cards 2016-10-08 09:23:57 +08:00
Devin Howard 42bb2cd86a look and feel updates 2016-10-08 00:16:37 +08:00
Robert Best b6da38e29e Update Listeners.js 
Simplified based on Connor's suggestion about usage of variables.
 2016-10-07 02:36:41 -04:00
Devin Howard 2b036bfb4e all Ctrl shortcuts now also work with Meta (Cmd on OSX) 2016-10-07 14:03:48 +08:00
Robert Best 3e4ff59a82 Update Listeners.js 2016-10-06 23:58:57 -04:00
Robert Best 08f89ee630 Update Listeners.js 2016-10-06 23:56:39 -04:00
Robert Best b978247785 Put all the code within the if statement 2016-10-07 00:51:52 +00:00
Robert Best 0aeb6caadb Makes it so that resizing the browser window doesn't change the user's location on the map 2016-10-07 00:33:16 +00:00
Connor Turland 97d2868fad dont pan while using arrow keys during creation fixes #721 (#733) 2016-10-06 10:49:49 -04:00
Connor Turland 658f102a4e fixes #720 double topic create when pinned (#732) 2016-10-06 10:37:01 -04:00
Connor Turland 85dcad928f enable pulling in of references to maps through typeahead (#636) 2016-10-06 09:12:01 -04:00
Connor Turland a79d6a824c dont do async: false (#731) 
* dont do async: false

* account for case where callback isn't provided
 2016-10-06 09:07:46 -04:00
Devin Howard 518773d6e1 pop up a lightbox using React to help you export 2016-10-06 16:22:21 +08:00
Devin Howard 33bcfc1505 move Maps into a folder 2016-10-06 16:20:27 +08:00
Devin Howard b4d1250959 share normalizeKey between TSV, CSV, and JSON 2016-10-06 12:03:23 +08:00
Devin Howard c0a220abc9 allow synapses to be imported by topic name as well as id 2016-10-06 11:52:05 +08:00
Connor Turland 0cfbe41d95 don't prevent all right clicking 2016-10-05 22:22:38 -04:00
Connor Turland c256d0891b dont conflict message sending with topic creation 2016-10-05 22:17:04 -04:00
Connor Turland 6d6a5099e9 Enable access to Most Used and Recently Used metacodes in lists and carousel (#708) 
* used and recent

* enable most used and recent in all metacode select situations

* selected changed to active at some point

* switch recent and most used positions

* remove index doc page
 2016-10-05 10:45:39 -04:00
Devin Howard 12417d8cd3 update JIT eslint style 2016-10-05 01:46:51 +08:00
Devin Howard 113a5a2530 fix a bunch of bug risk eslint warnings 2016-10-04 23:38:32 +08:00
Connor Turland da3795a2c2 new map improvements (#710) 
* prehighlight the text for editing when taken to a new map

* style
 2016-10-02 22:49:45 -04:00
Devin Howard 6d2efefbbc Merge pull request #709 from metamaps/bug/backbone 
backbone router fix
 2016-10-03 08:28:36 +08:00
Devin Howard 87228a9631 delete old gems and upgrade aws/paperclip (#676) 
* remove old gems from gemfile, upgrade aws/paperclip

* update paperclip config

* upload screenshots as a blob instead of base64 to maps controller
 2016-10-02 18:29:35 -04:00
Connor Turland 0f740e751a topics wasn't in backbone routes 2016-10-02 17:37:14 -04:00
Devin Howard ca981898d4 arrow key panning - fixes #239 2016-10-02 00:09:55 +08:00
Devin Howard 8f230736dc code climate 2016-10-01 13:47:16 +08:00
Devin Howard bb013787b6 make AutoLayout skip over coordinates if there is a mapping at that exact position 2016-10-01 13:34:52 +08:00
Devin Howard 20a32afe3b integrate handleURL into Import 2016-10-01 13:18:50 +08:00
Devin Howard c5564e02fc don't needt o open topic card 2016-10-01 12:47:30 +08:00
Devin Howard 4949f0dbd6 eslint and use AutoLayout 2016-10-01 12:43:30 +08:00
Devin Howard 1562d8fcfe topics imported with a link get Reference metacode 2016-10-01 12:14:38 +08:00
Devin Howard e093ca5a30 more liberally import csv 2016-10-01 11:21:42 +08:00
Devin Howard 01872e740e fix import if there are errors 2016-10-01 11:19:38 +08:00
Devin Howard 0e79f2ae4b fix tsv 2016-09-30 22:33:09 +08:00
Devin Howard b396b94477 re-enable Ctrl+/ search box focus shortcut 2016-09-30 11:55:43 +08:00
Devin Howard e916ea32dc Merge pull request #690 from metamaps/feature/globalui-lint 
eslint updates for GlobalUI.js
 2016-09-30 11:54:40 +08:00
Devin Howard 816d5adf94 remove old code from GlobalUI.Search 2016-09-30 11:52:01 +08:00
Robert Best 44a183ed7b I changed how zoom by mouse-wheel works so that it zooms based on where your mouse pointer is 2016-09-29 21:32:55 +00:00
Devin Howard e4e6043ded split GlobalUI into files 2016-09-30 00:20:16 +08:00
Devin Howard 24caafba74 move GlobalUI into a folder 2016-09-30 00:08:45 +08:00
Devin Howard 3b8199aac6 eslint updates for GlobalUI.js 2016-09-30 00:08:04 +08:00
Devin Howard 2f0b0f39e5 Merge pull request #688 from metamaps/fix/searchsynapses-undefined-topic 
fix error when searching for synapse with undefined topic1id
 2016-09-29 23:56:16 +08:00
Devin Howard 1d4d7f07e2 fix error when searching for synapse with undefined topic1id 2016-09-29 18:38:54 +08:00
Devin Howard 9af3f04f4d Merge pull request #685 from metamaps/feature/chatview-lint 
update ChatView.js eslint style
 2016-09-29 15:21:15 +08:00
Connor Turland 1bbc72fff0 was destroying and not reinitializing 2016-09-28 22:36:53 -04:00
Devin Howard bca85337cc add template strings + outdent to chatview 2016-09-29 09:33:13 +08:00
Devin Howard e858a2a773 update ChatView.js eslint style 2016-09-29 09:24:17 +08:00
Robert Best e8746ee7d9 Update Create.js 2016-09-28 15:32:49 -04:00
Robert Best a37f60060c Update JIT.js 2016-09-28 15:31:08 -04:00
Robert Best 4e506ad290 Update JIT.js 2016-09-28 15:18:44 -04:00
Robert Best 67c4912c62 Update index.js 2016-09-28 13:37:08 -04:00
Robert Best 10a2782f85 Update JIT.js 2016-09-28 13:03:44 -04:00
Robert Best 2c3b387e42 Update index.js 2016-09-28 13:00:32 -04:00
Devin Howard a8b698b11c Merge pull request #677 from metamaps/feature/node1-topic1-migration 
node{1,2}_id => topic{1,2}_id migration and code changes
 2016-09-28 22:26:50 +08:00
Robert Best 40b7e95b68 Update index.js 
Prevents the default chrome context menu from appearing overtop the Metamaps context menu
 2016-09-28 04:35:41 -04:00
Devin Howard 743c9b3af9 node{1,2}_id => topic{1,2}_id migration and code changes 2016-09-28 10:35:14 +08:00
Connor Turland 8f0b350a2d Fix underscore bug (#674) 
* Update package.json

* Update ChatView.js
 2016-09-26 20:39:33 -04:00
Devin Howard 7150b9fcce Merge pull request #673 from metamaps/fix/eslint-updates 
Figured out eslint-3 + some small eslint fixes
 2016-09-26 18:18:31 +08:00
Devin Howard bc8ce0fee4 topic view bug fix 2016-09-26 14:04:31 +08:00
Devin Howard ebaae084ae simple eslint fixes 2016-09-26 13:37:42 +08:00
Devin Howard c20e503785 show/hide add a topic instructions more consistently 2016-09-25 23:48:14 +08:00
Devin Howard 17870e7a4c Merge pull request #669 from metamaps/fix/remove-invalid-links 
show link remover for invalid links too
 2016-09-25 23:47:30 +08:00