 Seth Call
|
fc0a8cc28a
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-16 20:43:15 -06:00 |
|
Seth Call
|
35da5d1ba1
|
* trying out removal of gemfile per run
|
2013-01-16 20:38:00 -06:00 |
Mike Slemmer
|
9ae702eaaf
|
more work
|
2013-01-16 16:38:57 -08:00 |
|
Mike Slemmer
|
aee1bddfe4
|
Added the upload id column
|
2013-01-16 16:37:09 -08:00 |
Jonathan Kolyer
|
44c94f538b
|
VRFS-214: created deb package config for jam-admin by cloning jam-web build setup
|
2013-01-16 06:02:09 -06:00 |
|
Jonathan Kolyer
|
68ac6e0987
|
added bundle exec prefix to jasmine rake call
|
2013-01-16 03:25:39 -06:00 |
|
Mike Slemmer
|
f628d1f30a
|
upload work
|
2013-01-16 17:53:55 -08:00 |
|
Mike Slemmer
|
f1dc45bc0b
|
more work
|
2013-01-15 14:54:17 -08:00 |
|
Seth Call
|
5bbd6a96f1
|
* trying to get rid of Gemfile.lock during build
|
2013-01-15 08:35:03 -06:00 |
|
Seth Call
|
b6bb47b196
|
* changing order of update/install
|
2013-01-15 07:52:43 -06:00 |
|
Mike Slemmer
|
cc37a1cf5f
|
added migration
|
2013-01-14 18:14:08 -08:00 |
|
Mike Slemmer
|
60366d5c0e
|
more work
|
2013-01-14 18:13:45 -08:00 |
|
Seth Call
|
81d747edd6
|
* remove vendor/bundle
|
2013-01-14 00:03:46 -06:00 |
|
Seth Call
|
35db905ace
|
* clean up vendor/bundle
|
2013-01-14 00:02:32 -06:00 |
|
Seth Call
|
99e18d41b4
|
* VRFS-217 forgot migration file
|
2013-01-13 23:04:11 -06:00 |
|
Seth Call
|
41781e8121
|
* VRFS-217 a test I should have had all along
|
2013-01-13 23:03:15 -06:00 |
|
Seth Call
|
0fd6525963
|
Merge branch 'master' of bitbucket.org:jamkazam/websocket-gateway
|
2013-01-13 22:51:42 -06:00 |
|
Seth Call
|
ef819532bb
|
VRFS-217; removing tire reference
|
2013-01-13 22:51:36 -06:00 |
|
Seth Call
|
e00c4884f6
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-13 22:51:28 -06:00 |
|
Seth Call
|
c47d2aed69
|
* VRFS-217 making sure REST API is stil the same
|
2013-01-13 22:51:15 -06:00 |
|
Seth Call
|
7c2b5da509
|
* VRFS-217: replacing elasticsearch with pg
|
2013-01-13 22:50:38 -06:00 |
|
Seth Call
|
c5ebe4fee7
|
* VRFS-217: creating the necessary migration for full text search
|
2013-01-13 22:47:17 -06:00 |
Brian Smith
|
758be3c45b
|
attempt to fix cucumber test for genre selection
|
2013-01-13 21:54:20 -05:00 |
|
Brian Smith
|
d219159e9e
|
fix cucumber test
|
2013-01-13 21:41:23 -05:00 |
|
Brian Smith
|
7d208517aa
|
merge
|
2013-01-13 20:47:25 -05:00 |
|
Brian Smith
|
55f5053a4a
|
VRFS-201 create session screen
|
2013-01-13 20:43:48 -05:00 |
|
Seth Call
|
121003d16d
|
* bundle install --local for build
|
2013-01-12 22:31:50 -06:00 |
|
Seth Call
|
a7cef455c9
|
* adding back another sleep
|
2013-01-12 20:49:31 -06:00 |
|
Seth Call
|
43898effc0
|
* adding back one sleep
|
2013-01-12 20:44:20 -06:00 |
|
Seth Call
|
d1f8728483
|
* remove sleeps on FTUE
|
2013-01-12 20:32:09 -06:00 |
|
Seth Call
|
5f4cd378d7
|
* not killing test if error found in js just yet
|
2013-01-12 20:00:44 -06:00 |
|
Seth Call
|
e57dd4924b
|
* removing reference to pluralize
|
2013-01-12 19:53:21 -06:00 |
|
Seth Call
|
e62e5da619
|
* adding experimental javascript collector
|
2013-01-12 19:48:28 -06:00 |
|
Seth Call
|
6fbcf3f455
|
* add flag to skip cucumber tests
|
2013-01-12 17:45:34 -06:00 |
|
Seth Call
|
88ecfa7753
|
* add long sleep before failing line
|
2013-01-12 17:12:43 -06:00 |
|
Seth Call
|
16940c4d01
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-db
|
2013-01-12 16:57:02 -06:00 |
|
Brian Smith
|
6dab346305
|
VRFS-201 create session mockup integration
|
2013-01-10 22:43:30 -05:00 |
|
Brian Smith
|
b6609eb39c
|
fixed friend bug
|
2013-01-10 22:42:26 -05:00 |
jam
|
3344ffa186
|
All all messages through to peers irrespective of type
|
2013-01-10 14:07:25 -06:00 |
|
Seth Call
|
0940175f88
|
* oops; forgot to add DEB_SERVER decl
|
2013-01-06 20:31:31 -06:00 |
|
Seth Call
|
3c2e1b17de
|
* publish deb for jam-web after jenkins build
|
2013-01-06 20:03:14 -06:00 |
|
Seth Call
|
4763bff32b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-db
|
2013-01-06 18:38:50 -06:00 |
|
Seth Call
|
7c0206ff59
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-db
|
2013-01-06 15:06:53 -06:00 |
|
Brian Smith
|
b5a031592e
|
VRFS-80 session history
|
2013-01-06 15:47:56 -05:00 |
|
Brian Smith
|
a9f6b03af3
|
VRFS-80 session history
|
2013-01-06 15:46:22 -05:00 |
Jonathon Wilson
|
fd57f3f01e
|
Finish FTUE functional, but bugs in bridge prevent test. Checking in to let Nat see test code. Re-include TestLatency on fakeJamClient to fix failing test.
|
2013-01-06 13:34:48 -07:00 |
|
Jonathan Kolyer
|
d1968adfc7
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-01-06 06:37:11 -06:00 |
|
Jonathon Wilson
|
76d82f7d01
|
Fixes for cucumber tests. Restore big chunk of accidentally deleted layout.js
|
2013-01-12 12:19:20 -07:00 |
|
Jonathon Wilson
|
f95f30d827
|
FTUE, screens 2 and 3
|
2013-01-12 11:19:02 -07:00 |
|
Jonathon Wilson
|
57c4078be3
|
Revisions to FTUE screen 1
|
2013-01-12 11:19:02 -07:00 |