 Seth Call
|
9820562892
|
* more websocket/heartbeat fixes
|
2014-04-30 03:01:28 +00:00 |
|
Seth Call
|
e3e9cb5830
|
* keeping master in line with development, for dataabse
|
2014-04-29 16:31:36 +00:00 |
|
Seth Call
|
d472c2b78f
|
* keeping master manifest is lock with develop
|
2014-04-29 16:29:06 +00:00 |
|
Seth Call
|
3e2f39cc85
|
* VRFS-1653 - don't bother with cleanup in onerror, and make startup of EventMachine better (VRFS-1659)
|
2014-04-29 16:27:50 +00:00 |
|
Seth Call
|
ece5ee80f8
|
* debugging websocket-gateway problems
|
2014-04-29 14:22:31 +00:00 |
|
Seth Call
|
264d65d98b
|
* merged in more websocket fixes
|
2014-04-29 14:22:23 +00:00 |
|
Seth Call
|
8262725aae
|
* merging in some gateway fixes
|
2014-04-29 14:19:42 +00:00 |
|
Seth Call
|
00a6139cd1
|
* merged
|
2014-04-29 14:04:26 +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 |
|
Seth Call
|
5b92445021
|
* release branch pushes from jenkins
|
2014-04-22 17:59:42 +00:00 |
Anthony Davis
|
addc1e0475
|
VRFS-905 and also fix failed test
|
2014-04-15 22:09:16 -05:00 |
|
Anthony Davis
|
ca78165cf0
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-15 21:03:51 -05:00 |
|
Anthony Davis
|
e3b57da087
|
VRFS-1616 fixed javascript c&p error
|
2014-04-15 21:03:39 -05:00 |
|
Seth Call
|
ac1b5d2e42
|
* fix for timecop
|
2014-04-15 17:02:51 +00:00 |
|
Seth Call
|
1d6741714d
|
* resque_spec path removed
|
2014-04-15 15:17:44 +00:00 |
|
Seth Call
|
21a101cc56
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-15 15:02:57 +00:00 |
|
Seth Call
|
87f0eaa07b
|
* VRFS-1612 - fix for invitations showing up when they shouldn't. also new ftue wip progres
|
2014-04-15 15:02:45 +00:00 |
|
Anthony Davis
|
7a5f5ef93c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-14 15:52:52 -05:00 |
|
Anthony Davis
|
08951258a8
|
VRFS-905 - adding bands integration tests
|
2014-04-14 15:52:26 -05:00 |
Jonathan Kolyer
|
bf1e315b48
|
Merge branch 'develop' into vrfs925
|
2014-04-14 10:59:58 +00:00 |
Brian Smith
|
e01409a0fb
|
VRFS-1530 added missing semicolon (not sure if this will fix issue or not - unable to reproduce)
|
2014-04-15 00:48:48 -04:00 |
|
Brian Smith
|
e5a6f01198
|
VRFS-1529 hover bubbles should render above dialogs
|
2014-04-15 00:14:02 -04:00 |
|
Jonathan Kolyer
|
9ddbc6ba5c
|
VRFS-925 finishing up tests
|
2014-04-14 10:57:21 +00:00 |
|
Seth Call
|
83038cf315
|
* tweak hover code
|
2014-04-11 14:45:54 +00:00 |
|
Seth Call
|
5e62890003
|
* more debugs in failing build server tests
|
2014-04-11 02:58:31 +00:00 |
|
Seth Call
|
7c16c5f915
|
* adding more puts, and waiting longer for tests to start
|
2014-04-11 02:29:59 +00:00 |
|
Seth Call
|
4e8af1cf32
|
* adding build server debug statements
|
2014-04-11 01:56:12 +00:00 |
|
Seth Call
|
e983e3d186
|
* ok, last time I remove stuff from maintanance page. probably
|
2014-04-10 19:40:46 +00:00 |
|
Seth Call
|
d7e9bb9f18
|
* removign more dirt from maintanence page
|
2014-04-10 19:40:14 +00:00 |
|
Seth Call
|
218d2ed454
|
* removing facebook generated stuff at bottom of maintanance page
|
2014-04-10 19:39:17 +00:00 |
|
Seth Call
|
b0de20b916
|
* fixing landing tests
|
2014-04-10 18:56:21 +00:00 |
|
Seth Call
|
916f93797e
|
* VRFS-1595 fix typo in maintenance
|
2014-04-10 17:20:36 +00:00 |
|
Seth Call
|
5076fd103d
|
* VRFS-1595 completed (maintanence page)
|
2014-04-10 17:18:08 +00:00 |
|
Seth Call
|
d9fcf77be7
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-10 15:26:34 +00:00 |
|
Seth Call
|
61cdf5a681
|
* delete all users before running the reconnect test
|
2014-04-10 15:25:30 +00:00 |
|
Brian Smith
|
7a95830b39
|
remove absolute position style
|
2014-04-10 02:24:04 -04:00 |
|
Brian Smith
|
628f250a7f
|
VRFS-1511 fix hover bubble positioning and mouseout issues
|
2014-04-10 02:21:21 -04:00 |
|
Brian Smith
|
ff03770256
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-09 21:18:57 -04:00 |
|
Seth Call
|
76e63193ca
|
* fixing some broken tests
|
2014-04-09 21:11:13 +00:00 |
|
Seth Call
|
cc7bbf3f6a
|
* resolved merge
|
2014-04-09 18:31:40 +01:00 |
|
Seth Call
|
95f1a59851
|
* VRFS-1404 reconnect with tests
|
2014-04-09 18:25:52 +01:00 |
|
Brian Smith
|
2525f86c4f
|
VRFS-1350 update timestamps to use timeago
|
2014-04-08 23:52:30 -04:00 |
|
Brian Smith
|
8e9bf41b10
|
VRFS-1573 start playing audio as soon as session/recording landing pages load
|
2014-04-08 22:29:03 -04:00 |
|
Brian Smith
|
1a7e63d50a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-08 21:37:12 -04:00 |
|
Jonathan Kolyer
|
5a4bff14d2
|
VRFS-925 running tests for server side GA events
|
2014-04-08 17:15:49 +00:00 |
|
Seth Call
|
3dfc455fa4
|
* reconnect working for in-session; beginning in-situ reconnect refactor
|
2014-04-08 12:43:26 +01:00 |
|
Jonathan Kolyer
|
7203124e89
|
merging
|
2014-04-08 07:21:50 +00:00 |
|
Brian Smith
|
a6f5fa7f54
|
VRFS-1356 do not display broken instrument icon by using helper method that resolves to default icon
|
2014-04-08 01:41:25 -04:00 |
|
Brian Smith
|
4906c2b902
|
VRFS-1437 update play and like stats during refresh
|
2014-04-08 01:21:10 -04:00 |