Commit graph

2219 commits

Author SHA1 Message Date
Devin Howard
fc044294f1 add markdown to topic cards 2016-10-08 09:23:57 +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
Devin Howard
dc55bae243 Merge pull request #740 from metamaps/feature/ctrl-or-meta
make all Ctrl shortcuts also work with Meta (Cmd on OSX)
2016-10-08 00:07:07 +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
Connor Turland
86a6e92bc3 dont show private maps in global collection (#734)
* dont show private maps in global collection

* Update explore_controller.rb

* Update main_controller.rb
2016-10-06 23:45:17 -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
b52523e7be one more maps in maps error 2016-10-06 10:32:06 -04:00
Connor Turland
e72ae5df94 another issue from the maps in maps branch 2016-10-06 09:33:10 -04:00
Connor Turland
a56c4eb110 missing comma 2016-10-06 09:27:18 -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
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
33bcfc1505 move Maps into a folder 2016-10-06 16:20:27 +08:00
Devin Howard
d80d33761d Merge pull request #730 from metamaps/feature/synapse-check-for-topic-by-name
allow synapses to be imported by topic name as well as id
2016-10-06 14:09:43 +08:00
Devin Howard
df59c28aa8 Merge pull request #729 from metamaps/fix/chat-message-word-wrap
word wrap on chat message text
2016-10-06 14:08:59 +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
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
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
Connor Turland
8d613eab33 improve descriptors 2016-10-05 10:38:38 -04:00
Devin Howard
d193c9a53c add starred to maps API (#719)
* add starred to maps API and endpoint to create/delete

* add token to requests without token param

* add minor version number to api version

* metacode/user use uri in schema

* make code climate happier
2016-10-05 10:36:03 -04:00
Devin Howard
40453242fa Merge pull request #717 from metamaps/feature/eslint-updates
eslint updates
2016-10-05 11:55:47 +08:00
Devin Howard
12417d8cd3 update JIT eslint style 2016-10-05 01:46:51 +08:00
Devin Howard
e3db00f229 Merge pull request #718 from metamaps/fix/raml
fix api documentation
2016-10-05 00:00:34 +08:00
Devin Howard
e2c0ce7c22 fix api documentation 2016-10-04 23:43:42 +08:00
Devin Howard
113a5a2530 fix a bunch of bug risk eslint warnings 2016-10-04 23:38:32 +08:00
Devin Howard
959260f234 Merge pull request #716 from metamaps/feature/new-endpoints
users and metacodes api endpoints
2016-10-04 23:12:04 +08:00
Devin Howard
dbc2ff75df make eslint work and update yoda config 2016-10-04 23:06:49 +08:00
Devin Howard
df29e48d8c rubocop + allow unauthed users to see all users 2016-10-04 22:51:21 +08:00
Devin Howard
2eae89a6b7 users and metacodes api endpoints 2016-10-04 22:28:10 +08:00
Devin Howard
c90460802e enable heroku to serve apidocs 2016-10-04 17:59:13 +08:00
Devin Howard
a9831946d0 ensure public/api directory exists 2016-10-04 16:33:15 +08:00
Devin Howard
bf733b57d2 Merge pull request #715 from metamaps/feature/faster-builds
speed up travis builds by excluding raml2html from npm install
2016-10-04 16:24:10 +08:00
Devin Howard
15b8440fbc move raml2html to optional dependencies so it can be installed globally 2016-10-04 16:21:09 +08:00
Devin Howard
c58a8da1a6 Merge pull request #714 from metamaps/feature/raml-1.0
update raml and create a build script for it
2016-10-04 16:10:02 +08:00
Devin Howard
8afef1bc4a make tokens description field optional 2016-10-04 16:08:07 +08:00
Devin Howard
8ac8aad105 PUT and PATCH parameters are optional 2016-10-04 15:30:06 +08:00
Devin Howard
2466a0912f raml2html build script 2016-10-04 15:22:24 +08:00
Devin Howard
3d7a2ef5b1 make raml traits work and be accurate/useful 2016-10-04 15:22:24 +08:00