Seth Call
afe9f65709
* merged
2015-02-15 22:14:30 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
c167f9d09a
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-14 21:04:28 -05:00
Seth Call
bbae4a7bf6
* yaka (yet another kickstarter ad
2015-02-14 16:56:21 -06:00
Seth Call
1c7518c3dd
* adding another kickstarter ad
2015-02-14 16:26:01 -06:00
Seth Call
2c3ed6beea
* check in new ad for kickstarter
2015-02-14 14:25:27 -06:00
a778eaef28
VRFS-2695 wip get user profile API
2015-02-13 22:45:19 -05:00
675dc70f23
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-13 00:49:44 -05:00
Seth Call
8d60f161f5
* add new landing ad for kickstarter
2015-02-12 20:46:39 -06:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
9ede0912a1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-07 23:22:48 -05:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
ed47441f67
VRFS-2698 refactoring website_validate to url_validate
2015-02-06 07:43:24 +00:00
3cdcadda94
merge develop
2015-02-03 23:39:21 -05:00
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05:00
fdcc77ae80
VRFS-2697 url format and site validation
2015-01-31 08:41:56 +00:00
16092ba816
VRFS-2697 website validator initial commit
2015-01-31 04:50:05 +00:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
Seth Call
372444ebd1
* wip
2015-01-23 10:50:58 -06:00
Seth Call
698f4ba648
* wip
2015-01-21 15:22:31 -06:00
ff95fe1c35
VRFS-2498, VRFS-2499 : Mesh out backing track/metronome track support at necessary layers rest/api/UI/etc. Implement necessary methods in fakeJamClient for quicker iterating.
2015-01-20 22:14:48 -06:00
3fb45c0dd0
VRFS-2499 - Incremental, nearly done.
2015-01-15 20:28:34 -06:00
4f94444429
VRFS-2498, VRFS-2618 : API, routes and specs for backing tracks/metronomes.
2015-01-13 10:15:46 -06:00
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
5ac69fc646
* wip
2015-01-09 16:11:04 -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
e9e9962c42
Conflicts:
...
db/manifest
ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -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
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -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
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
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -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
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
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
7ca3acb676
* wip
2014-12-22 09:50:59 -06:00
Seth Call
4a79f0c4ec
* wip
2014-12-20 14:05:31 -06:00
Seth Call
9876c00a7a
* VRFS-2456 - add listen function to find session page, and update of join/rsvp icons
2014-12-19 14:00:49 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
34cb617f5f
VRFS-1960 : download API for JamTracks, including a new message type, rescue job that builds the JKZ, and specs that exercise it all.
2014-12-17 17:19:36 -06:00
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
361d88a0fa
VRFS-1959 : jam_tracks#list_downloads API and model methods, as well as associated tests to verify.
2014-12-15 19:21:27 -06:00
Seth Call
566598fffc
* fix for failing tests
2014-12-08 15:37:31 -06:00
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
Seth Call
0601e85e9d
* configurable hiding for tests of jamtracks
2014-12-02 07:49:18 -06:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
76548b1af1
Merge branch 'develop' into feature/jam_tracks_merge
2014-12-01 11:45:54 -06:00
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
300426e2c9
VRFS-2480 : Additional recurly config
2014-11-25 14:34:07 -06:00
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06:00
Seth Call
d1d059b4c5
* disable score_histories for now
2014-11-17 13:28:43 -06:00
2d3bbd2a47
VRFS-2480 : Recurly specs, fixes and new implementation.
2014-11-16 20:20:54 -06:00
bf33578fdb
VRFS-2494 : Option to turn on jam tracks tile. Off in all configuration files for now.
...
Change config.jam_tracks_available=true to enable.
2014-11-16 16:03:56 -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
16d0342b1f
Recurly subdomains for development and production.
2014-11-12 11:52:52 -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
7dc80c10ce
VRFS-1849: Check for google authorization using AJAX and show/hide the google login button / "signed in" label as appropriate:
2014-11-06 13:16:58 -06:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -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
bcfc2def9e
* VRFS-2367 - create api to discover websocket location, and fix tests
2014-10-24 21:50:40 -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
e3dadf9c4b
VRFS-2032 : Youtube test account app name/developer key.
2014-10-15 15:17:03 -05:00
10c5a66f24
VRFS-2033 - Youtube developer keys for test and dev environments
2014-10-15 12:24:58 -05:00
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00: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
cdf9579ada
* fix port clash on tests
2014-09-26 12:57:37 -05:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
Seth Call
6f463b7b6c
* adding steven to dev users
2014-09-20 21:25:57 -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
4c85740597
* wip
2014-08-13 11:09:52 -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
2aab3c902d
* fixing test that failed on build server
2014-07-30 17:29:26 -05:00
Seth Call
a11ae44a90
* VRFS-1951 - make sure staging emails don't get sent from my machie
2014-07-30 16:39:59 -05:00
Seth Call
dc3fd38af1
* adding bart to dev_users
2014-07-26 14:19:48 -05:00
Seth Call
adb0b15555
* fixing bad schedules on scheduler.yml, and wip on admin web reporting
2014-07-25 15:01:14 -05:00
Seth Call
6c4bcd98be
* VRFS-1924 - score_history added
2014-07-21 16:42:30 -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
3bc94249ca
VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs
2014-07-11 02:23:10 -04:00
Seth Call
63dfb8929c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-30 15:44:38 -05:00
Seth Call
cbe4bf1747
* VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed
2014-06-30 15:44:28 -05:00
07d96d7a57
VRFS-1667, VRFS-1729 implemented account session page, session detail page
2014-06-29 15:54:51 +02:00
e211871168
merge develop
2014-06-23 01:09:03 -04:00
Seth Call
9e92125b59
* VRFS-1653 - websocket reconnect wasn't working if no connect on initial connect
2014-06-19 18:51:47 -05:00
b4151c27e9
VRFS-1669 VRFS-1672 session settings dialog / find session work
2014-06-19 00:21:34 -04:00
Seth Call
106222638f
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
2014-06-17 14:10:24 -05:00
Seth Call
f680fafaf3
* VRFS-1684 - adding latency to participants and approved_rsvps JSON response.
2014-06-16 15:41:37 -05:00
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
Seth Call
4a603cbaa2
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
2014-06-09 15:43:16 -05:00
a9b67a9a6b
VRFS-1693 resque job to schedule recurring music sessions
2014-06-03 01:10:25 -04:00
0edacbe3e2
merging with develop
2014-05-31 21:07:18 +00:00
689e0a8609
VRFS-1664 new musicians emailer
2014-05-31 09:36:10 +00:00
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
30037bc967
VRFS-1698 removed sendgrid email error handling
2014-05-31 09:03:18 +00:00
Seth Call
6ad607cd24
* fixing latency tester's page
2014-05-29 16:52:50 -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
05666f7927
wip
2014-05-29 14:34:18 -05:00
Seth Call
df5fae1981
* wip
2014-05-29 14:32:46 -05:00
243e06533b
VRFS-1665 scheduled session impl
2014-05-29 07:19:55 +00:00
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
f31248815d
VRFS-1670 session info page work
2014-05-26 23:52:59 -04:00
7fc2575588
fix routes
2014-05-26 14:25:53 +08:00
972af58888
fix tests
2014-05-26 13:49:54 +08:00
bc0e3ba0eb
VRFS-1681 cleanup unused notation files
2014-05-26 01:30:10 +08:00
fbeddf1735
VRFS-1682, VRFS-1679 : upload music notation, download music notation
2014-05-24 02:58:59 +08:00
5685e2f0e8
VRFS-1678 added music session update feature
2014-05-22 17:49:35 +08:00
00d06fe6f2
* merge
2014-05-22 16:07:17 +08:00
57f1fab935
VRFS-1677 fixed
2014-05-22 16:02:48 +08:00
b4f7035fed
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
2014-05-22 00:42:50 -04:00
03eb125fa8
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-22 00:42:33 -04:00
3891cea86d
VRFS-736 updated for user_progress_emailer
2014-05-21 22:45:06 +00:00
a1f288fe4d
VRFS-1676 fixed
2014-05-22 03:11:50 +08:00
1904c8f474
VRFS-1675 completed
2014-05-22 00:24:40 +08:00
7f5940ac01
VRFS-1739 API for RSVP slots
2014-05-21 01:36:32 -04:00
f793b14879
VRFS-1738 more RSVP API work
2014-05-21 00:57:32 -04:00
22f4d0ffc5
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-20 21:26:55 +08:00
cebbd869cb
VRFS-1675 add join session feature
2014-05-20 21:26:32 +08:00
96f62b1364
VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work
2014-05-20 02:45:00 -04:00
Seth Call
d11261c5c6
* VRFS-1730 - websocket on web layout
2014-05-20 00:33:43 -04:00
d665a09080
scheduled session rsvp wip
2014-05-20 00:31:26 -04:00
Seth Call
1f86b809ff
* VRFS-1730 - websocket on web layout
2014-05-19 16:57:08 -05:00
cdc9d121cb
VRFS-1674 Create Session API
2014-05-19 23:35:38 +08:00
dce007a13d
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
2014-05-18 22:31:25 -04:00
8fc30baf42
VRFS-1668 more notification work
2014-05-18 00:09:21 -04:00
Seth Call
244f79eefb
* merging develop into feature/scheduled_sessions
2014-05-07 15:04:41 -05:00
Seth Call
5f1ea4c754
* merging manifest
2014-05-07 05:17:17 -05:00
Seth Call
7dd1e6c464
* renaming of tables in
2014-05-06 17:50:41 -05:00
Seth Call
732fd66f0e
* all tests pass; but need to now rename music session tables to match class names...
2014-05-06 16:17:26 -05:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
7d3ac6fc54
VRFS-1503 implement session chat feature
2014-05-03 00:33:27 +08:00
bf04fca205
VRFS-1503 implement session chat feature
2014-05-03 00:30:56 +08: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
b1be072c6c
VRFS-1577 VRFS-736
2014-05-01 01:48:57 +00: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
968dff2829
VRFS-1577 VRFS-736
2014-04-30 16:44:37 +00:00
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
Seth Call
00a6139cd1
* merged
2014-04-29 14:04:26 +00:00
Seth Call
26dc80436c
* merging build script
2014-04-24 18:07:52 +00:00
Seth Call
f9e035e621
* adding db 1/0 to test mode
2014-04-23 21:52:35 +00:00
Seth Call
29dfba8276
* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643
2014-04-23 15:08:19 +00:00
3921324b32
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:34:59 +02:00
07e141cc8f
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:27:49 +02:00
7b2d124b33
VRFS-1576 affiliate report view integration
2014-04-23 06:38:49 +00:00
Seth Call
0a811a147c
* adding bert as a dev user
2014-04-16 17:13:55 +00:00
Seth Call
83038cf315
* tweak hover code
2014-04-11 14:45:54 +00:00
Seth Call
cc7bbf3f6a
* resolved merge
2014-04-09 18:31:40 +01:00
Seth Call
95f1a59851
* VRFS-1404 reconnect with tests
2014-04-09 18:25:52 +01:00
Seth Call
79c243a20b
* automatic reconnect dialog will guide user without having to click - VRFS-1404
2014-04-07 17:36:08 +01:00
880027a87f
VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog
2014-04-07 07:54:17 +00:00
15090e3c70
VRFS-1483 error collector; cleanup
2014-04-05 21:25:47 +00: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
90eb0bc081
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-02 00:43:10 +01:00
Seth Call
39bd83ae5a
* launch app test
2014-03-28 04:00:57 +00:00
Seth Call
4aece93b87
* run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509
2014-03-21 04:44:34 +00: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
7cdd47ac89
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-20 11:53:35 +00:00
Seth Call
b04c7bcea5
* VRFS-871 - user-to-user messaging complete
2014-03-20 11:53:26 +00:00
22104e3a97
VRFS-1483 undoing accidently checkin of wsg connect params
2014-03-19 16:38:59 +00:00
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00:00
ddabbcecc5
fix countries to use labels for users, bands, and new signups
2014-03-17 22:20:41 -05:00
Seth Call
9324725e3c
* VRFS-1451 - fix broken signup link when clicked more than once
2014-03-15 01:25:37 +00:00
Seth Call
164a4fdbe1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 07:41:18 +00:00
Seth Call
c9438fcf99
* feed shows items. no scrolling, no support for query modification yet
2014-03-11 06:09:44 +00:00
20ad17608e
stub press release link correctly
2014-03-10 23:40:14 -04:00
Seth Call
7df02c0778
* merging manifest
2014-03-10 07:13:01 +00:00
b13dcef4f1
VRFS-1399 media center content
2014-03-10 01:41:06 -04:00
Seth Call
3c5a14312a
* Event page 'chrome' is setup and pulling from database--now to add band logic
2014-03-09 22:58:57 +00:00
Seth Call
5a8c3886fd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 18:05:39 +00:00
Seth Call
000dd3fdd0
* VRFS-1253 - working in a basic sense with pagination
2014-03-09 18:04:56 +00:00
713344a7a7
merge conflict
2014-03-08 20:50:51 +00:00
Seth Call
8d0faa9b81
* adding test method to check 'local' behavior
2014-03-07 20:52:00 -06: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
eb98b97cd5
merge conflict
2014-03-07 06:53:35 +00:00
46b0832cd8
VRFS-1333 play tracking
2014-03-07 06:46:07 +00:00
65b0c7115a
first take on api_music_sessions_controller#index replacement, nindex.
2014-03-05 20:30:40 -06:00
Seth Call
5f67ad3290
* make rabbitmq_host and rabbitmq_port configurable for websocket-gateway
2014-03-04 15:51:49 -06:00
Seth Call
3afdd55a15
* fix IE auth issues (and other browsers)... chehck if session is over between every retry play attempt
2014-03-04 11:56:42 -06:00
Seth Call
7d0ca26bda
* restrict not null
2014-03-04 11:06:53 -06:00
0f9603f0e8
VRFS-1232 added testimonials
2014-03-04 01:44:32 -05: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
aaef11add4
* VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only
2014-02-27 18:38:02 +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
e4718652fd
* merging
2014-02-24 16:57:01 +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
ccee2e15b3
VRFS-1210 VRFS-1212 VRFS-1223 bug fixes
2014-02-24 01:10:09 -05:00
Seth Call
a42d750b30
* VRFS-468 - hiding any pages not needed for production appropriately
2014-02-22 07:46:41 +00:00
9d5958175b
* merged
2014-02-20 20:40:22 -06:00
451976aabd
integrate scoring stubs work, worklist, and record
2014-02-20 20:30:40 -06:00
Seth Call
f3c09f65c2
* allowing tests to be skipped, and mostly done with VRFS-1200
2014-02-20 22:23:44 +00:00
Seth Call
aab902e8cf
* VRFS-1160 - favorites REST API done
2014-02-20 20:54:35 +00:00
b281349bec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 09:11:44 -06:00
d831cae7c7
VRFS-1193 fixed landing page promo buzz image display
2014-02-20 09:07:59 -06:00
Seth Call
857dd27404
* VRFS-1191, VRFS-1120, VRFS-1079, VRFS-1087, VRFS-1190, VRFS-1192--many band page changes, fixes. small fix for notification icons showing orange circle if icon_url not specified
2014-02-19 22:56:13 +00:00
Seth Call
0218ca5ad6
* urls fixed for VRFS-1148
2014-02-17 19:12:52 +00:00
83f347e84c
merge like/follow refactor and hover bubble work
2014-02-16 16:03:32 -05:00
a1828cd93d
trying to fix tests
2014-02-16 13:06:36 -05:00
36287d0b5f
VRFS-1028 hover bubble / like and follow refactor
2014-02-16 02:28:35 -05:00
c173582aa3
more work on like/follow refactor
2014-02-15 20:24:51 -05:00
Seth Call
26a8b8013d
* VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20
2014-02-15 21:19:03 +00:00
5a03ec87ae
follow/like refactor to use polymorphic associations
2014-02-15 11:55:01 -05:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +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
12d294f62f
* fix typo in production config
2014-02-07 22:26:27 +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
1c6c1da027
* fixing associations
2014-02-06 21:41:35 +00:00
Seth Call
9598c06e1f
* moved shareable_resolver into new controller, and made tests
2014-02-06 21:02:04 +00:00
Seth Call
4c39e45708
* merged
2014-02-06 16:35:33 +00:00
Seth Call
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
bc305cac5e
VRFS-1020 fix share token design
2014-02-06 00:45:48 -05: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
d82b0b6fd9
* VRFS-1026 - putting user dropdown back to where it belonged
2014-02-04 02:45:52 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
Seth Call
b256182cc6
* VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1
2014-02-02 13:34:53 -06: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
a05a85aad7
* revert new welcome as root until can fix all the tests
2014-02-01 20:48:19 +00:00
177220bae8
VRFS-1047 Implement the new landing page.
...
Setup core layout.
2014-02-01 14:26:16 -05: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
3517cf048b
* re-establish pg connection before/after fork
2014-01-31 12:37:43 -06:00
edebf42e73
VRFS-1020 share dialog work
2014-01-31 01:39:09 -05:00
Seth Call
6ccfc4cc08
* VRFS-1010 possibly done
2014-01-30 15:51:05 -06:00
Seth Call
3d453468f2
* adding ability to run everything within jam-web for jobs
2014-01-29 13:24:34 -06:00
Seth Call
38a8ca08bc
* renabling logging
2014-01-29 10:59:14 -06:00
998ebfdc6c
VRFS-986 landing page sidebar complete / session landing fixes
2014-01-26 16:46:41 -05:00
Seth Call
576e8deeee
* fixing recursion bug in eventmachine.rb
2014-01-26 19:51:56 +00:00
Seth Call
d23ca37a82
* fix for VRFS-1023; bugsnag preventing rails from starting
2014-01-25 21:07:39 -06:00
Seth Call
a26b93a54b
* adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start
2014-01-25 17:48:17 -06:00
Seth Call
d93d27db52
* trying to disable testsgg
2014-01-25 16:48:24 -06:00
Seth Call
e63e718091
* merged
2014-01-25 14:19:12 -06:00
Seth Call
96768b7979
* VRFS-1022 finished
2014-01-25 14:03:14 -06:00
d6a38f6bee
VRFS-986 bug fixes
2014-01-23 21:43:49 -05:00
30b13ed538
merge develop
2014-01-22 21:21:40 -05: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
aa056d53fd
VRFS-986 recent history sidebar for landing pages
2014-01-21 01:45:51 -05: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
6d482a034d
VRFS-986 more landing page work
2014-01-16 02:50:13 -05:00
Seth Call
01e50b45b3
* fixes for EventMachine initialization to work in ruby-only context (without web)
2014-01-16 02:21:28 +00:00
Seth Call
63d6f428b3
* VRFS-997 - mix notifications
2014-01-15 22:15:33 +00:00
Seth Call
1f37b9881f
* parameterizing email configs and trying to speed up build on server
2014-01-14 16:55:34 -06:00
59f6e10e55
VRFS-986 recording landing page work
2014-01-14 02:49:21 -05:00
Seth Call
59c1b02e1c
* comment in god file about pending removal
2014-01-13 22:53:37 +00:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
Seth Call
50595d155c
* VRFS-801 - closer to all fixes required for mixing
2014-01-13 13:44:28 +00:00
6d42e42c18
VRFS-987 backend support for session/recording likes, plays, and comments
2014-01-12 12:51:06 -05:00
Seth Call
26f751cdc4
* sending 'downloadavailable' messages when mix becomes available
2014-01-11 05:34:26 +00: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
9ed2210500
websock set timeout on development build
2014-01-08 22:42:10 +00:00
Seth Call
ba3b9ab873
* VRFS-946 - in-session recording
2014-01-05 03:47:23 +00:00
Seth Call
ab70d15eaf
* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)
2013-12-30 18:34:15 +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
267664d2bf
* adding in updated jnlp files
2013-12-17 23:55:10 +00:00
Seth Call
d97a960a0e
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:21 +00:00
836e786ebf
Correcting staging cloudfront distribution with correct s3 bucket
2013-12-16 07:51:46 -06:00
f10d43e41f
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-15 20:08:59 -06:00
d310484c3b
VRFS-719 fixing error case where path is incorrectly built
2013-12-15 20:01:13 -06:00
5b5aef15c8
VRFS-877 band photo work
2013-12-15 16:27:11 -05:00
b5efad954d
Adding prd and dev cloudfront hosts
2013-12-14 13:07:38 -06:00
fa8df410da
VRFS-719 Added code to force downloads through cloudfront
2013-12-12 20:47:20 -06:00
833eb45379
VRFS-878 use IP address to default location for band setup
2013-12-08 22:31:49 -05:00
Seth Call
4f97753f47
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-05 11:16:26 +00:00
Seth Call
73087f0f7a
* recordings manager - changes to download/upload REST APIs - VRFS-821
2013-12-05 11:16:21 +00:00
4824ca4eb3
VRFS-689 show pending band invitations on Band Profile Members tab
2013-12-01 01:11:23 -05:00
c3d49de7f1
vrfs-868: added auth_action route to enable GET-based actions requiring authentication
2013-11-28 06:15:22 -06:00
7aeb182f1f
VRFS-866 band invitations / notifications
2013-11-26 02:47:56 -05:00
Seth Call
95bc077634
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
2013-11-16 14:05:23 +00:00
Seth Call
9805775496
* VRFS-813 - done for this feature
2013-11-16 04:35:40 +00:00
2783336e65
vrfs-774: changed city for Kolyer to Austin
2013-11-15 13:53:34 -06:00
462e4034ec
vrfs-774: changed Montana to MT for geocoding
2013-11-04 01:45:19 -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
24286b621e
* VRFS-772; the client launches but it doesn't do or say anything. I don't think it's due to web problems, thoug
2013-10-15 13:57:15 +00:00
Seth Call
e0a00e9fda
* VRFS-772; partly done; I need to switch to mac to test
2013-10-16 06:22:33 -05:00
6dd0df75d9
VRFS-758 join request notification logic
2013-10-16 03:23:43 -04: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
562b93ff4b
* adding chris as a devuser
2013-10-01 12:04:17 +00:00
Seth Call
f38ca2721a
* VRFS-734 - adding all user progression tracking that is possible currently
2013-09-30 02:37:22 +00:00
Seth Call
b8eefb717c
* add george as a dev user
2013-09-27 11:51:50 +00:00
Seth Call
34ccc3a540
* adding helper scripts
2013-09-25 15:34:53 +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
e3f4146131
* VRFS-702 - adding a simple 'does this page load at all' to each corp page
2013-09-22 02:33:00 +00:00
Seth Call
022085c8c8
* VRFS-699 bugsnag added to javascript
2013-09-22 01:25:20 +00:00
Seth Call
ba0e600293
* VRFS-699; adding bugsnag to websocket-gateway as well, and hook up EventMachine errors in jam-web
2013-09-21 20:43:40 +00:00
Seth Call
11728893a3
* adding bugsnag initializer
2013-09-21 20:14:16 +00:00
Seth Call
03acb21428
* VRFS-696 - support new callbacks to update UI as application updates. also suppress websocket-connection popup if updating
2013-09-20 03:02:32 +00:00
Seth Call
a2ab44648b
* VRFS-694 adding newrelic to rails
2013-09-18 20:14:37 +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
Seth Call
Jonathan Kolyer
Brian Smith
Steven Miers
Bert Owen
Scott Comer
Daniel Weigh
jam
Chris Doughty