 Seth Call
|
2b68987dfd
|
* VRFS-699 - adding bugsnag to jam-admin
|
2013-09-22 01:30:37 +00:00 |
|
Seth Call
|
022085c8c8
|
* VRFS-699 bugsnag added to javascript
|
2013-09-22 01:25:20 +00:00 |
|
Seth Call
|
ba0e600293
|
* VRFS-699; adding bugsnag to websocket-gateway as well, and hook up EventMachine errors in jam-web
|
2013-09-21 20:43:40 +00:00 |
|
Seth Call
|
11728893a3
|
* adding bugsnag initializer
|
2013-09-21 20:14:16 +00:00 |
|
Seth Call
|
6d0920fc9b
|
Merge branch 'master' into develop
|
2013-09-21 19:18:10 +00:00 |
|
Seth Call
|
98318b174f
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-cloud
|
2013-09-21 19:12:53 +00:00 |
|
Seth Call
|
852f2499e6
|
* VRFS-699 - initial integration into jam-web
|
2013-09-21 19:10:39 +00:00 |
|
Seth Call
|
e277f4d282
|
* VRFS-581; adding spinner, indication of no sessions are found, and also removing synchronous ajax
|
2013-09-21 03:43:56 +00:00 |
|
Seth Call
|
5b3d1aca5a
|
* missed trailing brace
|
2013-09-20 17:49:48 +00:00 |
|
Seth Call
|
da7a28a81e
|
* revert latest change regarding configuration of tracks
|
2013-09-20 17:46:36 +00:00 |
Brian Smith
|
decd478388
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-19 23:16:47 -04:00 |
|
Brian Smith
|
533874afdf
|
merge
|
2013-09-19 23:16:36 -04:00 |
|
Brian Smith
|
f5ea26b656
|
Merge branch 'hotfix/configure_track_bug'
|
2013-09-19 23:11:52 -04:00 |
|
Seth Call
|
e95b0a9594
|
* flip the colors of the progress steps to make more sense VRFS-696
|
2013-09-20 03:10:24 +00:00 |
|
Brian Smith
|
775577d4fa
|
VRFS-697 configure track bug - possible fix
|
2013-09-19 23:08:28 -04:00 |
|
Seth Call
|
03acb21428
|
* VRFS-696 - support new callbacks to update UI as application updates. also suppress websocket-connection popup if updating
|
2013-09-20 03:02:32 +00:00 |
|
Seth Call
|
17fade7bf0
|
* VRFS-694; adding newrelic to websocket. only real thing we get here is database monitoring
|
2013-09-18 22:11:32 +00:00 |
|
Seth Call
|
0006e81301
|
* missed websockets-gateway when bumping to 0.1 for gem
|
2013-09-18 21:10:08 +00:00 |
|
Seth Call
|
b4082c88ae
|
* bumping gems to be version 0.1.X to match debs
|
2013-09-18 20:35:20 +00:00 |
|
Seth Call
|
a2ab44648b
|
* VRFS-694 adding newrelic to rails
|
2013-09-18 20:14:37 +00:00 |
|
Seth Call
|
0d9a93418a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-18 15:23:32 +00:00 |
|
Seth Call
|
fca15af824
|
* fix for typo found in perf_data upload to S3 (VRFS-690); also removing old config relating to perf_data_bucket_key
|
2013-09-18 15:23:22 +00:00 |
|
Brian Smith
|
f57b866fda
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-17 23:09:53 -04:00 |
|
Brian Smith
|
62fb0820b0
|
VRFS-657 force user to accept terms when joining an existing session
|
2013-09-17 23:09:49 -04:00 |
|
Seth Call
|
1c4a4f2d76
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-17 15:03:23 +00:00 |
|
Seth Call
|
1e39eb7037
|
* adding a root gitignore to jam-clou
|
2013-09-17 10:20:06 +00:00 |
|
Brian Smith
|
0dfd122316
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-17 00:06:47 -04:00 |
|
Brian Smith
|
99774759cc
|
VRFS-677 mark chat devices as unassigned
|
2013-09-17 00:06:31 -04:00 |
|
Seth Call
|
e0980d5336
|
* VRFS-606 - disable text selection in in-session and ftue
|
2013-09-17 02:20:22 +00:00 |
|
Seth Call
|
e76fc73595
|
* VRFS-438 - squirt out BUILD_NUMBER into file and make debian packages reference it when it starts the app so that gem versions can be found
|
2013-09-16 17:03:26 +00:00 |
|
Seth Call
|
fbb9009fcb
|
* fix another copy/paste bug in admin build script
|
2013-09-16 04:27:14 +00:00 |
|
Seth Call
|
1085686970
|
* fixing jam-admin's build and Gemfile for merging into jam-cloud
|
2013-09-16 03:19:10 +00:00 |
|
Seth Call
|
c8150c8aee
|
merging jam-admin into admin
|
2013-09-16 03:15:31 +00:00 |
|
Seth Call
|
3d415ec447
|
* removing more reference to workspace
|
2013-09-16 02:42:02 +00:00 |
|
Seth Call
|
85cac2a014
|
* fixing more path changes
|
2013-09-16 02:36:21 +00:00 |
|
Seth Call
|
1082a7386a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2013-09-16 02:28:52 +00:00 |
|
Seth Call
|
4d723bacaf
|
* fixing relative paths in gems for develop branch as well
|
2013-09-16 02:28:44 +00:00 |
Jonathon Wilson
|
1d36dcb88f
|
VRFS-648. Use Peter's new resync function instead of FTUESave.
|
2013-09-15 19:55:12 -06:00 |
|
Seth Call
|
5dd3e82ea5
|
* removing workspace rfom websocket gateway gem file VRFS-438
|
2013-09-15 18:43:42 +00:00 |
|
Seth Call
|
24315d63f1
|
* fixing relative paths of gems VRFS-438
|
2013-09-15 18:42:14 +00:00 |
|
Seth Call
|
00bb84e7b7
|
* test commit
|
2013-09-15 18:33:59 +00:00 |
|
Seth Call
|
a112391be1
|
* VRFS-438; collapsing all repos into one; requires modification of build files
|
2013-09-15 18:15:16 +00:00 |
|
Seth Call
|
eba03124d4
|
* VRFS-438; collapsing all repos into one; requires modification of build files
|
2013-09-15 18:13:31 +00:00 |
|
Seth Call
|
f78b6f7868
|
merging websocket-gateway into websocket-gateway
|
2013-09-15 18:07:00 +00:00 |
|
Seth Call
|
2f41675471
|
merging jam-web into web
|
2013-09-15 18:04:37 +00:00 |
|
Seth Call
|
6ea4bae05c
|
merging jam-ruby into ruby
|
2013-09-15 18:04:03 +00:00 |
|
Seth Call
|
745bdac2a2
|
merging jam-pb into pb
|
2013-09-15 18:02:25 +00:00 |
|
Seth Call
|
a091c22aa6
|
merging jam-db into db
|
2013-09-15 17:58:54 +00:00 |
Anthony Davis
|
a29fe05862
|
VRFS-673 fixing version style in footer
|
2013-09-15 17:17:22 +00:00 |
|
Anthony Davis
|
f8b0a3ea51
|
VRFS-673 fixing version style in footer
|
2013-09-15 17:15:40 +00:00 |