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 |
|
Devin Howard
|
379b37b445
|
fix typo + debug statements to make existingSynapse autocomplete work
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
675bcadda0
|
deal with https://github.com/twitter/typeahead.js/issues/1195
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
a7e512e25a
|
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
bd9c275ada
|
upgrade typeahead to 1.10 and new syntax
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
ff48b2456a
|
Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
8826dfdcf6
|
upgrade typeahead to allow new syntax
|
2015-12-03 16:57:24 -05:00 |
|
Devin Howard
|
8bf2eb31f3
|
remove old jquery-ui file
|
2015-12-03 16:57:22 -05:00 |
|
Devin Howard
|
8425e72101
|
fix filter bug
|
2015-11-30 10:01:33 +08:00 |
|
Devin Howard
|
8505d26182
|
search box css fixes
|
2015-11-28 23:03:48 +08:00 |
|
Devin Howard
|
9afc8bc7c4
|
refactor search css into scss for clearer organization, plus do some fixes to the typeahead css
|
2015-11-28 21:40:09 +08:00 |
|
Devin Howard
|
98e11c0a7d
|
split search css out into its own file
|
2015-11-28 20:17:14 +08:00 |
|
Devin Howard
|
1f82238362
|
more fixes
|
2015-11-08 23:14:53 +08:00 |
|
Devin Howard
|
7136f46ec3
|
get autocomplete working again with new typeahead.js, but not the CSS
|
2015-11-08 22:53:34 +08:00 |
|
Connor Turland
|
53de063bfc
|
fix cannot set readonly property highlight
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
3216106660
|
styling of the vertical tab selectors needed improvement
|
2015-11-07 01:33:18 +08:00 |
|
Connor Turland
|
e29ab4bca3
|
had to update because jquery ui version changed
|
2015-11-07 01:33:18 +08:00 |
|
Devin Howard
|
8b456f5a31
|
css fixes for heroku
|
2015-11-03 21:10:05 +08:00 |
|
Devin Howard
|
9916975e2e
|
add highlight to typeahead
|
2015-10-26 21:01:13 +08:00 |
|
Devin Howard
|
06d06f8f55
|
whoops
|
2015-10-26 12:27:22 +08:00 |
|
Devin Howard
|
6c27623b80
|
change css files to use asset_data_uri
|
2015-10-26 12:22:40 +08:00 |
|
Devin Howard
|
da98a53a3e
|
asset_path
|
2015-10-23 23:56:29 +08:00 |
|
Devin Howard
|
46dd54a1d7
|
asset_path in css erb files
|
2015-10-23 23:34:18 +08:00 |
|
Devin Howard
|
1670235172
|
change some css to erb
|
2015-10-23 23:19:25 +08:00 |
|
Devin Howard
|
2e51c3c118
|
syntax
|
2015-10-23 23:01:02 +08:00 |
|
Devin Howard
|
b070bb9e46
|
convert javascript to asset_path syntax
|
2015-10-23 22:56:09 +08:00 |
|
Devin Howard
|
ad47275f72
|
rename js files to js.erb files
|
2015-10-23 22:51:16 +08:00 |
|
Devin Howard
|
96871cadab
|
brute force prevent nil synapse descriptions
|
2015-10-23 22:17:08 +08:00 |
|
Devin Howard
|
63db41698e
|
function naming
|
2015-10-23 21:04:16 +08:00 |
|
Devin Howard
|
ddfb3aa98f
|
fix mapping problem
|
2015-10-23 21:03:49 +08:00 |
|
Devin Howard
|
85b3012cd9
|
fix a few more mappable/topic/synapse things in JS
|
2015-10-02 18:54:17 +08:00 |
|
Devin Howard
|
6d1e382d5c
|
change from category/topic_id/synapse_id to mappable_type/mappable_id
|
2015-10-02 16:32:16 +08:00 |
|
Devin Howard
|
c80569a449
|
bg color on EXisting synapses heading
|
2015-10-02 15:53:06 +08:00 |
|
Devin Howard
|
120edfc278
|
fix typo + debug statements to make existingSynapse autocomplete work
|
2015-10-02 15:46:48 +08:00 |
|
Devin Howard
|
80b2b1876a
|
deal with https://github.com/twitter/typeahead.js/issues/1195
|
2015-10-02 14:39:17 +08:00 |
|
Devin Howard
|
a51777b0ba
|
working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before...
|
2015-10-02 13:36:51 +08:00 |
|
Devin Howard
|
14eeb0cbe6
|
upgrade typeahead to 1.10 and new syntax
|
2015-10-01 14:55:26 +08:00 |
|
Devin Howard
|
b3b065e623
|
Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
|
2015-10-01 11:34:19 +08:00 |
|
Devin Howard
|
347d77df82
|
upgrade typeahead to allow new syntax
|
2015-10-01 11:14:25 +08:00 |
|
Devin Howard
|
b0efe6aea8
|
Merge branch 'develop' into rails4
|
2015-10-01 11:05:27 +08:00 |
|
Devin Howard
|
a9b034637b
|
only autocomplete topic/synapse if the user types more than 2 characters
|
2015-09-30 13:55:23 +08:00 |
|
Devin Howard
|
a31a92b321
|
Merge branch 'develop' into rails4
|
2015-09-15 20:37:47 +08:00 |
|
Devin Howard
|
d67d098b2a
|
remove old jquery-ui file
|
2015-09-10 22:40:45 +08:00 |
|
Connor Turland
|
6767771d7d
|
dont show the embedly share links
|
2015-08-03 14:12:47 -04:00 |
|
Connor Turland
|
5cd4db66c6
|
needed to update embedly
|
2015-08-03 14:02:30 -04:00 |
|
Connor Turland
|
499f6349e6
|
add ability for admin to delete any topics and synapses
|
2015-04-28 18:43:47 -04:00 |
|
Connor Turland
|
fb8c006be1
|
fixed small alignment bug on tooltips in firefox
|
2015-02-01 12:29:16 -05:00 |
|
Connor Turland
|
aec2a97704
|
fixed the alignment of the tutorial video links
|
2015-02-01 11:56:54 -05:00 |
|
Connor Turland
|
9ed0d412df
|
.width() returned wrong result in firefox, causing the map to load with off dimensions
|
2015-02-01 11:50:22 -05:00 |
|
Connor Turland
|
531f09c6d3
|
active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time
|
2015-01-31 12:39:48 -05:00 |
|
Connor Turland
|
4d7695a767
|
this will clear up any remaining issues with urls ending up wrong
|
2015-01-30 21:08:37 -05:00 |
|
Connor Turland
|
4ca12c70ab
|
explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow
|
2015-01-30 20:49:30 -05:00 |
|
Connor Turland
|
5cf75f3ea2
|
prevented map from loading before all metacode images were loaded
|
2015-01-30 00:09:45 -05:00 |
|
Connor Turland
|
670dd5d874
|
added user feedback, and moved the edge actually hiding into the if statement where it should be
|
2015-01-29 22:23:24 -05:00 |
|
Connor Turland
|
a048c87356
|
mapper who doesn't own a topic or synapse should not be able to delete it.
|
2015-01-28 22:35:03 -05:00 |
|
Connor Turland
|
5a31c91597
|
Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling
|
2015-01-28 21:39:33 -05:00 |
|