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,822 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

186 Commits

Author SHA1 Message Date
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
Brian Smith 54d0f36319 VRFS-2465 use new table for text messages 2015-01-12 22:37:07 -05: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 cc3bf2ce1f * wip 2015-01-08 20:35:39 -06:00
Steven Miers 81ad2c89b5 VRFS-2610 : Fix bad API call that was throwing exception in console. 2015-01-07 11:27:21 -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 01808e6dac * VRFS-2523 - broadcast fixes 2014-12-18 15:14:23 -06:00
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Jonathan Kolyer e834a1dfd6 VRFS-1442 refresh session band list each time entering step3 2014-12-03 08:22:35 +00: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 b35f3ef9ef Fix fat finger. 2014-11-24 15:05:38 -06:00
Steven Miers 7f88a7550c VRFS-2480 : Incremental 2014-11-17 21:24:39 -06: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
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
Jonathan Kolyer b9b1fbb313 VRFS-2232 VRFS-2233 handle notification files so they only can be viewed if can_join?; otherwise throw 403 and handle appropriately 2014-10-22 07:01:11 +00:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Brian Smith 6442674c91 VRFS-2216 fix tests; include pending RSVPs and invites for session details screen 2014-09-28 22:37:52 -04:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Seth Call 35dd53469d * VRFS-2164 - fix for missing tracks on record 2014-09-14 21:55:43 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Brian Smith cb7b42e761 fix issues 2014-09-07 17:42:31 -04:00
Brian Smith 74763d53f3 VRFS-2094 fixed issue with notation file upload and tying it to music session; still need to fix download issue 2014-09-06 03:30:29 -04:00
Seth Call 6a01a1c2d6 * VRFS-2076, VRFS-2071 - musicians only listed once, and added spinner to find musician page 2014-08-21 14:58:14 -05:00
Brian Smith 25e3f23dcf VRFS-1891 VRFS-2022 bug fixes / test additions 2014-08-15 00:32:45 -04:00
Seth Call 8966a3fc2f * VRFS-1992 - check open_rsvps for daily session email, VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 - only send update rsvp notification if scheduled start time changes 2014-07-30 15:11:03 -05:00
Seth Call b590548af5 * VRFS-1937 - centered text now left aligned on cerate session screen for scheduled sessions 2014-07-23 16:30:42 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Bert Owen 2bad833e58 fix session detail spec, fix session detail approve/cancel rsvp request actions 2014-07-08 17:47:46 +02:00
Bert Owen 421d183ba3 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-02 15:57:55 +02:00
Bert Owen 2ced001f77 add account scheduled session properties page, add spec, fix detail page, create session flow 2014-07-02 15:57:18 +02:00
Brian Smith 98febc2b4f VRFS-1729 expose new JS function 2014-06-29 20:10:00 -04:00
Brian Smith bf6bf3ac98 VRFS-1729 added JS function to support RSVP approve/decline on Session Details screen 2014-06-29 17:35:18 -04:00
Bert Owen 156095f3c8 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-06-29 15:55:18 +02:00
Bert Owen 07d96d7a57 VRFS-1667, VRFS-1729 implemented account session page, session detail page 2014-06-29 15:54:51 +02:00
Seth Call 865b488f93 * VRFS-304 - user history (feed) tab 2014-06-27 14:17:56 -05:00
Brian Smith cfb65548da fix test 2014-06-26 07:49:49 -04:00
Brian Smith 8e335e28ca VRFS-1669 VRFS-1672 bug fixes 2014-06-25 22:20:32 -04:00
Seth Call 6d84241cae * merged 2014-06-23 22:28:23 -05:00
Seth Call 5750584769 * VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works 2014-06-23 22:26:27 -05:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Brian Smith bc47a0a599 VRFS-1669 find session wip 2014-06-21 16:16:39 -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
Brian Smith b4151c27e9 VRFS-1669 VRFS-1672 session settings dialog / find session work 2014-06-19 00:21:34 -04:00
Bert Owen aca8b86316 add session cancel feature 2014-06-18 04:57:48 +08:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -04:00
Bert Owen 3ed14be60f finish basic create session flow 2014-06-10 06:13:54 +08: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
Bert Owen 60a004a252 integrating api, (without music_notations, start scheduled information) 2014-06-05 03:19:45 +08:00
Bert Owen e49c98c659 Merge branch 'feature/scheduled_sessions' into feature/create_session_flow 2014-06-02 02:57:15 +08:00
Bert Owen cb6742d06b Create session flow (ui completed...) 2014-06-02 02:45:17 +08:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Seth Call fcc7130536 * wip 2014-05-29 14:44:37 -05:00
Seth Call ebe1278e5e * wip 2014-05-29 14:32:46 -05:00
Brian Smith f1229f6842 VRFS-1746 RSVP cancel dialog work 2014-05-29 02:33:37 -04:00
Brian Smith 4d63dad502 VRFS-1671 RSVP submit dialog 2014-05-28 23:43:57 -04:00
Brian Smith fea728923f VRFS-1671 RSVP submit dialog work 2014-05-28 01:14:14 -04:00
Brian Smith f31248815d VRFS-1670 session info page work 2014-05-26 23:52:59 -04:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Brian Smith 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 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 f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Bert Owen bf04fca205 VRFS-1503 implement session chat feature 2014-05-03 00:30:56 +08:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Bert Owen 07e141cc8f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:49 +02:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +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
Scott Comer ddabbcecc5 fix countries to use labels for users, bands, and new signups 2014-03-17 22:20:41 -05:00
Seth Call c9438fcf99 * feed shows items. no scrolling, no support for query modification yet 2014-03-11 06:09:44 +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
Jonathan Kolyer 5abc877a38 VRFS-709 added calls to GA record/session tracking 2014-03-09 01:16:39 +00:00
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +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
Jonathan Kolyer 38bde04ec7 VRFS-1333 play tracking 2014-03-07 07:35:10 +00:00
Jonathan Kolyer eb98b97cd5 merge conflict 2014-03-07 06:53:35 +00:00
Jonathan Kolyer 46b0832cd8 VRFS-1333 play tracking 2014-03-07 06:46:07 +00:00
Seth Call 1c2585ba92 * VRFS-1047 mosttly done, aside from jamfet link 2014-03-05 17:18:53 -06:00
Brian Smith 6d277f6597 fix bug retrieving band followers 2014-03-04 22:32:04 -05:00
Brian Smith 64824d3587 VRFS-614 remove remaining async=false lines 2014-03-04 22:12:44 -05:00
Seth Call 725460176a * VRFS-792 - also guard against direct session link joins with no ftue 2014-03-01 17:01:45 -06:00
Jonathan Kolyer b4aae340f7 merge conflict 2014-02-28 07:07:26 +00:00
Jonathan Kolyer a1a265f36f VRFS-756 changing email invite posting behavior incrementally 2014-02-25 03:29:03 +00:00
Brian Smith ccee2e15b3 VRFS-1210 VRFS-1212 VRFS-1223 bug fixes 2014-02-24 01:10:09 -05: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 9ca1149daf * fix accidental typo in hover-recording 2014-02-20 20:59:50 +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
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00