948174f19a
VRFS-2701 musical experience bug fix
2015-03-12 21:34:20 -04:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
Seth Call
b46dce5c29
Merge branch 'feature/backing_tracks' into develop
2015-02-16 10:35:46 -06:00
Seth Call
e40c964d97
* merged
2015-02-15 22:15:34 -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
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
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
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
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
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
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06:00
2d3bbd2a47
VRFS-2480 : Recurly specs, fixes and new implementation.
2014-11-16 20:20:54 -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
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
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
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Seth Call
322cdad87d
* wip
2014-08-14 10:09:33 -05:00
Seth Call
4c85740597
* wip
2014-08-13 11:09:52 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05: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
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
Seth Call
05666f7927
wip
2014-05-29 14:34:18 -05: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
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
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
bf04fca205
VRFS-1503 implement session chat feature
2014-05-03 00:30:56 +08:00
b1be072c6c
VRFS-1577 VRFS-736
2014-05-01 01:48:57 +00: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
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
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
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
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
39bd83ae5a
* launch app test
2014-03-28 04:00:57 +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
ddabbcecc5
fix countries to use labels for users, bands, and new signups
2014-03-17 22:20:41 -05: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
8d0faa9b81
* adding test method to check 'local' behavior
2014-03-07 20:52:00 -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
0f9603f0e8
VRFS-1232 added testimonials
2014-03-04 01:44:32 -05: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
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
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
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
d82b0b6fd9
* VRFS-1026 - putting user dropdown back to where it belonged
2014-02-04 02:45:52 +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
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
edebf42e73
VRFS-1020 share dialog work
2014-01-31 01:39:09 -05:00
Seth Call
3d453468f2
* adding ability to run everything within jam-web for jobs
2014-01-29 13:24:34 -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
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
59f6e10e55
VRFS-986 recording landing page work
2014-01-14 02:49:21 -05:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
6d42e42c18
VRFS-987 backend support for session/recording likes, plays, and comments
2014-01-12 12:51:06 -05: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
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
5b5aef15c8
VRFS-877 band photo work
2013-12-15 16:27:11 -05: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
9805775496
* VRFS-813 - done for this feature
2013-11-16 04:35:40 +00: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
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
f38ca2721a
* VRFS-734 - adding all user progression tracking that is possible currently
2013-09-30 02:37:22 +00:00
Seth Call
34ccc3a540
* adding helper scripts
2013-09-25 15:34:53 +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
2f41675471
merging jam-web into web
2013-09-15 18:04:37 +00:00
Brian Smith
Seth Call
Jonathan Kolyer
Steven Miers
Bert Owen
Scott Comer
Daniel Weigh