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
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
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
81ad2c89b5
VRFS-2610 : Fix bad API call that was throwing exception in console.
2015-01-07 11:27:21 -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
585f307747
* add missing icon_folder.png
2015-01-07 08:54:28 -06: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
7a9e5ec9a9
VRFS-2609 : Put cancel button next to create account button.
2015-01-06 12:14:30 -06:00
32dd3f272f
Touch
2015-01-06 03:45:39 +00:00
9047e26aba
Bypass recaptcha for feature specs exercising the signup mechanism.
2015-01-05 21:29:23 -06:00
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
eb990dd930
One more foxy
2015-01-05 18:27:14 -06:00
16667a9ce3
Fix typo.
2015-01-05 17:25:43 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
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
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
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
356e9c657a
* bump to get a develop build out
2015-01-04 22:45:13 -06:00
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
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
3c719e3f97
Another puts.
2015-01-03 11:51:42 -06:00
94480e1d88
Don't commit transient file.
2015-01-03 11:45:24 -06:00
2c2a32e140
Remove stray puts.
2015-01-03 11:45:24 -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
0f288539cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-01 14:23:00 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
e8fd6360aa
VRFS-2552 removed config.json_engine due to this error: undefined method key? JSON::Ext::Generator::State
2015-01-01 18:00:43 +00:00
Seth Call
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -06:00
Seth Call
83396675e6
* remove a diagnostic from javascript
2014-12-31 20:44:51 -06:00
Seth Call
116cf8cfce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-31 20:39:27 -06:00
Seth Call
71399dcaa7
* fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting
2014-12-31 20:39:22 -06:00
83bd5b6c6e
VRFS-2588 : YouTube client, remove logging
...
Also, do some misc cleanup.
2014-12-31 19:35:20 -06:00
Seth Call
d901c3a498
* try to fix test again
2014-12-31 12:34:17 -06:00
Seth Call
2fc6edf579
* fix broken test
2014-12-30 21:14:36 -06:00
Seth Call
ed15eef3ac
* I'm not sure how I typo'ed this...
2014-12-30 21:06:56 -06:00
Seth Call
a3f40b2f99
* fix typo in write_point /write VRFS-2569
2014-12-30 17:15:28 -06:00
Seth Call
6058b1770a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-30 17:12:44 -06:00
Seth Call
6fc32f1624
add influxdb support to Ruby/Javascript code, and instrument code as a starting point VRFS-2569
2014-12-30 17:12:24 -06:00
Seth Call
Steven Miers
Jonathan Kolyer