Commit graph

2445 commits

Author SHA1 Message Date
Connor Turland
40c92cd8dc filter box in react 2017-03-15 20:59:10 -04:00
Connor Turland
9789e9966b made our request invite page look nice 2017-03-13 13:30:12 -04:00
Connor Turland
598d1192e3 fix apps pages and missing routes 2017-03-13 12:55:59 -04:00
Connor Turland
4a3d78816e fix toast (and sign out bug) 2017-03-13 12:22:52 -04:00
Connor Turland
ac87fc0ed5 rewrite map instructions 2017-03-13 10:04:44 -04:00
Connor Turland
dc33d5f687 add frame for topic view 2017-03-13 09:34:34 -04:00
Connor Turland
9a8370d573 this shouldn't have been removed 2017-03-13 09:30:17 -04:00
Connor Turland
44d72200d4 handle case where user hasn't loaded yet 2017-03-13 09:29:57 -04:00
Connor Turland
714e76e89e jquery no longer handling access requests 2017-03-13 09:22:48 -04:00
Connor Turland
4c1646fdef fix up navigation to use react-router 2017-03-13 09:21:16 -04:00
Connor Turland
8010e7d497 fixup mapchat stuff 2017-03-13 08:50:04 -04:00
Connor Turland
ea82a9df27 improve topic card readability and fix dragging bug 2017-03-13 07:36:27 -04:00
Connor Turland
b09c876ea3 fix map chat layout and tab bug 2017-03-13 07:18:51 -04:00
Connor Turland
959a6837d8 lots of fixes 2017-03-12 22:14:44 -04:00
Connor Turland
743e3371eb add metacode edit routes 2017-03-12 14:49:12 -04:00
Connor Turland
fb094c3392 fix accountbox toggling 2017-03-12 12:47:47 -04:00
Connor Turland
9f2a61ce32 fix signed out home page 2017-03-12 12:35:52 -04:00
Connor Turland
0741743660 make other routes work 2017-03-12 12:26:49 -04:00
Connor Turland
96c202c7bf fixed maps scrolling 2017-03-12 11:31:19 -04:00
Connor Turland
e4e062b76e get account menu and invite lightbox working 2017-03-12 03:49:34 -04:00
Connor Turland
871c491097 redo the mobile menu in react 2017-03-12 03:26:00 -04:00
Connor Turland
780217490b remove filterBoxOpen for now 2017-03-12 01:00:37 -05:00
Connor Turland
032d0d8f4b make mapsWidth work and add mobile 2017-03-12 00:56:59 -05:00
Connor Turland
9013d49ca1 fix map upperRightUI layout 2017-03-11 21:24:43 -05:00
Connor Turland
d2d35c9a3d just keep using current mapinfobox 2017-03-11 21:13:58 -05:00
Connor Turland
c954ba99f8 lock version number 2017-03-11 19:43:27 -05:00
Connor Turland
82ed9e01a8 stuff 2017-03-11 09:56:09 -05:00
Connor Turland
701198ef14 initial restructuring 2017-03-11 01:49:27 -05:00
Devin Howard
1124d76475 re-enable codeclimate duplication 2017-03-10 08:30:01 -08:00
Connor Turland
4ffa9460f5 bug fix for people who aren't testers on settings page 2017-03-10 11:29:00 -05:00
Connor Turland
44753dbfe1 Merge branch 'develop' 2017-03-09 14:55:59 -05:00
Connor Turland
77f76b1b5a variable name fix and make is_tester method global for reuse in views 2017-03-09 14:36:24 -05:00
Devin Howard
e544d6a6db refactor api and fix bugs (#1088)
* fix weird double-embed issue

* fix users/current api if not logged in

* turbocharge the api

* fix docs
2017-03-09 14:24:52 -05:00
Devin Howard
780e66632b fix react embedly (#1089) 2017-03-09 14:23:24 -05:00
Connor Turland
de4f51bb5c fix permissions and don't send if has map open 2017-03-08 15:45:40 -05:00
Connor Turland
5d0da4c5f1 method was preventing certain follows from succeeding 2017-03-08 15:02:22 -05:00
Connor Turland
9079d1bffc check permissions prior to sending 2017-03-08 15:01:58 -05:00
Connor Turland
962881a35d Update follow_service.rb 2017-03-08 14:13:47 -05:00
Connor Turland
8483b62603 allow users to select follow settings 2017-03-08 18:50:56 +00:00
Devin Howard
e3b4dac1e1 remove takeScreenshot button in favour of separate buttons in the map card and import/export dialogue (#1086) 2017-03-07 12:15:28 -05:00
Connor Turland
8998e3858c fixes bug where popups are happening 2017-03-07 16:55:15 +00:00
Devin Howard
ce51eeca8c remove dedupe plugin 2017-03-07 07:54:25 -08:00
Connor Turland
3178f6e650 bump version number 2017-03-07 03:58:29 +00:00
Connor Turland
7ee96bf6c6 Into master: two finger pan/zoom, map and topic follows (for internal testing) on the UI, map activity emails (#1084)
* fix topic spec

* fix synapse/mapping spec

* brakeman csrf warning suppressed :|

* follows for maps in the ui for internal testing only still (#1072)

* follows for maps in the ui for testers

* require user for these actions

* match how map follow works

* include ability to unfollow from email

* fixup templates

* add unfollow_from_email to the policies

* Update _cheatsheet.html.erb

Clean up text, clarify, and bring in line with current functionality

* topicsRegex and synapsesRegex should allow commas (#1073)

* even better import csv regexes

* prevent double prompt on file drop import

* topic card in react (#1031)

* its coming along

* links bar

* scssify a bunch

* metacode image working a bit better

* metacode selector in react topic card

* riek editing for name field on topic card

* riek submit on enter

* factor out Title and Links from Topic Card component, but not the listeners

* create working Desc editor

* styling is much better now

* textarea min height for desc

* disallow images in topic card markdown

* shift enter is linebreak, enter is save

* attachments split out, but it's pretty buggy

* move listeners into Links.js

* slightly wider metacodeTitle

* fix positioning on metacode selector

* fix metacode selection

* move metacode and permissions into subcomponents

* fixes

* prevent editing on desc/title if not authorized to edit

* fix topic card draggability

* fix embedly

* fix md test

* remove the removed link card manually with jquery

* fix test syntax

* eslint

* more eslin

* reuse authorizedToEdit

* convert metacode sets to a json object for react

* add the html in react whoop

* fix metacode styling

* sort wasn't working

* finishing metacode select

* readd the above link input border

* fix syntax

* multiline title editable textarea

* more portable metacode selector component

* factor out #metacodeOptions into one react component with a callback :D:D:D

* render metacodeOptions in right click menu with react

* render metacodeOptions in right click menu with react

* fix up right click menu's metacode editing

* fix topic card title character counter

* ignore metamaps secret bundle in ag

* simplify Attachments props

* factor out embedly card into its own component; it seems to help

* link resetter

* fix edit icon on title in topic card

* move mapCount and synapseCount hover/click logic to react

* fix up the showMore control

* metacode selection tweaks

* tweak links bar spacing in topic card

* rubocop

* remove TODOs

* more badass permissions selector

* close permission selector when you click outside

* fix overeager metacode selector

* more modular attachments component

* fix bug in Desc.js

* fix right click styling

* permission changes are different than edit rights

* bad module ref

* ensure maxLength on topic titles

* hellz yeah (#1074)

* fix drop from two touches to one

* don't commit activity service

* ability to select/unselect all metacodes in custom set with keyboard shortcut (fix #390) (#1078)

* ability to select/unselect all metacodes in custom set with keyboard shortcut

* select all button

* nicer all/none buttons

* set up react testing (#1080)

* install mocha-webpack. also switch hark to npm version instead of github version

* well, mocha-webpack runs

* add jsdom for tests

* upgrade to webpack 2

* fix npm run test errors

* ImportDialogBox component tests

* Fixes bug where pressing delete key while editing text will suggest... (#1083)

* Fixes bug where pressing delete key while editing text will suggest the deletion of selected map entities

* Changed the DEL key to remove entities instead of delete them

* temporarily disable code climate duplication engine

* add topic following for internal testing

* daily map activity emails (#1081)

* data prepared, task setup

* add the basics of the email template

* cover granular permissions

* unfollow this map

* break out permissions tests better

* rename so test runs
2017-03-06 22:49:46 -05:00
Connor Turland
b740fef8fe daily map activity emails (#1081)
* data prepared, task setup

* add the basics of the email template

* cover granular permissions

* unfollow this map

* break out permissions tests better

* rename so test runs
2017-03-06 22:42:22 -05:00
Connor Turland
55b031ccb7 add topic following for internal testing 2017-03-07 01:47:10 +00:00
Devin Howard
9df389060e temporarily disable code climate duplication engine 2017-03-06 09:29:36 -08:00
Robert Best
153cc38d1a Fixes bug where pressing delete key while editing text will suggest... (#1083)
* Fixes bug where pressing delete key while editing text will suggest the deletion of selected map entities

* Changed the DEL key to remove entities instead of delete them
2017-03-06 11:48:59 -05:00
Devin Howard
4ff9619837 set up react testing (#1080)
* install mocha-webpack. also switch hark to npm version instead of github version

* well, mocha-webpack runs

* add jsdom for tests

* upgrade to webpack 2

* fix npm run test errors

* ImportDialogBox component tests
2017-03-06 02:29:12 +08:00
Devin Howard
a6c1c0c730 ability to select/unselect all metacodes in custom set with keyboard shortcut (fix #390) (#1078)
* ability to select/unselect all metacodes in custom set with keyboard shortcut

* select all button

* nicer all/none buttons
2017-03-04 11:51:51 -05:00