Commit Graph

3467 Commits

Author SHA1 Message Date
Bert Owen 7893affafb VRFS-1592 add custom message in app dialog, fix test 2014-04-21 17:17:40 +02:00
Bert Owen 8563c82802 VRFS-1602 remove web/db/schema.db file 2014-04-21 10:05:34 +02:00
Bert Owen 5d9d87bc56 VRFS-1592 show app dialog, without customization. 2014-04-21 10:04:37 +02:00
Jonathan Kolyer c81e581786 Merge branch 'develop' into vrfs1576 2014-04-21 03:55:43 +00:00
Jonathan Kolyer 62dbeaa818 VRFS-1576 added validation and tests 2014-04-20 23:20:27 +00:00
Jonathan Kolyer 245727806d VRFS-1576 affiliate_partner model 2014-04-20 22:55:40 +00:00
Jonathan Kolyer 937efed3e5 VRFS-1576 affiliate_partner model 2014-04-20 22:54:49 +00:00
Anthony Davis f85f303da8 VRFS-1331 - JamKazam instead of Jamkazam 2014-04-20 16:43:58 -05:00
Bert Owen fc1fa1412f VRFS-1592 fixed 2014-04-20 20:16:37 +02:00
Bert Owen 404670c9a5 VRFS-1609 fixed 2014-04-19 12:52:54 -07:00
Bert Owen 6e5848fe60 VRFS-1602 Writing tests. 2014-04-19 12:24:30 -07:00
Bert Owen bd0df88e24 link musician/band profile on feed page 2014-04-18 19:14:11 -07:00
Seth Call 0a811a147c * adding bert as a dev user 2014-04-16 17:13:55 +00:00
Seth Call 585385351d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-16 17:11:39 +00:00
Seth Call d1267dff53 * wip on new ftue 2014-04-16 17:11:30 +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