Anthony Davis
|
74d7d0b587
|
VRFS-1651 - decoupling jam_ gems from ENV
|
2014-05-06 22:57:32 -05:00 |
|
Anthony Davis
|
26e4a2b72d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 22:35:27 -05:00 |
|
Anthony Davis
|
673132c540
|
VRFS-1651 - periodic real test of www
|
2014-05-06 22:35:00 -05:00 |
Jonathan Kolyer
|
ebe9aa1047
|
VRFS-1577 VRFS-736
|
2014-05-07 01:33:27 +00:00 |
|
Jonathan Kolyer
|
1c6b5b78bb
|
VRFS-1577 fixing specs
|
2014-05-06 07:20:14 +00:00 |
|
Jonathan Kolyer
|
5f74bce061
|
VRFS-1577
|
2014-05-06 06:41:10 +00:00 |
|
Jonathan Kolyer
|
294bb22cdd
|
Merge branch 'develop' into vrfs1577
|
2014-05-06 05:21:31 +00:00 |
|
Jonathan Kolyer
|
0119001d3d
|
VRFS-1698 testing
|
2014-05-06 05:21:09 +00:00 |
|
Jonathan Kolyer
|
a519191394
|
replaced find with find_by_id
|
2014-05-06 02:55:32 +00:00 |
Scott Comer
|
6be0791adb
|
merge
|
2014-05-02 15:20:21 -05:00 |
|
Scott Comer
|
5cc515d615
|
a small cleanup of connection fields and fix broken tests
|
2014-05-02 13:44:29 -05:00 |
 Seth Call
|
7515b1c3bd
|
* moving new migration to end of manifest
|
2014-05-02 11:36:51 -05:00 |
Bert Owen
|
7d3ac6fc54
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:33:27 +08:00 |
|
Bert Owen
|
bf04fca205
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:30:56 +08:00 |
|
Seth Call
|
65fb0511c6
|
* merging manually database migrations from the master branch now, because I need to preserve db lineage with www as a priority
|
2014-05-01 15:04:23 -05:00 |
|
Jonathan Kolyer
|
affb1cd875
|
VRFS-1577
|
2014-05-01 06:35:16 +00:00 |
|
Scott Comer
|
a11dd664ce
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-30 22:01:57 -05:00 |
|
Scott Comer
|
fe59865bd9
|
change join_the_session api to add tracks; move the impl to connection; a few bug fixes
|
2014-04-30 22:01:43 -05:00 |
|
Jonathan Kolyer
|
b1be072c6c
|
VRFS-1577 VRFS-736
|
2014-05-01 01:48:57 +00:00 |
|
Jonathan Kolyer
|
5e27268fa4
|
VRFS-1577 VRFS-736 added should_rate_session?; fixed bug in add_rating
|
2014-05-01 01:46:57 +00:00 |
|
Jonathan Kolyer
|
2cbfae2215
|
VRFS-1577 VRFS-736
|
2014-04-30 20:49:32 +00:00 |
|
Jonathan Kolyer
|
968dff2829
|
VRFS-1577 VRFS-736
|
2014-04-30 16:44:37 +00:00 |
|
Jonathan Kolyer
|
1af868dd60
|
VRFS-1577 moved session_ratings.sql to bottom
|
2014-04-30 14:23:26 +00:00 |
|
Jonathan Kolyer
|
2ee96c49ec
|
merging develop
|
2014-04-30 14:21:23 +00:00 |
|
Jonathan Kolyer
|
dddc0311c0
|
VRFS-1577 VRFS-736 session ratings
|
2014-04-30 14:07:23 +00:00 |
|
Seth Call
|
6463512420
|
* a fix for race condition that can hang eventmachine startup
|
2014-04-30 03:03:37 +00:00 |
Brian Smith
|
c0834c92c7
|
Merge branch 'feature/widget_fixes_1558' into develop
|
2014-04-29 03:37:01 -04:00 |
|
Brian Smith
|
4b98350f48
|
remove debug logs
|
2014-04-29 03:36:09 -04:00 |
|
Brian Smith
|
8b43e63800
|
VRFS-1558 added tests
|
2014-04-29 03:33:37 -04:00 |
|
Scott Comer
|
e82ae132bd
|
fix method for adding connection to music session
|
2014-04-28 22:38:30 -05:00 |
|
Brian Smith
|
8eedd63d7f
|
Merge branch 'develop' into feature/widget_fixes_1558
|
2014-04-28 23:22:08 -04:00 |
|
Brian Smith
|
4e188d74b7
|
VRFS-1562 make avatars clickable links (this commit addresses Feed and comment dialog only)
|
2014-04-27 20:28:25 -04:00 |
|
Brian Smith
|
2b7ef1df55
|
VRFS-1350 hover bubble style improvements
|
2014-04-27 19:00:18 -04:00 |
|
Brian Smith
|
15e8ddb706
|
VRFS-1558 comment dialog work
|
2014-04-27 10:06:01 -04:00 |
|
Brian Smith
|
9b810310f9
|
VRFS-1558 implement comment dialog
|
2014-04-27 04:09:55 -04:00 |
|
Brian Smith
|
37c23d4ee2
|
VRFS-1558 wire up share button dialog / hide new share icon if session has ended
|
2014-04-26 23:59:38 -04:00 |
|
Brian Smith
|
7e2d37bac5
|
VRFS-1555 VRFS-1556 do not show private sessions and recordings
|
2014-04-26 16:31:51 -04:00 |
|
Brian Smith
|
c06458550c
|
VRFS-1436 allow unauthenticated uses to share recordings and sessions from landing pages
|
2014-04-26 14:21:17 -04:00 |
|
Brian Smith
|
ce80b1a09b
|
VRFS-1558 convert SESSION and RECORDING text into clickable links
|
2014-04-25 02:11:46 -04:00 |
|
Brian Smith
|
23137ec423
|
VRFS-1558 widget enhancement work
|
2014-04-25 01:56:24 -04:00 |
|
Seth Call
|
26dc80436c
|
* merging build script
|
2014-04-24 18:07:52 +00:00 |
|
Seth Call
|
26a9f9a162
|
* commenting 'Measurement Protocol' into related classes
|
2014-04-24 02:27:31 +00:00 |
|
Seth Call
|
2496c051a3
|
* doubting approach of using sessionModel as trigger handler; changing to document
|
2014-04-23 22:13:37 +00:00 |
|
Seth Call
|
fb662e82be
|
* sessionModel to send out events on start/stop
|
2014-04-23 22:03:00 +00:00 |
|
Seth Call
|
f9e035e621
|
* adding db 1/0 to test mode
|
2014-04-23 21:52:35 +00:00 |
|
Seth Call
|
bc006b8c71
|
* adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually
|
2014-04-23 19:48:40 +00:00 |
|
Seth Call
|
29dfba8276
|
* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643
|
2014-04-23 15:08:19 +00:00 |
|
Bert Owen
|
3921324b32
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:34:59 +02:00 |
|
Bert Owen
|
ddf3c9cc5f
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:27:58 +02:00 |
|
Bert Owen
|
07e141cc8f
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:27:49 +02:00 |