b916d4d997
VRFS-3055 : Multiple levels of config option video_available
...
“none”, “mvp”, and “full”. “mvp” mode is similar to full, except it
hides video recording functionality.
2015-04-22 15:36:21 -05:00
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
ea45c286ea
VRFS-3055 : Make video features optional via config option.
2015-04-21 09:21:55 -05:00
Seth Call
fefd5a3fda
* jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works
2015-04-16 15:44:38 -05:00
Seth Call
4cf4e21552
* VRFS-2938 - packaging phase now shows % indicator
2015-04-16 14:45:29 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
Seth Call
80a48c60c6
* VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks)
2015-03-31 21:08:09 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
d44236abc4
remove jamblaster notice from site
2015-03-20 09:58:58 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
51689e3d61
* make backing tracks show on/off and fix migration
2015-02-16 14:59:58 -06:00
Seth Call
afe9f65709
* merged
2015-02-15 22:14:30 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
Seth Call
372444ebd1
* wip
2015-01-23 10:50:58 -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
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -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
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
786486026b
* wip
2014-12-30 17:10:16 -06:00
bb298dd6b9
VRFS-2548 : Config-ize location of jamtracks python tool
2014-12-29 15:05:19 -06:00
Seth Call
4a79f0c4ec
* wip
2014-12-20 14:05:31 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Seth Call
0601e85e9d
* configurable hiding for tests of jamtracks
2014-12-02 07:49:18 -06:00
b282a69927
VRFS-2477 : Re-add google email config -- required for oauth functionality and specs.
...
This should address a few more tests.
2014-11-12 13:08:08 -06:00
c742a13da9
Fix a few specs.
2014-11-12 11:02:38 -06:00
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
Seth Call
4e00863de6
* merged
2014-11-07 16:16:25 -06:00
Seth Call
ea601711fa
* make desk keys configurable
2014-11-05 20:32:37 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
Seth Call
62833198b3
* VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix
2014-10-29 11:28:13 -05:00
Seth Call
fe7edbba5d
* many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181
2014-10-22 23:10:49 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
Seth Call
0fdb932db1
* VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin
2014-10-02 14:04:36 -05:00
Seth Call
d2cd527f10
* fix preferences window not showing
2014-09-15 07:45:17 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Seth Call
7761c2e9a8
* VRFS-2155 fix passing of yellow
2014-09-10 09:25:43 -05:00
Seth Call
554d100c31
* VRFS-1962, VRFS-2047, VRFS-2046, VRFS-2006 - score breakdown hover and score badges are all tested and working
2014-08-19 20:58:24 -05:00
Seth Call
d34929d70b
* landing pages in VRFS-2037
2014-08-14 22:23:22 -05:00
Seth Call
30b2c1bb53
* VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections
2014-08-14 13:16:38 -05:00
Seth Call
776704fdf5
* VRFS-2045 - guard against too many concurrent connections
2014-08-14 11:35:17 -05:00
Seth Call
322cdad87d
* wip
2014-08-14 10:09:33 -05:00
Seth Call
edc805e442
* VRFS-2040 - pass in retry value to backend
2014-08-13 12:51:40 -05:00
Seth Call
36043ec631
* make the packet size configurabel
2014-08-06 08:11:07 -05:00
Seth Call
00dee99e17
* wip
2014-07-31 20:16:38 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
Seth Call
c2a5936720
* wip
2014-07-14 15:53:04 -05:00
Seth Call
7da75e94d9
* VRFS-1575
2014-05-29 14:44:37 -05:00
Seth Call
dff3fa4870
*wip
2014-05-29 14:44:37 -05:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
Seth Call
df5fae1981
* wip
2014-05-29 14:32:46 -05:00
Seth Call
c0ce26c602
* fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-05-01 14:09:33 -05:00
Seth Call
ad266e5b80
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-04-30 15:29:10 -05:00
Seth Call
700ef04edf
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
2014-04-04 23:16:38 +01:00
Seth Call
b058f19692
* VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure)
2014-03-21 03:23:33 +00:00
Seth Call
b04c7bcea5
* VRFS-871 - user-to-user messaging complete
2014-03-20 11:53:26 +00:00
Seth Call
000dd3fdd0
* VRFS-1253 - working in a basic sense with pagination
2014-03-09 18:04:56 +00:00
Seth Call
faed48271b
* VRFS-1372 resolved, and not requiring local only until figure out some deployment issues
2014-03-07 14:20:34 -06:00
b4aae340f7
merge conflict
2014-02-28 07:07:26 +00:00
Seth Call
dcc5437f3a
* fix import of common by custom
2014-02-27 19:22:58 +00:00
Seth Call
f0e916e736
* VRFS-1047 - looks good; no audio hooked up
2014-02-27 00:38:01 +00:00
Seth Call
7a41b74549
* VRFS-1228
2014-02-25 19:22:32 +00:00
a1a265f36f
VRFS-756 changing email invite posting behavior incrementally
2014-02-25 03:29:03 +00:00
Seth Call
0522c20e60
* VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock
2014-02-24 16:55:56 +00:00
Seth Call
652c56dafd
* VRFS-924 haml added
2014-02-11 15:53:20 +00:00
Seth Call
dc462d804d
* VRFS-982 - style with custom easydropdown instead of select element
2014-02-10 22:43:09 +00:00
Seth Call
7661fc5e39
* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog
2014-02-07 21:28:47 +00:00
Seth Call
b668e54f57
* VRFS-1083 - twitter mostly working; need to deal with edge cases
2014-02-07 14:07:08 +00:00
Seth Call
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
Seth Call
148009ece5
* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg
2014-02-04 20:28:00 +00:00
Seth Call
9526be15ad
* finish renaming back ShareDialog
2014-02-04 18:25:53 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
Seth Call
5dc376fa23
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 20:46:04 -06:00
Seth Call
7f409c2cb4
VRFS-1054 removing reload slush
2014-02-01 20:45:58 -06:00
Seth Call
6ae07fa187
* make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043)
2014-02-01 15:59:43 +00:00
Seth Call
6ccfc4cc08
* VRFS-1010 possibly done
2014-01-30 15:51:05 -06:00
Seth Call
d93d27db52
* trying to disable testsgg
2014-01-25 16:48:24 -06:00
Seth Call
96768b7979
* VRFS-1022 finished
2014-01-25 14:03:14 -06:00
Seth Call
4b13c5c16c
* making ubuntu command need sudo, and adding ubuntu template maker
2014-01-22 16:23:33 -06:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
Seth Call
e57946afd2
* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)
2014-01-19 02:20:44 +00:00
Seth Call
8644f4cbc3
* VRFS-1006 admin pages added to icecast
2014-01-17 19:55:26 +00:00
Seth Call
1f37b9881f
* parameterizing email configs and trying to speed up build on server
2014-01-14 16:55:34 -06:00
Seth Call
eb7adbd303
* working out more issues with VRFS-801
2014-01-11 05:23:29 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
4b85863a33
vrfs-927: buzz admin fixes
2014-01-08 18:00:22 -06:00
Seth Call
ba3b9ab873
* VRFS-946 - in-session recording
2014-01-05 03:47:23 +00:00
Seth Call
182242c7fb
* VRFS-856 - hopefully the fix
2013-12-21 15:12:25 +00:00
Seth Call
a68235f280
* adding 'select' to dialog-inner so it'll look JKish
2013-12-20 22:24:14 +00:00
Seth Call
d97a960a0e
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:21 +00:00
fa8df410da
VRFS-719 Added code to force downloads through cloudfront
2013-12-12 20:47:20 -06:00
Seth Call
db76c34ba5
* VRFS-813 -most all frontend changes needed for start/stop recordings
2013-11-03 14:55:55 -06:00
Seth Call
481514e301
* VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable
2013-10-19 14:46:06 -05:00
Seth Call
b74ab7fda9
* removing helper to resolve remote_ip, and doing it the 'rails' way
2013-10-01 21:49:41 +00:00
Seth Call
ea1f6fb17b
* VRFS-746 - add config to read X-Real-IP instead of request.remote_ip
2013-10-01 18:57:02 +00:00
Seth Call
3c69988d1d
* VRFS-709 - registrations tracked
2013-09-23 21:00:39 +00:00
Seth Call
5bbea091bb
* VRFS-695 - GA integrated trivially for all 3 environments
2013-09-23 18:06:25 +00:00
Seth Call
c1ad886c35
* VRFS-699 - support notify_release_stages in the javascript bugsnag
...
* VRFS-704 - suppress music sessions with 0 connections find sess api
* VRFS-700 - the find session API does alot better by suppressing empty
sessions
2013-09-22 18:56:51 +00:00
Seth Call
022085c8c8
* VRFS-699 bugsnag added to javascript
2013-09-22 01:25:20 +00:00
Seth Call
fca15af824
* fix for typo found in perf_data upload to S3 (VRFS-690); also removing old config relating to perf_data_bucket_key
2013-09-18 15:23:22 +00:00
Seth Call
2f41675471
merging jam-web into web
2013-09-15 18:04:37 +00:00
Steven Miers
Seth Call
Jonathan Kolyer
Chris Doughty