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 |
|
Devin Howard
|
8916ff20b6
|
Merge pull request #477 from metamaps/feature/metacode-icon-on-aws
metacode icons on aws (fixes #445)
|
2016-02-28 12:19:00 +08:00 |
|
Devin Howard
|
ac1d4f70b6
|
show old image on metacode edit form; tweak css of admin area
|
2016-02-26 14:06:37 +08: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
|
67da49c1be
|
max height on search results so they scroll
|
2016-02-05 22:13:23 +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
|
353872001f
|
vertical align no results
|
2016-02-05 19:21:09 +08:00 |
|
Devin Howard
|
aabdaaf21b
|
nicer icon positioning
|
2016-02-05 19:19:16 +08:00 |
|
Devin Howard
|
f1f56f9286
|
centre topic icons if there are results
|
2016-02-05 19:11:19 +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
|
b3d321c7e9
|
topic icon <--
|
2016-02-05 18:27:26 +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 |
|
Devin Howard
|
3e28831595
|
Merge branch 'develop' into feature/realtime.video
|
2016-02-05 11:38:19 +08:00 |
|
poietic
|
c8d6563f45
|
changed links from old uservoice url.
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
|
2016-01-29 16:00:30 -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 |
|
Devin Howard
|
a45d0f7791
|
fix search box on authenticated homepage
|
2015-12-24 15:19:03 +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
|
dfc94b4079
|
fix up styling on chat text input
|
2015-12-22 16:34:30 -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
|
be2997d7e4
|
fix bad tooltip placement
|
2015-12-12 11:31:54 -05:00 |
|
Connor Turland
|
eec7dcb9c3
|
make the messages box fill up all available space
|
2015-12-11 19:18:53 -05:00 |
|
Connor Turland
|
56e3fc753a
|
use asset_path for link to sound files
|
2015-12-11 19:15:18 -05:00 |
|
Connor Turland
|
20aa78208e
|
rename junto to erb file
|
2015-12-11 18:49:22 -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 |
|
Connor Turland
|
2929547736
|
position the chat box, and remove the old junto panel
|
2015-12-03 17:15:15 -05:00 |
|
Connor Turland
|
75554d58bf
|
temp
|
2015-12-03 17:15:15 -05:00 |
|
Devin Howard
|
519342a468
|
fix filter bug
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
31fceab45d
|
search box css fixes
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
48ea29b13e
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
38662fcda8
|
split search css out into its own file
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
7db75b8d6d
|
more fixes
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
43624caf88
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
53d7ccab56
|
fix cannot set readonly property highlight
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
5f14601c74
|
styling of the vertical tab selectors needed improvement
|
2015-12-03 16:57:30 -05:00 |
|
Connor Turland
|
1b60927641
|
had to update because jquery ui version changed
|
2015-12-03 16:57:30 -05:00 |
|
Devin Howard
|
3e03e64845
|
css fixes for heroku
|
2015-12-03 16:57:29 -05:00 |
|
Devin Howard
|
f0c0dc48d8
|
add highlight to typeahead
|
2015-12-03 16:57:28 -05:00 |
|
Devin Howard
|
47205883a9
|
whoops
|
2015-12-03 16:57:27 -05:00 |
|
Devin Howard
|
f4987bffc0
|
change css files to use asset_data_uri
|
2015-12-03 16:57:27 -05:00 |
|
Devin Howard
|
29411cf1e5
|
asset_path
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
52b37e7ac6
|
asset_path in css erb files
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
4d7f509235
|
change some css to erb
|
2015-12-03 16:57:26 -05:00 |
|
Devin Howard
|
2505ce36a5
|
syntax
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
235aa7a6b3
|
convert javascript to asset_path syntax
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
6e9b0ac9ef
|
rename js files to js.erb files
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
566a0a3aa6
|
brute force prevent nil synapse descriptions
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
1453a3c181
|
function naming
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
840484178b
|
fix mapping problem
|
2015-12-03 16:57:25 -05:00 |
|
Devin Howard
|
ae16f8f08d
|
fix a few more mappable/topic/synapse things in JS
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
3e8c971155
|
change from category/topic_id/synapse_id to mappable_type/mappable_id
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
a4f910b66d
|
bg color on EXisting synapses heading
|
2015-12-03 16:57:24 -05:00 |
|