Commit Graph

3484 Commits

Author SHA1 Message Date
Seth Call e1d20949f5 * make 'two-instrument' user 2014-04-03 15:44:02 +01:00
Seth Call 7816007361 * test tweaks 2014-04-03 15:38:58 +01:00
Seth Call 18484c484b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-03 15:11:31 +01:00
Seth Call f1ef1de83c * wip new ftue 2014-04-03 15:11:23 +01:00
Jonathan Kolyer a7c8d9311f VRFS-1483 fixing tests 2014-04-03 05:03:28 +00:00
Brian Smith 7e8b6eb238 VRFS-1465 add tests 2014-04-03 00:19:39 -04:00
Brian Smith b17dafd94f Merge branch 'develop' into hotfix/feed_icon_fix 2014-04-01 21:31:07 -04:00
Seth Call 90eb0bc081 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-02 00:43:10 +01:00
Seth Call 86246d526f Merge branch 'feature/create_find_tiles' into develop 2014-04-02 00:42:56 +01:00
Seth Call 7bfe1cb634 * VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
Jonathan Kolyer 3509a84de5 VRFS-1483 replaced layout with user_mailer 2014-04-01 14:51:45 +00:00
Jonathan Kolyer 634de87e90 Merge branch 'develop' into vrfs1483 2014-04-01 14:49:29 +00:00
Jonathan Kolyer accaa99e38 VRFS-1483 integrating opt-out; fixing tests 2014-04-01 14:42:26 +00:00
Brian Smith 925c5831af VRFS-1445 display correct values of musician flag and country in admin 2014-04-01 01:18:31 -04:00
Seth Call 1fcd7a8994 * fix offset musician tile 2014-03-31 12:42:37 +01:00
Seth Call f2ff0ea434 * wip 2014-03-31 12:41:26 +01:00
Seth Call ad2cfe41cd * merged 2014-03-31 03:35:04 +01:00
Seth Call 373cda1121 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-31 03:28:16 +01:00
Seth Call da7fc7d901 * VRFS-1541 done from a code perspective... just need to do some admin work once posted 2014-03-31 03:28:04 +01:00
Anthony Davis 39d4aa7b13 VRFS-1263 - remove missing asset reference 2014-03-29 19:53:01 -05:00
Anthony Davis bfd5712e3c VRFS-1251 - clean up asset reference 2014-03-29 19:49:36 -05:00
Anthony Davis 54ecf4ca97 VRFS-1331 - capitalize K 2014-03-29 19:45:05 -05:00
Anthony Davis 979317db5f VRFS-1355 - trivial padding 2014-03-29 19:43:55 -05:00
Seth Call 9f28db3dc3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-28 04:05:13 +00:00
Seth Call ef59756f11 * make the viluat jam fest link smaller text and scooted down 2014-03-28 04:03:44 +00:00
Seth Call 39bd83ae5a * launch app test 2014-03-28 04:00:57 +00:00
Anthony Davis c7ff47dabf Fixing failing test 2014-03-27 22:23:39 -05:00
Seth Call 4e74ba438c * initializing 'me' for sidebar 2014-03-28 02:24:53 +00:00
Seth Call b7c6d8b9c0 * fix broken refreence to initializeFriendsPanel in notificaitonsPanel.js 2014-03-28 02:16:57 +00:00
Seth Call 7a29a358df * VRFS-1508 - Facebook signups are not recorded as type=Facebook in GA 2014-03-27 20:59:03 +00:00
Seth Call de10ed09d7 * adding config in admin needed by web VRFS-1541 2014-03-27 20:14:59 +00:00
Seth Call 28901b4d92 * bring back virtual jam fest link, but fix text based on VRFS-1541 2014-03-27 19:03:06 +00:00
Seth Call 94494a2b3a Merge branch 'feature/highlight_notifications' into develop 2014-03-27 18:44:34 +00:00
Seth Call 53a6941ceb * VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
2014-03-27 18:43:15 +00:00
Brian Smith 4316fa0d2c VRFS-1465 fix instrument icon for recording feed items 2014-03-27 02:00:21 -04:00
Seth Call ba43244b69 * fixing the refresh of sidebar friends when friend request accepted 2014-03-26 17:31:51 +00:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Seth Call d365054237 * VRFS-1533 - track in success path, not failure path of download GA info 2014-03-25 22:42:15 +00:00
Seth Call 1aef96b697 * VRFS-1474 cleaned up some error case dialogs 2014-03-25 16:30:22 +00:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +00:00
Seth Call f4a3ecdb25 * VRFS-1524 - adding getting started to carousel videos 2014-03-23 22:57:21 +00:00
Seth Call 5aaa389a4b * VRFS-1386 - check if invited_user.email is nil, and change existing test to have email 2014-03-21 22:37:15 +00:00
Seth Call 3de73f2193 * give hover bubble for musicians 10 more px VRFS-1516 2014-03-21 20:37:20 +00:00
Seth Call 9dee37ca8e * scoot over upload/download/convert statuses a few percent. not a permanent solution VRFS-1518 2014-03-21 20:27:38 +00:00
Seth Call 85cb225a3d * fix for VRFS-1517 - empty notifications in sidebar 2014-03-21 20:21:03 +00:00
Seth Call 2306948f9c * whack the default domain cookie if we see an attempt to invalidate 2014-03-21 16:20:34 +00:00
Seth Call 4aece93b87 * run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509 2014-03-21 04:44:34 +00:00
Seth Call b058f19692 * VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure) 2014-03-21 03:23:33 +00:00
Seth Call 8f1d48da40 * merged in VRFS-1110 2014-03-20 13:08:59 +00:00
Seth Call 79cd6edb78 * bring back kill hung tests switch 2014-03-20 12:54:48 +00:00