 Seth Call
|
eb00668c7b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-07-08 15:47:22 -05:00 |
|
Seth Call
|
23b327d816
|
* VRFS-404 fixed the account summary view and success callback
|
2013-07-08 15:08:52 -05:00 |
Brian Smith
|
8cd6aeb9e5
|
VRFS-331 revert stylesheet change
|
2013-07-08 01:12:56 -04:00 |
|
Brian Smith
|
64e048ea67
|
VRFS-331 fix scrolling on Profile screen
|
2013-07-08 01:02:42 -04:00 |
|
Brian Smith
|
0f4613f053
|
revert unintended change
|
2013-07-08 00:15:33 -04:00 |
|
Brian Smith
|
c49e777e8e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-07-08 00:12:47 -04:00 |
|
Brian Smith
|
2fadb1d86a
|
random cleanup
|
2013-07-08 00:12:42 -04:00 |
|
Brian Smith
|
78f0e41fb2
|
VRFS-377 remove commented log statements
|
2013-07-08 00:11:39 -04:00 |
|
Seth Call
|
b2e02140fc
|
* VRFS-404 fully implemented, but I've not seen it work yet because I can't ever get through the FTUE
|
2013-07-07 22:15:32 -05:00 |
|
Seth Call
|
016eaec512
|
* VRFS-414; fan signin works when no instruments selected
|
2013-07-06 22:55:18 -05:00 |
|
Seth Call
|
b2b1a361cd
|
* CTRL+N for VRFS-415
|
2013-07-06 21:47:53 -05:00 |
|
Seth Call
|
76df1fe886
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-07-05 20:02:51 -05:00 |
|
Seth Call
|
39d8293795
|
* missed some styling for VRFS-404 (audio account profiles)
|
2013-07-05 20:02:41 -05:00 |
|
Seth Call
|
25326a1402
|
* put therubyracer in a unix-only group so that it can be excluded
|
2013-07-05 14:30:37 -05:00 |
|
Seth Call
|
d714bf98a2
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-07-05 13:12:55 -05:00 |
|
Seth Call
|
7bdfd10f0e
|
* updating pg gem to coincide with jam-db
|
2013-07-05 13:12:41 -05:00 |
Mike Slemmer
|
58b1c28daf
|
VFRS-402
|
2013-07-05 01:24:43 -07:00 |
|
Brian Smith
|
26177bbbbd
|
VRFS-377 fix redirect url
|
2013-07-04 17:21:35 -04:00 |
|
Brian Smith
|
890532e7f2
|
VRFS-377 desk.com integration
|
2013-07-04 17:11:20 -04:00 |
|
Brian Smith
|
ea2bcb6e2e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-07-03 22:26:46 -04:00 |
|
Brian Smith
|
12374da0db
|
VRFS-330 wire up social links on create session screen
|
2013-07-03 22:26:30 -04:00 |
|
Seth Call
|
f84f41c228
|
* VRFS-404; styles added only
|
2013-07-02 20:41:00 -05:00 |
Jonathon Wilson
|
3756dcf218
|
Increase FTUE latency timeout to 5 minutes.
|
2013-06-30 20:51:37 -06:00 |
|
Brian Smith
|
9bcdc40350
|
VRFS-377 desk.com integration
|
2013-06-30 21:06:22 -04:00 |
|
Brian Smith
|
b008b90eae
|
leave session fix
|
2013-06-26 21:59:47 -04:00 |
|
Brian Smith
|
308fdfbfaf
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-26 21:37:42 -04:00 |
|
Brian Smith
|
fa0683cb03
|
fix session bug
|
2013-06-26 21:37:26 -04:00 |
|
Seth Call
|
a7f35bf3d6
|
t pushMerge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-26 16:56:20 -05:00 |
|
Seth Call
|
5f06a4ae03
|
* hit ctrl+esc to cancel update on initial popup
|
2013-06-26 16:56:13 -05:00 |
|
Brian Smith
|
3e028ecd6c
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-26 11:16:57 -04:00 |
|
Brian Smith
|
5a63866145
|
fix tests
|
2013-06-26 11:16:13 -04:00 |
Jonathan Kolyer
|
467ff2e1fe
|
vrfs-360: tried new keytool import command
|
2013-06-26 08:13:02 -07:00 |
|
Seth Call
|
1cbafadef4
|
t pushMerge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-26 09:55:06 -05:00 |
|
Seth Call
|
e39f61fa35
|
* carrierwave to use public
|
2013-06-26 09:54:58 -05:00 |
Jonathon Wilson
|
bd08ad2e7b
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-26 00:26:22 -05:00 |
|
Jonathon Wilson
|
01abfbe175
|
FTUE: Extend timeout from 90 to 150 seconds.
|
2013-06-26 00:26:16 -05:00 |
|
Brian Smith
|
3419455ddd
|
bug fix in add track dialog
|
2013-06-26 00:15:00 -04:00 |
|
Brian Smith
|
c0b486be35
|
bug fix in add track dialog
|
2013-06-26 00:00:40 -04:00 |
|
Brian Smith
|
a9fe73acbc
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-25 23:12:16 -04:00 |
|
Brian Smith
|
b5a452ef64
|
VRFS-107 session join / departure notifications
|
2013-06-25 23:12:01 -04:00 |
|
Jonathon Wilson
|
435e846f0d
|
FTUE: extend latency test timeout from 20 seconds to 90 seconds.
|
2013-06-25 19:47:11 -06:00 |
|
Seth Call
|
7ea89dd38a
|
erge branc rspecmaster' of bitbucket.org:jamkazam/jam-web
|
2013-06-25 20:07:26 -05:00 |
|
Seth Call
|
b586cf73d4
|
* making sure 'congrtulations.js' doesn't mix in with main client page
|
2013-06-25 20:04:17 -05:00 |
|
Brian Smith
|
d6ff760acb
|
VRFS-286 clean up connection and music session if necessary and send notifications to friends when user signs out
|
2013-06-24 21:18:15 -04:00 |
|
Brian Smith
|
c925b31c0d
|
last commit was unnecessary; was already resetting on each search
|
2013-06-24 20:14:47 -04:00 |
|
Brian Smith
|
706ff66380
|
VRFS-389 reset search results before each search
|
2013-06-24 20:09:30 -04:00 |
|
Brian Smith
|
1886f33bc1
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-24 19:41:51 -04:00 |
|
Brian Smith
|
d505456bb4
|
VRFS-390 toggle off search results when mouse leaves sidebar area
|
2013-06-24 19:41:29 -04:00 |
|
Seth Call
|
6e7363f12d
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-06-24 16:40:14 -05:00 |
|
Seth Call
|
f6f1c77067
|
* signup redone, and also VRFS-300 and VRFS-386; email styling done
|
2013-06-24 16:40:04 -05:00 |