Commit Graph

2718 Commits

Author SHA1 Message Date
Seth Call f7d0ef2b05 * VRFS-1135 only one recording comes back; not per claimed recording 2014-02-16 13:10:00 +00:00
Seth Call 06a9dde2c2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-16 03:38:13 +00:00
Seth Call ac677ebdf1 * adding sample data building to create a recording with a mix. VRFS-1135 2014-02-16 03:37:54 +00:00
Jonathan Kolyer 9b9fd789d2 merge conflict 2014-02-15 18:35:18 -06:00
Jonathan Kolyer cd3b57ef45 changed redirect to use route paths 2014-02-15 18:33:41 -06:00
Daniel Weigh ab630474d8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 17:58:41 -05:00
Seth Call da090bd1a9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 21:33:04 +00:00
Daniel Weigh 250a523228 * ignore vendor/* (bundle|cache|etc) -- any issues with this, feel free
to revert
2014-02-15 16:21:37 -05:00
Seth Call f5268c43fc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 21:21:25 +00:00
Seth Call 26a8b8013d * VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20 2014-02-15 21:19:03 +00:00
Daniel Weigh 6124cb20fb VFRS-1047 Implement the new landing page.
Carousel in place -- edit slides in users_controller.erb.
At some point, should probably migrate to admin db.

Minor rework to make user/* (web.erb) pages appear correctly in firefox
 -- float issues.

Buzz should work (may need some styling)
Latest is stubbed out.
2014-02-15 16:11:06 -05:00
Daniel Weigh 18deb7b13a * fix admin redirect 2014-02-15 15:55:58 -05:00
Daniel Weigh 7ac51c7cbf VRFS-931 Band tweaks
fix for wrapping instruments
2014-02-15 15:06:07 -05:00
Seth Call 865d8c17b6 * VRFS-1121 - set dropdown size to 7 2014-02-15 14:24:08 +00:00
Seth Call 7dd0751409 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 23:10:51 -06:00
Seth Call 9f7dfa4fcc * adding in piano to list of instruments 2014-02-14 23:10:39 -06:00
Seth Call c02bc4e872 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-15 04:22:59 +00:00
Seth Call 0300306e1d * VRFS-1130 - found issue where postback wasn't using ENV['RAILS_RELATIVE_URL_ROOT'] 2014-02-15 04:22:48 +00:00
Daniel Weigh 614547a9dd VRFS-1123 Text wrapping. 2014-02-14 19:06:38 -05:00
Seth Call 0fbd3543ca * VRFS-1118 fix hidden text problem 2014-02-14 23:41:01 +00:00
Seth Call 694a57bb4a * VRFS-1119 - GA variable not prefixed correctly 2014-02-14 13:27:31 -06:00
Seth Call 84ce286588 * fixing test. no such thing as find\! 2014-02-14 12:04:02 -06:00
Seth Call f0cb73e842 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 11:59:30 -06:00
Seth Call f86d0643eb * remove dup haml-rails 2014-02-14 11:59:28 -06:00
Jonathan Kolyer fb3beb3859 VRFS-580 set default SessionSetConnectionStatusRefreshRate to 3 seconds 2014-02-14 08:07:24 -06:00
Jonathan Kolyer 80b042a637 Merge branch 'develop' into vrfs580 2014-02-14 08:06:51 -06:00
Jonathan Kolyer 835d5a24a0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 06:55:53 -06:00
Jonathan Kolyer ebbe0c3752 VRFS-725 removed the remember_me checkbox if the client is active 2014-02-14 06:55:42 -06:00
Jonathan Kolyer 470150c661 VRFS-580 added calls to SessionSetConnectionStatusRefreshRate for client csTimer 2014-02-14 02:36:10 -06:00
Brian Smith c0f91bb8d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 02:17:46 -05:00
Brian Smith 71385eda04 VRFS-1028 add like / share functionality to session / recording hover bubbles 2014-02-14 02:17:36 -05:00
Daniel Weigh 6186e20251 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 01:01:37 -05:00
Daniel Weigh 5d8fac92c6 * fix admin redirect 2014-02-14 01:01:09 -05:00
Seth Call 4d1f24e606 * gon has issue fixed 2014-02-13 23:26:53 -06:00
Daniel Weigh b704186e9a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-14 00:07:42 -05:00
Daniel Weigh 1834f72662 VRFS-294
fix for box-sizing in Firefox.
2014-02-13 23:39:00 -05:00
Seth Call 0d6c8a94e6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-13 22:11:45 -06:00
Seth Call 9e561c047a * VRFS-1103 - coverage for all projects. need to figure out how to merge all 2014-02-13 22:11:30 -06:00
Daniel Weigh 6b8f00d103 VRFS-294
fix for box-sizing in Firefox.
2014-02-13 22:09:05 -05:00
Brian Smith ca15275a4f fix bug 2014-02-13 22:03:59 -05:00
Brian Smith c8f7141c13 Merge branch 'feature/hover_bubbles' into develop 2014-02-13 20:52:47 -05:00
Brian Smith f6aaa3dcbd VRFS-1028 session / recording hover bubbles 2014-02-13 20:50:56 -05:00
Seth Call 108a9564b6 * adding band create error reporting, better styling of 500 errors, and upping region size 2014-02-13 22:57:48 +00:00
Seth Call b534a1e757 * trying rcov formatter for jenkins integration (VRFS-1103) 2014-02-13 21:17:47 +00:00
Seth Call d20713144e * VRFS-1062 - mostly done. l2m there is an open question on before moving on 2014-02-13 20:17:16 +00:00
Brian Smith eb15b1843b VRFS-1028 session/recording hover work 2014-02-13 14:55:55 -05:00
Seth Call fa37549482 * VRFS-1096 - register volume change callbacks when page loads 2014-02-13 18:54:54 +00:00
Seth Call 240967f7ce * VRFS-1098 - fixed case where registering as a musician in the native interface sends you to downloads (goofy). Also refactoder is_native_client? into a helper 2014-02-13 18:27:38 +00:00
Seth Call 763538e136 * VRFS-1095 fixing copy-to-clipboard for share dialog in native client. 2014-02-13 17:51:51 +00:00
Seth Call 5ba4e97dca * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00