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
|
8394e0ce86
|
re-add regular uservoice code
|
2015-12-22 07:13:26 +08:00 |
|
Devin Howard
|
c58b2c805e
|
syntax error
|
2015-12-21 21:38:02 +08: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
|
914ff46bb9
|
syntax error in development.rb
|
2015-12-21 11:40:30 +08:00 |
|
Devin Howard
|
61c03e2736
|
Merge pull request #448 from metamaps/feature/https-preparation
https preparation
|
2015-12-21 10:18:46 +08:00 |
|
Devin Howard
|
603b9dc52e
|
remove uservoice code
|
2015-12-21 10:16:51 +08:00 |
|
Devin Howard
|
9a7ef25afc
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:28:43 +08:00 |
|
Devin Howard
|
888edae6f6
|
finish remove asset_path_icon whoops
|
2015-12-20 22:28:05 +08:00 |
|
Devin Howard
|
c79a5f0072
|
Merge branch 'develop' into feature/https-preparation
|
2015-12-20 22:24:47 +08:00 |
|
Devin Howard
|
df485002b1
|
remove redundant asset_path_icon function
|
2015-12-20 22:22:01 +08:00 |
|
Devin Howard
|
d33f4bffb1
|
typekit https
|
2015-12-20 20:19:24 +08:00 |
|
Devin Howard
|
f35d4d51a9
|
s3 over https by default
|
2015-12-20 20:19:09 +08:00 |
|
Devin Howard
|
e2bf1d5eb1
|
try to make metamaps more tls friendly
|
2015-12-20 18:36:57 +08:00 |
|
Devin Howard
|
b2aa2074a7
|
update generation calcuation code, incl. fix user signup bug
|
2015-12-15 12:33:22 +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
|
92ddbbaf4f
|
remove metacode asset path migration
|
2015-12-11 18:10:53 -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 |
|
Devin Howard
|
b037c84f15
|
fix small error in user model
need to use the parent's generation to calculate generation!
|
2015-12-07 11:44:08 +08:00 |
|
Connor Turland
|
2929547736
|
position the chat box, and remove the old junto panel
|
2015-12-03 17:15:15 -05:00 |
|
Connor Turland
|
b958c6ff89
|
removed precompiled assets
|
2015-12-03 17:15:15 -05:00 |
|
Connor Turland
|
75554d58bf
|
temp
|
2015-12-03 17:15:15 -05:00 |
|
Devin Howard
|
fa67ec0444
|
update Gemfile for rails 4
|
2015-12-03 17:14:04 -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
|
47a7e161ee
|
fix error with mapper search rendering
|
2015-12-03 16:58:21 -05:00 |
|
Devin Howard
|
7336c262e3
|
fix up user model json output function
|
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
|
d3814708a9
|
gc tuning
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
9575a62e67
|
add .ruby-gemset file - you may need to reinstall gems if using rvm
|
2015-12-03 16:58:20 -05:00 |
|
Devin Howard
|
cde6eaa564
|
Update windows installer docs
|
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 |
|
Devin Howard
|
4139c2c84a
|
syntax error
|
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
|
5b0e7ffcde
|
switching metacode sets was being caught by Metamaps.Router.intercept
|
2015-12-03 16:57:30 -05:00 |
|