seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,123 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

113 Commits

Author SHA1 Message Date
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Steven Miers 0907c1acd1 VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate. 2015-02-19 01:06:50 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Seth Call 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Steven Miers d7fc313d5f VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks 2015-01-28 19:22:36 -06:00
Brian Smith 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05: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 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
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Steven Miers ff42a84598 VRFS-2482 : Jam Tracks cleanup and initial spec. 2014-12-15 20:30:46 -06:00
Steven Miers ac2daed4da VRFS-2481 : Jam Tracks python layer and source. 2014-12-15 12:16:19 -06:00
Jonathan Kolyer 9f60327d20 VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile 2014-12-05 07:50:03 +00:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Brian Smith c57ea372ac VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots 2014-10-25 22:23:52 -04: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
Brian Smith d8a8a0d33b remove byebug reference 2014-10-21 19:51:55 -04:00
Jonathan Kolyer af2159fe72 VRFS-1945 added create_type to music_sessions; filtering session search based on create_type 2014-10-21 07:27:26 +00:00
Steven Miers 5691fbc51f Require new scheduled_music_session_cleaner at class level. 
Fixes broken unit test.
 2014-10-14 14:54:18 -05:00
Steven Miers 66feb39de8 VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track. 2014-10-03 14:12:09 -05:00
Steven Miers 5135fe7faf VRFS-2024 - Migration, model and spec for video source. 2014-10-03 13:36:51 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -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
Seth Call 2923969e94 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-11 17:22:01 -05:00
Seth Call 014a423a3d * VRFS-1860 - account screen lists by date; VRFS-1911 partially done (using proper date formatting) 2014-07-11 17:21:55 -05:00
Brian Smith 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
Jonathan Kolyer 0edacbe3e2 merging with develop 2014-05-31 21:07:18 +00:00
Jonathan Kolyer 689e0a8609 VRFS-1664 new musicians emailer 2014-05-31 09:36:10 +00:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Jonathan Kolyer 30037bc967 VRFS-1698 removed sendgrid email error handling 2014-05-31 09:03:18 +00:00
Jonathan Kolyer b8736ff389 VRFS-1698 changed batch sending to one-at-a-time 2014-05-31 07:44:56 +00:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Jonathan Kolyer 243e06533b VRFS-1665 scheduled session impl 2014-05-29 07:19:55 +00:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Bert Owen bc0e3ba0eb VRFS-1681 cleanup unused notation files 2014-05-26 01:30:10 +08:00
Jonathan Kolyer 5f5bcaf04c VRFS-736 updated welcome message; fixed queue loading issue by updating jam_ruby.rb 2014-05-23 04:54:46 +00:00
Brian Smith ca53ee0ead update data model / fix tests 2014-05-19 23:34:56 -04:00
Jonathan Kolyer e44ccc7653 VRFS-736 client_notdl mailer 2014-05-19 15:12:59 +00:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Jonathan Kolyer 6e7562ffc8 VRFS-736 progression emails first pass 2014-05-18 00:12:01 +00:00
Bert Owen 027fd61606 * added recurring_mode to music_session for recurring sessions 2014-05-16 00:19:44 +08:00
Bert Owen 24117c1b67 VRFS-1718 added MusicNotation model, migration 2014-05-15 23:49:06 +08:00