Devin Howard
720f67cee7
move metacode loading earlier, and add a query string to work around amazon aws CORS issues
2016-08-03 08:54:10 +08:00
Connor Turland
8c51108a0c
enable shared private and public maps ( #530 )
...
* enable shared private and public maps
* change the list
* yeehaw add collaborators
* I believe this fixes the error connor brought up
* when topic or synapse is no longer on a map, don't defer
* needs to be before?
* just do it in the controller
* make recommendation they sign in and retry
* better email
* config for mailer previews
* improve wording
* shouldn't have included that
* switch to green
* don't execute if there's no map
* wasn't including the right people in some circumstances
* Finish breaking out JS files (#551 )
* metamaps.Realtime refactor
* Metamaps.Util
* Metamaps.Visualize
* Metamaps.SynapseCard
* Metamaps.TopicCard
* Metamaps.Create.js
* Remove erb extension from Metamaps.Map.js
* Metmaps.Account and Metamaps.GlobalUI remove extension
* Metamaps.JIT no more erb extension
* move Backbone.init; standard-format on Metamaps.js.erb
* factor out canvas support check function
* some llittle template bugs
* remove featured from signed in explore maps bar
* don't let it overflow off the page
2016-04-24 11:50:35 -04:00
Devin Howard
8bb96d12a6
Metamaps.Control
2016-04-15 09:13:01 +08:00
Devin Howard
324719e531
Metamaps.Filter
2016-04-15 09:13:01 +08:00
Devin Howard
b10f0cef0e
Metamaps.Listeners.js.erb
2016-04-15 09:13:01 +08:00
Devin Howard
a5bd0440a8
Metamaps.Organize
2016-04-15 09:13:01 +08:00
Devin Howard
de62a08307
Metamaps.Topic
2016-04-15 09:13:01 +08:00
Devin Howard
4833dd8da6
Metamaps.Synapse
2016-04-15 09:13:01 +08:00
Devin Howard
11a87582c7
Metamaps.Map
2016-04-15 09:13:01 +08:00
Devin Howard
13d6ab56e5
factor out two more small view modules
2016-04-15 09:13:01 +08:00
Connor Turland
7bb7f345f1
added an event for conversations starting ( #547 )
...
* added an event for conversations starting
* switch to post
2016-04-14 14:35:28 -04:00
Devin Howard
be99ad8285
factor out Metamaps.Admin
2016-04-13 16:04:15 +08:00
Devin Howard
799f6e4623
Metamaps.Router standard style
2016-04-13 15:58:54 +08:00
Devin Howard
a2ce20b564
versioncode fix
2016-04-13 10:48:34 +08:00
Devin Howard
2e6f04d0be
metamaps.debug function, and move VERSION into a rails constant initializer.
...
from this commit on, we would need to modify config/initializers/version.rb to increment the version number.
2016-04-06 10:27:31 +08:00
Connor Turland
8a6d434fc3
Junto Sounds
...
* awesome news sounnndzzzz
* prevent double sound
* bug fixes and chat sounds on by default
2016-04-04 10:50:02 -04:00
Devin Howard
f9e6249615
Fix up import - want more backboney event listening though
2016-03-27 15:09:08 +08:00
Devin Howard
387c863222
fix a bug with synapses and use cid to link new topics with synapses
...
Synapses are now created client-side, but still rejected server-side
2016-03-25 16:48:14 +08:00
Connor Turland
baa5439f0f
auto position videos which haven't been manually positioned
2016-03-23 16:12:23 -07:00
Connor Turland
1ee33b843f
Merge branch 'develop' into feature/realtime.video
2016-03-14 21:40:25 +11:00
Connor Turland
f24def8be6
fix up javascript errors
2016-03-14 21:36:16 +11:00
Connor Turland
4ed00240eb
api: revert silly js change
2016-03-12 11:15:14 +11:00
Connor Turland
059591b78b
first pass at important API endpoints, token auth
2016-03-11 17:16:04 +11:00
Connor Turland
ef60aefe88
fix js bug
2016-03-11 07:59:22 +11:00
Connor Turland
26025d6ee9
store the right number of mappers in conversation
2016-03-01 12:30:49 +13:00
Connor Turland
bd5c88fb0b
display initial state of call to new mapper
2016-03-01 12:25:38 +13:00
Connor Turland
4e92d4c2c5
change video border width
2016-02-29 17:05:36 +13:00
Connor Turland
d50923b6bd
fix js bug
2016-02-29 17:05:11 +13:00
Connor Turland
c6fea78054
merge develop
2016-02-29 13:58:47 +13:00
Connor Turland
f9b23499dc
styling. add self to participants
2016-02-26 12:43:27 +13:00
Devin Howard
e1b2ddde7d
add another TODO...
2016-02-23 19:04:39 +08:00
Devin Howard
09ceb8ceec
move 4 global variables into Metamaps namespace
2016-02-23 19:04:30 +08:00
Connor Turland
2f4b3b3761
call was ending in wrong situation
2016-02-17 13:49:48 +13:00
Connor Turland
d82288c9f2
fixed up call ending/starting events
2016-02-17 13:27:22 +13:00
Devin Howard
9469b08ffa
cancel synapse creation with esc, backspace, or delete
2016-02-14 15:19:35 +08:00
Devin Howard
056ef2b5b6
smoother synapse creation with clicks/tabs
2016-02-14 15:19:35 +08:00
Devin Howard
8202fb38f3
Merge branch 'develop' into feature/realtime.video
2016-02-05 16:27:43 +08:00
Devin Howard
f2cbde50ca
dos2unix on the whole repo
2016-02-05 11:43:15 +08:00
Connor Turland
8e07c10ecc
make sure the chat pane is closed for opening the next map
2016-01-26 15:29:32 +13:00
Connor Turland
1fa84e0d29
chat only displays on maps
2016-01-26 14:46:26 +13:00
Connor Turland
4557b8e305
merge develop
2016-01-22 14:59:09 +13:00
Devin Howard
14a292331b
two tweaks to help production deploy
2016-01-19 14:27:25 +08:00
Connor Turland
11fc7a01f3
fixes the issue where video feeds go black after first call
2016-01-09 16:11:28 +13:00
Devin Howard
3cdab531a6
move more config into .example-env
2016-01-06 22:57:01 +08:00
Connor Turland
6db91ea703
broken funnnnnction
2015-12-23 11:34:52 +08:00
Connor Turland
26bc04262a
broken funnnnnction
2015-12-22 22:28:03 -05:00
Connor Turland
5ad1504494
handle socketio reconnect situation
2015-12-22 18:05:13 -05:00
Connor Turland
64283850e3
add junto spinner for call in progress
2015-12-22 17:46:19 -05:00
Connor Turland
49dd2f2e92
merge develop
2015-12-22 13:16:03 -05:00
Connor Turland
8d85f8d308
videos positioning decently. chats loading more smoothly
2015-12-22 12:43:50 -05:00
