seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
4,899 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

4899 Commits

Author SHA1 Message Date
Brian Smith 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05:00
Brian Smith a07728ffa3 Merge branch 'feature/find_session_start_session' into develop 2015-01-11 21:22:59 -05:00
Steven Miers a900087d87 VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests. 2015-01-11 19:17:18 -06:00
Seth Call d139966445 VRFS-2643 - run eventmachine in it's own thread 2015-01-11 16:41:49 -06:00
Seth Call 2c8a4b8483 * VRFS-2642 - reconnect at start of each job 2015-01-11 15:43:42 -06:00
Brian Smith 50ede5bd9e VRFS-1985 VRFS-2252 allow only session creator to start session with TBD date/time 2015-01-10 15:09:06 -05:00
Seth Call 7e0ba4ed44 * fix bad code introcude into jamtrack download method by me 2015-01-09 16:13:04 -06:00
Seth Call 72ef14a87d * remove spurious log 2015-01-09 15:20:32 -06:00
Seth Call 0ab7686205 * VRFS-2484 - wip pausing point; the code should not affect stability because it's mostly jamtrack only related 2015-01-09 15:15:12 -06:00
Seth Call e8ffb9c27d Merge branch 'develop' into feature/session_jamtracks 2015-01-09 11:24:03 -06:00
Seth Call 2c798e8860 * VRFS-2629 - one can follow the progression of a jam track being signed with detail 2015-01-09 11:23:20 -06:00
Brian Smith 4e0d2cd1cf Merge branch 'develop' into feature/find_session_start_session 2015-01-09 07:08:41 -05:00
Brian Smith aeabfcafc8 VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time 2015-01-09 03:08:03 -05:00
Brian Smith 9643fe1187 fixed javascript error on session detail screen 2015-01-09 02:38:38 -05:00
Brian Smith 47293afee4 VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen 2015-01-09 02:10:44 -05:00
Seth Call cc3bf2ce1f * wip 2015-01-08 20:35:39 -06:00
Seth Call b5c446dd04 * VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks 2015-01-08 11:38:46 -06:00
Seth Call e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -06:00
Brian Smith 79eec652d1 VRFS-1985 wip start session from Find Session screen 2015-01-07 23:18:07 -05:00
Seth Call 3fb5ab89d9 * typo in user wipe to fix test 2015-01-07 18:24:48 -06:00
Seth Call ef03b8886a * missed merge conflict 2015-01-07 17:45:47 -06:00
Seth Call e9e9962c42 Conflicts: 
db/manifest
	ruby/spec/jam_ruby/models/email_batch_spec.rb
 2015-01-07 17:44:56 -06:00
Seth Call 99f5e46ff6 * another quick fix for broken databasecleaner transaction cleanup 2015-01-07 16:57:25 -06:00
Seth Call d58cf2a048 * VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API) 2015-01-07 16:16:57 -06:00
Steven Miers 3028e421fb VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false. 
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
 2015-01-07 12:33:49 -06:00
Steven Miers 81ad2c89b5 VRFS-2610 : Fix bad API call that was throwing exception in console. 2015-01-07 11:27:21 -06:00
Seth Call 405c155c71 * VRFS-2606 get offset time into MM:SS:MLS format 2015-01-07 11:07:26 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Seth Call b4fed74b50 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-07 08:55:16 -06:00
Seth Call 585f307747 * add missing icon_folder.png 2015-01-07 08:54:28 -06:00
Brian Smith 67b1132d24 VRFS-2554 fixed notification for scheduled session with TBD date/time 2015-01-06 21:20:41 -05:00
Seth Call 98c99c9a12 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-06 16:52:24 -06:00
Seth Call af83a4f6a1 * VRFS-2608 - refactor and slight cleanup of UI towards new spec 2015-01-06 16:51:19 -06:00
Steven Miers 7a9e5ec9a9 VRFS-2609 : Put cancel button next to create account button. 2015-01-06 12:14:30 -06:00
Seth Call 1cb9f47f6c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-06 09:41:53 -06:00
Seth Call 7df0258015 * VRFS-2600 - tracks saved as id.ext to expose metadata 2015-01-06 09:36:05 -06:00
Steven Miers 8540cd6b90 Merge branch 'feature/nocaptcha' into develop 2015-01-05 23:09:35 -06:00
Steven Miers 32dd3f272f Touch 2015-01-06 03:45:39 +00:00
Steven Miers 9047e26aba Bypass recaptcha for feature specs exercising the signup mechanism. 2015-01-05 21:29:23 -06:00
Seth Call eb26c33858 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-05 20:26:42 -06:00
Seth Call 4e6ca425d9 * trying to fix tests 2015-01-05 20:26:36 -06:00
Steven Miers 8009e309ea Merge branch 'develop' into feature/nocaptcha 2015-01-05 19:04:57 -06:00
Steven Miers 18d06096b5 Revert "Fix spec that was magically passing sporadically." 
This reverts commit 4cc70f2082.
 2015-01-05 19:04:08 -06:00
Steven Miers f677714e9a Revert change. 2015-01-05 19:03:28 -06:00
Steven Miers 02aef2fe17 Fix test failures for jam_track rights. 2015-01-05 19:02:48 -06:00
Steven Miers eb990dd930 One more foxy 2015-01-05 18:27:14 -06:00
Steven Miers 4cc70f2082 Fix spec that was magically passing sporadically. 2015-01-05 17:47:27 -06:00
Steven Miers 16667a9ce3 Fix typo. 2015-01-05 17:25:43 -06:00
Steven Miers 6cfe5decbf Merge branch 'develop' into feature/nocaptcha 2015-01-05 17:04:13 -06:00
Steven Miers 4d5b1c0ee1 VRFS-2540 : Add recaptcha tests to user manager spec that verify that system behaves properly for both the passed-in recaptcha flag AND the "recaptcha_enable" application config value. 2015-01-05 17:02:55 -06:00