Seth Call
9718cc7cca
* remove dynamic registration code
2015-01-12 13:37:50 -06:00
Seth Call
edbd28d357
* remove extra close bracket in listen link fi
2015-01-11 20:46:45 -06:00
Seth Call
5b1cb4527f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-11 20:43:55 -06:00
Seth Call
46ae56e7e8
* fix listen link
2015-01-11 20:43:15 -06: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
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
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
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
Steven Miers
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Steven Miers
13e6f226ea
VRFS-2540 : Recaptcha UI components
2015-01-05 16:57:49 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
d677b43c28
* VRFS-2603 private key now stored
2015-01-05 15:19:20 -06:00