Devin Howard
872ae90832
submit new map form on Enter - fixes #555 ( #562 )
...
* submit new map form on Enter - fixes #555
* update divs too
2016-07-01 16:48:38 +08:00
Connor Turland
c08868a5c1
user presence event ( #552 )
2016-04-26 08:08:12 -04:00
Devin Howard
45adda93b1
set up scaffolding for js tests ( #553 )
2016-04-26 10:22:32 +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
c1d963d669
remove .erb from files that don't need it
2016-04-15 09:18:17 +08:00
Devin Howard
8bb96d12a6
Metamaps.Control
2016-04-15 09:13:01 +08:00
Devin Howard
6a8921ae6d
standard-format Metamaps.JIT.js.erb
2016-04-15 09:13:01 +08:00
Devin Howard
074eaf0bd3
alphabetize dependecies
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
ca5928113d
whoops don't forget standard format
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
6653d10edf
Debug gets a header. Still need to parse through Metamaps, Metamaps.GlobalUI, and Metamaps.JIT
2016-04-13 16:06:01 +08: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
df9c0a93bc
Metamaps.Views standard style
2016-04-13 15:58:54 +08:00
Devin Howard
e8c55df4e8
Metamaps.Backbone standard style
2016-04-13 15:58:54 +08:00
Devin Howard
5a3ab025b7
Metamaps.Import 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
7d6acb7014
fix json import
2016-03-31 13:03:14 +08:00
Devin Howard
ccd07ddd19
import fixes
2016-03-31 09:25:14 +08:00
Devin Howard
8a6e702c12
fix js error
2016-03-27 15:32:18 +08:00
Devin Howard
30d327f07a
solution using backbone events instead of setTimeout
2016-03-27 15:20:09 +08:00
Devin Howard
f9e6249615
Fix up import - want more backboney event listening though
2016-03-27 15:09:08 +08:00
Devin Howard
53867caae8
allow JSON or TSV parsing
2016-03-26 15:03:44 +08:00
Devin Howard
92f78aa56a
update tsv code to handle new export code at the very least.
...
next step will be allowing json input too
2016-03-26 12:49:26 +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
Devin Howard
c77cc32734
import fixes
...
- better abort logic & messaging
- handle \r line delim
- better example format at top
2016-03-25 16:48:14 +08:00
Devin Howard
0c1e12a301
use state machine to implement smarter topic/synapse import
...
also include better auto-layout of new topics if x/y not specified
2016-03-25 16:46:05 +08:00
Devin Howard
b47ed7b5b4
don't ask about adding 0 topics
2016-03-25 16:46:05 +08:00
Devin Howard
6df7fa849a
bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself
2016-03-25 16:46:05 +08:00
Connor Turland
14dfe3c926
styling for doorkeeper and api functional
2016-03-24 17:16:27 -07:00
Connor Turland
baa5439f0f
auto position videos which haven't been manually positioned
2016-03-23 16:12:23 -07:00
Connor Turland
617dec72b9
hide sound option. green 'in call' dot. tooltip
2016-03-21 13:08:34 -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
9ff6375e62
don't need to create synapse on canvas click
2016-02-14 15:19:36 +08: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
48863ce246
create synapse if you click away from the synapse title form
2016-02-14 15:19:35 +08:00
Connor Turland
e29b683b38
new junto images
2016-02-09 09:14:33 +13:00
Devin Howard
f42b30e8b5
Merge branch 'feature/auto.synapse' into release/v2.8
2016-02-08 09:57:58 +08:00
Devin Howard
83551e317e
create synapse if you click away from the synapse title form
2016-02-06 13:03:47 +08:00
Devin Howard
786eeae72a
Merge branch 'develop' into feature/realtime.video
2016-02-06 12:56:23 +08:00
Devin Howard
798035107f
Merge branch 'master' into develop
2016-02-06 10:11:55 +08:00
Devin Howard
57a8b654ba
smoother 'added by me' filtering
2016-02-05 21:25:20 +08:00
Devin Howard
3fe93be987
Merge branch 'master' into develop
2016-02-05 20:21:31 +08:00
Devin Howard
6b9aa52224
well, the loading icon mostly works now too
2016-02-05 20:09:00 +08:00
Devin Howard
5f90843da2
gross, but it works. checkboxes in search results work
2016-02-05 20:02:57 +08:00
Devin Howard
c427e7fd7e
mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable
2016-02-05 19:54:38 +08:00
Devin Howard
461b62628d
fix minimizing search results
2016-02-05 19:06:57 +08:00
Devin Howard
3405bf5942
fix the problem where it always closes on you
2016-02-05 18:56:16 +08:00
Devin Howard
a05fe70eda
topic headers on resultnoresults
2016-02-05 18:35:45 +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
74d372b942
fix the scrolling in the chat messages box
2016-01-22 16:49:50 +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
Devin Howard
844a52fc52
Merge pull request #450 from metamaps/feature/fix-searchbox
...
fix searchbox
2015-12-24 15:44:12 +08:00
Devin Howard
40561c629a
fix handleResultClick on search box
2015-12-24 15:42:51 +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
Devin Howard
d96e991de3
don't use // for heroku either
2015-12-21 21:29:15 +08:00
Devin Howard
6e10b4c508
make use of realtime.metamaps.cc server
2015-12-21 21:28:18 +08:00
Devin Howard
e2bf1d5eb1
try to make metamaps more tls friendly
2015-12-20 18:36:57 +08:00
Connor Turland
a905094d4d
inviting, joining, and leaving conversations
2015-12-14 02:28:13 -05:00
Connor Turland
8b090be0b3
convert to something more 'call' style
2015-12-12 19:00:51 -05:00
Connor Turland
56e3fc753a
use asset_path for link to sound files
2015-12-11 19:15:18 -05:00
Connor Turland
6c7ba76937
update to https for sockets
2015-12-11 18:45:51 -05:00
Connor Turland
5f1ef5f5c8
remove extra code
2015-12-11 18:10:38 -05:00
Connor Turland
3c9d722945
accept or reject video offers
2015-12-11 17:29:17 -05:00
Connor Turland
089528c46d
great progress
2015-12-11 14:23:41 -05:00
