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

2096 commits

This branch
This branch
All branches
Author SHA1 Message Date
Connor Turland
f31d95d374 Merge branch 'develop' into feature/api-updates 2016-10-12 17:52:50 +00:00
Devin Howard
62c489cba7 suggesting api doc updates (#756) 2016-10-12 12:22:38 -04:00
Devin Howard
ca2541da48 ok looks OK 2016-10-12 11:59:42 +08:00
Devin Howard
f5decffe3f remove unneeded Endpoints header 2016-10-12 11:54:02 +08:00
Devin Howard
ff989e2b16 getting closer 2016-10-12 11:44:04 +08:00
Devin Howard
c17c66cead oauth tutorial 2016-10-12 11:39:58 +08:00
Devin Howard
e48c4de5bd move login tutorials into security tab 2016-10-12 11:39:18 +08:00
Devin Howard
b96afa3f33 better ordering 2016-10-12 11:17:04 +08:00
Devin Howard
73ce78b40e gross authentication notes at the top of every endpoint 2016-10-12 11:15:41 +08:00
Devin Howard
440011cba9 convenience open 2016-10-12 11:13:05 +08:00
Devin Howard
9352ecc446 fix securedBy 2016-10-12 11:10:59 +08:00
Devin Howard
94092ca716 mess with template 2016-10-12 11:08:34 +08:00
Devin Howard
9c55883eeb ch ch ch changes 2016-10-12 10:46:40 +08:00
Devin Howard
25a2522446 remove secured_by from metacodes/users 2016-10-12 10:16:20 +08:00
Devin Howard
ed6682ba29 my_tokens endpoint moved to normal index 2016-10-12 10:16:17 +08:00
Devin Howard
3051723bcf [WIP] add markdown getting started page to api docs (#752) 
* add markdown getting started page to api docs. TODO section 3

* Update getting-started.md
 2016-10-11 12:08:31 -04:00
Devin Howard
a0c0dcbc79 Merge pull request #753 from metamaps/fix/screenshot-no-file 
fix screenshot no file error
 2016-10-10 13:01:50 +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
56d3ef8bea Merge pull request #751 from metamaps/feature/markdown-xss-safe 
enable xss filtering and smart quote replacement in markdown
 2016-10-09 10:23:00 +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
9d85dab975 Merge pull request #747 from metamaps/fix/unauth-error 
redirect to root_path if you get a 403
 2016-10-08 14:16:13 +08:00
Devin Howard
ab76b77bdd Merge pull request #748 from metamaps/feature/api-json-404 
return 404s for all unmatched api routes
 2016-10-08 14:16:00 +08:00
Devin Howard
9513087bbd remove unnecessary api v1 code 2016-10-08 14:12:54 +08:00
Devin Howard
2c64b67abd return 404s for all unmatched api routes 2016-10-08 13:58:19 +08:00
Devin Howard
be6a2401b6 fix spec. not sure how this should work 2016-10-08 13:42:25 +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
129e3db946 redirect to root_path if you get a 403 2016-10-08 12:26:08 +08:00
Devin Howard
7eacda2ae7 code style 2016-10-08 09:35:05 +08:00
Devin Howard
f775629371 showCard .desc css for ul and a tags 2016-10-08 09:24:17 +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
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
Devin Howard
2b036bfb4e all Ctrl shortcuts now also work with Meta (Cmd on OSX) 2016-10-07 14:03:48 +08: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
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