Commit graph

2275 commits

Author SHA1 Message Date
Devin Howard
1042fb020d Merge pull request #778 from metamaps/feature/auto-copy-invite-link
copy share invite link to clipboard automatically where possible
2016-10-19 22:15:21 +08:00
Devin Howard
7f1c04015e fix topic autocomplete controller action 2016-10-19 22:10:38 +08:00
Devin Howard
f75d5253b3 Merge pull request #781 from metamaps/fix/registration
clean up and fix devise code
2016-10-19 14:36:39 +08:00
Devin Howard
bb6566a45e clean up and fix devise code 2016-10-19 12:40:52 +08: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
6e75274737 access request tests (#772)
* access request tests

* map mailer spec update
2016-10-17 10:53:53 -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
Devin Howard
0ee1b3284a fix check-canvas-support require 2016-10-17 13:47:42 +08:00
Devin Howard
b976c13db2 Merge pull request #770 from metamaps/feature/remove-canvas-function
remove check-canvas-support.js
2016-10-17 13:40:34 +08:00
Connor Turland
c0955d7c5e multiple policy issues (#771)
* multiple policy errors

* make some things more explicit
2016-10-17 01:20:48 -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
Devin Howard
179849b639 remove check-canvas-support.js 2016-10-17 11:42:11 +08:00
Devin Howard
4f6dae304c Merge pull request #768 from metamaps/feature/default-rails-scripts
add scripts from default rails install
2016-10-17 10:51:47 +08:00
Devin Howard
3479fb7ff7 Merge pull request #767 from metamaps/fix/schema
schema update
2016-10-17 10:46:57 +08:00
Devin Howard
c113253fc5 add scripts from default rails install 2016-10-17 10:42:14 +08:00
Devin Howard
e46aa54ba3 schema update 2016-10-17 10:39:46 +08: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
14ea18a967 Merge pull request #764 from metamaps/fix/import-dialog-box
fix file upload box
2016-10-16 22:11:36 +08:00
Devin Howard
8180a8cc71 fix file upload box 2016-10-14 14:45:17 +08:00
Devin Howard
da5191171a Merge pull request #760 from metamaps/feature/mailer-tests
tests for map_mailer.rb
2016-10-14 11:24:31 +08:00
Devin Howard
26a8cddd14 mailer spec 2016-10-13 18:45:54 +08:00
Devin Howard
407ac1f29c more simplecov groups 2016-10-13 16:48:54 +08:00
Devin Howard
fc2849824f fix js syntax error 2016-10-13 16:48:46 +08:00
Devin Howard
6f3c74b7f1 token policy fix 2016-10-13 15:21:27 +08:00
Devin Howard
c3dbd59280 Merge pull request #758 from metamaps/feature/remove-gems
don't need coffeescript
2016-10-13 14:55:04 +08:00
Devin Howard
0e7e649f56 don't need coffeescript, tunemygc fails on Windows 2016-10-13 14:52:59 +08:00
Devin Howard
6e03132f1b fix spec 2016-10-13 14:51:58 +08:00
Devin Howard
b2a4acc99d make default category explicit in import.js 2016-10-13 14:24:08 +08:00
Devin Howard
7eae8deacb revamp HTML template a bit for api docs (#757)
* my_tokens endpoint moved to normal index

* remove secured_by from metacodes/users

* ch ch ch changes

* mess with template

* fix securedBy

* convenience open

* gross authentication notes at the top of every endpoint

* better ordering

* move login tutorials into security tab

* oauth tutorial

* getting closer

* remove unneeded Endpoints header

* ok looks OK
2016-10-12 13:54:43 -04:00
Devin Howard
62c489cba7 suggesting api doc updates (#756) 2016-10-12 12:22:38 -04: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
858ca66d69 eslint updates 2016-10-10 17:22:22 +08: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