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

60 Commits

Author SHA1 Message Date
Seth Call b59126c3a7 switching to https 2015-07-13 14:29:42 -05: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 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
Steven Miers bbee617c4b VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec. 2014-12-22 14:23:05 -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 df9352d608 One more merge artifact. 2014-11-03 18:38:06 -06:00
Steven Miers fe9bd594b4 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:25:33 -06:00
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06:00
Steven Miers 0f1c436f60 Merge 2014-11-01 10:43:33 -05:00
Seth Call 149967f877 * VRFS-2375 - share button works now in master mix complete msg 2014-10-29 10:27:29 -05:00
Seth Call f4ef6b2360 * websocket-gateway GATEWAY_NAME fixes 2014-09-25 20:40:31 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
root 95dcea9ca7 fixed issue #1632 #1954 2014-07-29 18:15:23 +02:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Brian Smith 95100a1b49 VRFS-1668 added some edge case tests for new notifications (still need sunny day tests) 2014-05-18 14:59:57 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Brian Smith baee1b7506 VRFS-1668 merge with test fixes for notification changes 2014-05-15 01:06:48 -04:00
Seth Call 9ee27a5127 Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic" 
This reverts commit 2302c89154.
 2014-05-13 08:21:32 -05:00
Brian Smith 2302c89154 VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic 2014-05-13 01:22:23 -04:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05: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 53a6941ceb * VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete 
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
 2014-03-27 18:43:15 +00:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Seth Call b04c7bcea5 * VRFS-871 - user-to-user messaging complete 2014-03-20 11:53:26 +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
Brian Smith 49269443da VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type 2014-03-07 00:38:10 -05:00
Brian Smith 1e7352712a fix JoinRequestRejected message definition 2014-03-05 02:01:51 -05:00
Seth Call 7ab7bfd795 * VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state 2014-03-03 16:13:23 -06:00
Brian Smith 83b4260b91 VRFS-759 VRFS-1221 delete session notifications when session ends in db and sidebar, fix listen button for sessions and recordings 2014-02-23 15:47:53 -05:00
Brian Smith e535d0401d VRFS-546 use session settings to preselect band on create session 2014-02-17 22:00:57 -05:00
Seth Call 6806d6f0d3 * VRFS-1016 2014-01-31 14:25:17 -06:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Seth Call 4e05affc77 * disabling audiomixer tests until I figure out why it's failing on audiomixer 2014-01-19 02:56:35 +00: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
Brian Smith cdb47bdd75 fix band_session_join protobuf message 2014-01-18 21:03:15 -05:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Seth Call 59bf00a97e * DownloadAvailable proto msg added to help poke client when downloads become available 2014-01-08 21:24:21 +00:00
Brian Smith fab83707b7 VRFS-933 notification work 2014-01-04 17:02:47 -05:00
Brian Smith a2b34d68dd VRFS-933 notification bug fixes 2014-01-04 12:20:28 -05:00
Brian Smith 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00
Brian Smith 7e78163bb9 VRFS-933 notification work 2013-12-28 23:51:35 -05:00
Brian Smith 75b9b97c60 fix warning related to ruby- prefix in .ruby-version files 2013-12-27 16:28:28 -05:00
Seth Call de4a2c8321 * VRFS-821; sending loggedin/loggedout events to backend from frontend 2013-12-18 17:18:23 +00:00
Brian Smith 7aeb182f1f VRFS-866 band invitations / notifications 2013-11-26 02:47:56 -05:00