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
Seth Call
7f18bff3fc
* VRFS-2602 - make it dead easy to parse out JamTrackId from URL
2015-01-05 14:48:46 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
Seth Call
356e9c657a
* bump to get a develop build out
2015-01-04 22:45:13 -06:00
Steven Miers
abbc01fc44
VRFS-2597 : Fix logging method in cleaner to fix spec.
2015-01-04 16:38:28 -06:00
Steven Miers
2853c77b7e
VRFS-2597 : Fix some broken tests:
...
* Naming issues
* Restore method that was caught by friendly fire in a cleanup session
* Add a few new specs to properly exercise controller methods to catch
errors sooner, i.e., not in feature specs.
* Restore deleted route
2015-01-04 16:24:31 -06:00
Seth Call
d3b613c2dc
* updating new JamTrack resque jobs for non-forking behavior, log corrections (a bad pattern I started), and extending from Stats-enabled base jobs
2015-01-04 14:18:25 -06:00
Seth Call
aed848c507
Merge branch 'develop' into feature/jam_tracks
...
Conflicts:
db/manifest
pb/src/client_container.proto
ruby/lib/jam_ruby.rb
web/config/environments/development.rb
web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
Seth Call
77d62a4744
Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
...
Conflicts:
web/jt_metadata.json
web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -06:00
Steven Miers
3c719e3f97
Another puts.
2015-01-03 11:51:42 -06:00
Steven Miers
8eb7430d9a
One more stray puts.
2015-01-03 11:47:28 -06:00
Steven Miers
94480e1d88
Don't commit transient file.
2015-01-03 11:45:24 -06:00
Steven Miers
2c2a32e140
Remove stray puts.
2015-01-03 11:45:24 -06:00
Seth Call
1ede9574cd
VRFS-2547 - capitializing JAMTRACKS_DIR in ruby tests
2015-01-02 22:06:03 -06:00
Seth Call
3c1816492c
* fix event_spec test for the rename of broadcast wixget on session landing page
2015-01-02 16:32:33 -06:00
Seth Call
4873da6448
* make test not break randomly
2015-01-02 16:00:53 -06:00
Seth Call
5f14f73322
* some more fixes for broadcasting - VRFS-2523
2015-01-02 15:29:31 -06:00
Seth Call
82b7c005ec
* if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591
2015-01-02 11:18:39 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00