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
8af1e69460
undo last commit, don't need for rails5
2016-10-21 18:25:07 -04:00
Connor Turland
d1e8ecbf3b
readd 12factor for debugging on heroku
2016-10-21 18:22:15 -04:00
Connor Turland
8e38469b1f
add border radius to mapper list
2016-10-21 18:10:37 -04:00
Connor Turland
abb997c75c
some quick fixes for realtime server after devins refactor
2016-10-21 18:04:18 -04:00
Connor Turland
be8efa6025
add card features ( #793 )
2016-10-21 17:42:21 -04:00
Robert Best
439527c464
Merge pull request #724 from metamaps/feature/edge.shift
...
Made it so that the map pans when you drag a selection of topics near the edge of the window
2016-10-21 17:03:25 -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
Devin Howard
b1a7e548a2
add email/twitter links
2016-10-20 07:01:15 +08: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
261ed49977
replace uservoice with docs.metamaps.cc + Hylo ( #777 )
...
* replace uservoice with docs.metamaps.cc + Hylo
* re-add the feedback tab as link to hylo
2016-10-19 13:39:57 -04:00
Devin Howard
e2d9b6aef2
Merge pull request #786 from metamaps/fix/empty-autocomplete
...
fix topic autocomplete controller action
2016-10-19 22:16:26 +08:00
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
