Brian Smith
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Brian Smith
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
Jonathan Kolyer
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
Jonathan Kolyer
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
Jonathan Kolyer
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
Brian Smith
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
Brian Smith
a778eaef28
VRFS-2695 wip get user profile API
2015-02-13 22:45:19 -05:00
Brian Smith
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
Steven Miers
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
Jonathan Kolyer
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
Brian Smith
9ede0912a1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-07 23:22:48 -05:00
Jonathan Kolyer
ed47441f67
VRFS-2698 refactoring website_validate to url_validate
2015-02-06 07:43:24 +00:00
Brian Smith
3cdcadda94
merge develop
2015-02-03 23:39:21 -05:00
Brian Smith
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05:00
Jonathan Kolyer
fdcc77ae80
VRFS-2697 url format and site validation
2015-01-31 08:41:56 +00:00
Jonathan Kolyer
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
Steven Miers
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
Steven Miers
3fb45c0dd0
VRFS-2499 - Incremental, nearly done.
2015-01-15 20:28:34 -06:00
Steven Miers
4f94444429
VRFS-2498, VRFS-2618 : API, routes and specs for backing tracks/metronomes.
2015-01-13 10:15:46 -06:00
Brian Smith
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
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
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
Steven Miers
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
Steven Miers
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
Jonathan Kolyer
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
Steven Miers
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
Steven Miers
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
Steven Miers
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06:00
Steven Miers
2d3bbd2a47
VRFS-2480 : Recurly specs, fixes and new implementation.
2014-11-16 20:20:54 -06:00