Seth Call
04aa1a9b3c
* wip
2015-03-23 08:52:52 -05:00
3ae34fc426
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:30:08 -04:00
Seth Call
128a8119cf
* VRFS-2942 - show correct instrument and show correct part info
2015-03-20 22:04:03 -05:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
e3d1a80a6f
VRFS-2830 : Mesh out purchased jam tracks view and behavior.
2015-03-20 15:26:06 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
3cb706495e
* wip
2015-03-20 11:25:42 -05:00
Seth Call
6df6165bb7
remove jamblaster notice from site
2015-03-20 09:55:35 -05:00
Seth Call
393f05f9b0
* wip
2015-03-20 09:21:29 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
137c6faedc
* wip
2015-03-17 10:15:00 -05:00
Seth Call
9dd3984d07
* VRFS-2936 - ugly button for Peter testing
2015-03-16 13:36:02 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
07b74cc3e7
VRFS-2823 : Enable proper back button behavior.
2015-03-16 00:29:57 -05:00
e6b09e5728
VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow.
2015-03-15 20:30:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
9a38b63376
VRFS-2823:Update link on landing page to properly set filter parameters.
2015-03-15 18:43:08 -05:00
782357ce4e
VRFS-2823 : Accomplishes a number of items
...
* Ability to set filter settings from URL
* Ability to expand and collapse; hiding the items mentioned in spec.
* Misc styling and code cleanup.
2015-03-15 18:42:22 -05:00
Seth Call
e82da2161d
* VRFS-2927 - mute both master/personal for own tracks
2015-03-14 15:00:11 -05:00
Seth Call
23488f8f7f
* wip
2015-03-14 14:36:34 -05:00
63544de145
VRFS-2822 : Cleanup
2015-03-13 14:45:57 -05:00
40a1ad137d
VRFS-2823 : Convert to coffee and clean up.
2015-03-13 14:45:38 -05:00
Seth Call
b0aac73732
* VRFS-2924 - show visual metronome option
2015-03-13 10:44:24 -05:00
Seth Call
1cd8288cc3
* wip
2015-03-13 10:28:27 -05:00
Seth Call
1b36fb812f
wip
2015-03-13 09:12:33 -05:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
Seth Call
a1c929aeb1
* wip
2015-03-12 18:15:32 -05:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
Seth Call
d6df68a8ff
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:53:37 -05:00
Seth Call
477df086b0
Revert "* VRFS-2913 - allow /client to be accessed without being logged in"
...
This reverts commit 0a869e91e3
2015-03-11 16:53:12 -05:00
Seth Call
0a869e91e3
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:44:22 -05:00
fae67907b1
VRFS-2823 : Fix availability filtering
2015-03-11 16:36:42 -05:00
4ebbff42cc
VRFS-2823 : Jam Tracks shopping page updates
...
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
2015-03-11 15:40:12 -05:00
Seth Call
631491c4a2
* VRFS-2829 - signup and downoad page changes for jam tracks release
2015-03-10 10:29:40 -05:00
Seth Call
28ebbe893c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-09 09:49:21 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
fb3ed71957
VRFS-2854 more session widget feed fixes
2015-03-06 23:18:29 -05:00
Seth Call
be97555f1a
* VRFS-2885 - check mixers from both modes
2015-03-05 09:47:33 -06:00
6fa59bf76f
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:18:05 -05:00
c8059e9c00
VRFS-2822 : Create a jam track landing page, a coffee script to control it, and styles.
...
Link from main client view. Link TO current (browse) page.
2015-03-03 23:14:24 -06:00
Seth Call
aba4546e44
Squashed commit of the following:
...
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
c8ad1d3856
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
2015-03-02 13:30:45 -06:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06: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
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
Seth Call
6b795695ee
* VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need
2015-02-25 16:15:41 -06:00
Seth Call
ca9e3706c7
* wip
2015-02-25 16:13:04 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Seth Call
947d649f5f
* VRFS-2831 - metronome showing
2015-02-24 17:16:12 -06:00
Seth Call
a7824249a8
* VRFS-2826 - fix regression where remote peers couldn't see tracks
2015-02-23 22:29:28 -06:00
Seth Call
c5b77a02fa
* check shopping cart on leave of shopping cart screen
2015-02-23 17:30:06 -06:00
Seth Call
4841e56dce
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:56:21 -06:00
Seth Call
c8752fd830
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:55:19 -06:00
Seth Call
0795791909
* move displayCartIcon method to init logic
2015-02-23 16:03:44 -06:00
Seth Call
78ed25ea82
* actually init the shopping cart
2015-02-23 16:00:30 -06:00
Seth Call
be4627d51f
* move around shopping cart init
2015-02-23 15:55:02 -06:00
Seth Call
d89e2f8e56
* VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix
2015-02-23 15:00:57 -06:00
Seth Call
ae920c5a1a
* stop play issued before close of backing track
2015-02-23 10:56:22 -06:00
Seth Call
1dbfdf0546
* VRFS-2811 - read loop state when drawing track
2015-02-23 10:45:10 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
dcf3706099
VRFS-2798 : Hide/show shopping cart icon depending on contents.
2015-02-20 17:53:18 -06:00
Seth Call
0472d6bc79
* VRFS-2686 - jamtrack sliders work
2015-02-20 11:55:49 -06:00
Seth Call
ea482da0dc
* VRFS-2808 - prevent duplicate attempt to open recording
2015-02-20 10:01:11 -06:00
Seth Call
9d70400e91
* VRFS-2806 - disallow concurrent open of dialog
2015-02-20 09:50:03 -06:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
2b227912cb
* take out hard-coded jamtrack id
2015-02-19 11:29:13 -06:00
Seth Call
85ffa2ec21
* VRFS-2802 - moving media files mixers in personal mode actually affect master mode now
2015-02-19 09:31:30 -06:00
Seth Call
23c7307c6f
* VRFS-2796 - hide X for non openers
2015-02-18 15:41:51 -06:00
Seth Call
b09825d188
* VRFS-2791 - unique-ify recorded backing track and backing track IDs
2015-02-18 10:16:47 -06:00
Seth Call
bf0f1345ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-18 03:44:38 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
232873819e
VRFS-2700 cleaned up broken tests
2015-02-18 06:33:06 +00:00
Seth Call
6d839f8efa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-17 09:45:44 -06:00
Seth Call
2b7ebe1ce1
* use preview recording
2015-02-17 09:45:18 -06:00
Seth Call
b46dce5c29
Merge branch 'feature/backing_tracks' into develop
2015-02-16 10:35:46 -06:00
Seth Call
bfc03fba48
* VRFS-2780 - finish styling loop checkbox
2015-02-16 10:32:23 -06:00
Seth Call
bdc1b898b4
* VRFS-2780 - styling complete; needs testing
2015-02-15 22:15:41 -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
Seth Call
503e46ed74
*wip
2015-02-15 21:52:28 -06:00
Seth Call
c4c05c67d6
* working on sync rework VRFS-2661
2015-02-15 21:52:28 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
c44c94671a
VRFS-2700 refactored attemptAdd
2015-02-16 01:59:16 +00:00
366ba06e89
VRFS-1845 : Webcam settings included in account page. Script uses same WebcamViewer object as the flue.
2015-02-15 19:28:13 -06:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
a35874fa23
VRFS-1844 : Video gear - refactor to allow for non-embedded webcam preview. Add reusable view to a _webcam partial and reference where necessary.
2015-02-15 16:23:47 -06:00
8a737b3556
VRFS-2473 : Add metronome feature tests.
2015-02-15 14:44:38 -06:00
c52c429e96
VRFS-2473 : Check ntp clock stability of all session participants before opening metronome.
2015-02-15 14:00:36 -06:00
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
708e842bcc
VRFS-2700 refactored url site test; added deferred state() test
2015-02-15 13:31:45 +00:00
f533e4273d
VRFS-2700 url site type tests with ajax mock
2015-02-15 12:51:16 +00:00
78321ce374
VRFS-2700 added state deferred call; RecordingSource subclass
2015-02-15 12:27:48 +00:00
4aa845cfc8
VRFS-2700 fixed spec stylesheet fixture loading within teaspoon; minor refactoring in site_validator.js
2015-02-15 07:50:04 +00:00
bbce83984b
VRFS-2498 : Fix spec.
2015-02-13 11:36:03 -06:00
Seth Call
6007033a15
* explain comment out
2015-02-13 00:00:45 -06:00
Seth Call
72de73f1f9
* remove double-init of external links
2015-02-12 22:25:46 -06:00
b7b401cf59
VRFS-2498 : Add metronome callback to fake client for tests.
2015-02-12 18:51:07 -06:00
064b553e31
VRFS-1845 : Add video account section.
2015-02-12 14:33:34 -06:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
81dcd9bddc
VRFS-2498 : Hook up new metronome sounds. Check group_id in lieu of media_type as it is not set for metronomes.
2015-02-12 14:05:25 -06:00
889de25a9f
VRFS-2700 fixed error detection for recording sources
2015-02-12 08:31:37 +00:00
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
1081efffdd
VRFS-1844 : A webcam component to initialize, and manage the state of, the webcam setup pane. Since this is accessed in several places, this javascript needed generifying.
2015-02-11 11:10:25 -06:00
72477e0840
VRFS-2698 tweaking teaspoon tests
2015-02-10 07:15:56 +00:00
463e7d3bbd
VRFS-2698 fixed error in renderErrors
2015-02-10 05:47:07 +00:00
febca766e7
VRFS-2698 fixture loading
2015-02-10 05:26:56 +00:00
17b4b1aeca
VRFS-1844 : Fake jam client calls for video APIS to enable faster iterations
2015-02-09 09:43:23 -06:00
f3bae8a97b
VRFS-1967 - clear up error message to assist user
2015-02-08 21:15:20 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
9f27ef8429
VRFS-2698 renamed url_validator to site_validator
2015-02-06 07:43:24 +00:00
1d42b7b662
VRFS-2698 refactoring validator interface
2015-02-06 07:43:24 +00:00
d52f5b2372
VRFS-2698 repurposed urls into usernames
2015-02-06 07:43:24 +00:00
ed47441f67
VRFS-2698 refactoring website_validate to url_validate
2015-02-06 07:43:24 +00:00
e8375b920e
VRFS-1844 : Logic and UI to insert video page on gear wizard - Incremental.
2015-02-04 13:00:19 -06:00
Seth Call
a0e486aed7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-03 09:49:34 -06:00
Seth Call
768c9e2024
VRFS-2739 - remove aggressive check for bad session info and add some basic tests to catch errors in the future
2015-02-03 09:49:19 -06:00
f0f130caae
Merge branch 'develop' into VRFS-2697
2015-02-03 06:39:12 +00:00
75b8be7a85
VRFS-2697 spec tests
2015-02-02 07:45:52 +00:00
e7bb30f730
Merge branch 'develop' into VRFS-2697
2015-02-02 05:44:42 +00:00
e516983aa5
VRFS-1985 detect browser / invalid config when starting a session from the future sessions section
2015-02-01 19:14:39 -05:00
eff19235c3
VRFS-2730 : Hook up jamtrack looping.
2015-02-01 17:59:43 -06:00
a10078260a
VRFS-2722 : Styling and logic necessary to display long labels on backing and other tracks.
2015-02-01 17:59:43 -06:00
e12cbe783c
VRFS-2717 : Show type (extension) and file length in MB.
2015-02-01 17:59:43 -06:00
Seth Call
e9d2df58df
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:37 -06:00
Seth Call
8234c4c510
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:17 -06:00
082edc7075
VRFS-2697 css styling
2015-02-01 03:43:58 +00:00
d8c000c7f7
VRFS-2716 : Compare proper string for backing track type. Change a few client calls to correct function names.
2015-01-31 17:57:54 -06:00
Seth Call
cb63439219
* VRFS-2716 - reference to .path in SessionOpenBackingTrack changed to .name
2015-01-31 15:28:53 -06:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
9e777a84aa
VRFS-2697 display errors from server-side site check
2015-01-31 18:45:10 +00:00
9086fac76a
VRFS-2697 enhanced error handling; crop url length
2015-01-31 18:07:51 +00:00
abb5c3afb2
VRFS-2697 fixed js typo
2015-01-31 08:59:25 +00:00
fdcc77ae80
VRFS-2697 url format and site validation
2015-01-31 08:41:56 +00:00
6069399a55
VRFS-2697 initial url validation
2015-01-31 05:22:58 +00:00
16092ba816
VRFS-2697 website validator initial commit
2015-01-31 04:50:05 +00:00
a4d8ea5f60
VRFS-2498 : Fix tempo and sound strings for initial metronome opening.
2015-01-29 16:12:26 -06:00
d9d3e67fc5
VRFS-2582 : Hook up to client rather than stubbed API to list backing tracks. Implement in fakeJamClient for easy testing.
2015-01-29 16:11:57 -06:00
Seth Call
3496aa999f
* wip
2015-01-29 14:17:55 -06:00
Seth Call
6de64a1005
Merge branch 'develop' into feature/session_jamtracks
2015-01-26 21:22:59 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -06:00
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
8556aaac13
* make dynamic registrations confgurable, in case server crashes again: VRFS-2645
2015-01-23 16:51:59 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
Seth Call
7844f2ffad
* wip
2015-01-23 13:55:15 -06:00
Seth Call
372444ebd1
* wip
2015-01-23 10:50:58 -06:00
3f2be132bd
VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions
2015-01-21 22:40:31 -05:00
0d9bd33eb7
Clean up and adjust session UI to display metronome tempos and click sound. Update client.
...
Style updates to fit selects and default to 120 bpm.
2015-01-21 20:16:52 -06:00
Seth Call
698f4ba648
* wip
2015-01-21 15:22:31 -06:00
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -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
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
f8b3d8cc7d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-19 10:25:53 -06:00
Seth Call
6880aec9ef
* VRFS-2658 - adding commints
2015-01-19 10:24:23 -06:00
Seth Call
48b2f5b965
* add value = 1 to series
2015-01-19 10:24:18 -06:00
Seth Call
8a6a9b224b
* VRFS-2658 - track if audio was established
2015-01-19 10:24:11 -06:00
5f9f8a0cdd
Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test.
2015-01-16 18:00:44 -06:00
3fb45c0dd0
VRFS-2499 - Incremental, nearly done.
2015-01-15 20:28:34 -06:00
2017fed9ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 22:37:28 -05:00
54d0f36319
VRFS-2465 use new table for text messages
2015-01-12 22:37:07 -05:00
Seth Call
5f9986b30e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 13:40:38 -06:00
Seth Call
9718cc7cca
* remove dynamic registration code
2015-01-12 13:37:50 -06:00
825a293c30
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 02:08:09 -05:00
73e8f9ac6f
VRFS-2465 wip text message changes
2015-01-12 01:26:27 -05:00
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
edbd28d357
* remove extra close bracket in listen link fi
2015-01-11 20:46:45 -06:00
Seth Call
46ae56e7e8
* fix listen link
2015-01-11 20:43:15 -06:00
a07728ffa3
Merge branch 'feature/find_session_start_session' into develop
2015-01-11 21:22:59 -05:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
50ede5bd9e
VRFS-1985 VRFS-2252 allow only session creator to start session with TBD date/time
2015-01-10 15:09:06 -05:00
Seth Call
5ac69fc646
* wip
2015-01-09 16:11:04 -06:00
Seth Call
72ef14a87d
* remove spurious log
2015-01-09 15:20:32 -06:00
Seth Call
0ab7686205
* VRFS-2484 - wip pausing point; the code should not affect stability because it's mostly jamtrack only related
2015-01-09 15:15:12 -06:00
34d7985762
VRFS-2498, VRFS-2499 : Incremental
2015-01-09 02:47:46 -06:00
aeabfcafc8
VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time
2015-01-09 03:08:03 -05:00
9643fe1187
fixed javascript error on session detail screen
2015-01-09 02:38:38 -05:00
47293afee4
VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen
2015-01-09 02:10:44 -05:00
Seth Call
cc3bf2ce1f
* wip
2015-01-08 20:35:39 -06:00
79eec652d1
VRFS-1985 wip start session from Find Session screen
2015-01-07 23:18:07 -05:00
81ad2c89b5
VRFS-2610 : Fix bad API call that was throwing exception in console.
2015-01-07 11:27:21 -06:00
Seth Call
af83a4f6a1
* VRFS-2608 - refactor and slight cleanup of UI towards new spec
2015-01-06 16:51:19 -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
5f14f73322
* some more fixes for broadcasting - VRFS-2523
2015-01-02 15:29:31 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
Seth Call
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -06:00
Seth Call
83396675e6
* remove a diagnostic from javascript
2014-12-31 20:44:51 -06:00
Seth Call
71399dcaa7
* fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting
2014-12-31 20:39:22 -06:00
Seth Call
ed15eef3ac
* I'm not sure how I typo'ed this...
2014-12-30 21:06:56 -06:00
Seth Call
a3f40b2f99
* fix typo in write_point /write VRFS-2569
2014-12-30 17:15:28 -06:00
Seth Call
6058b1770a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-30 17:12:44 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
a402e31633
VRFS-2102 dedup instruments for in session users
2014-12-28 00:19:25 -05:00
9eb6870502
VRFS-2359 warn user when starting a TBD session
2014-12-23 01:50:07 -05:00
bbee617c4b
VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec.
2014-12-22 14:23:05 -06:00
Seth Call
9876c00a7a
* VRFS-2456 - add listen function to find session page, and update of join/rsvp icons
2014-12-19 14:00:49 -06:00
Seth Call
08a266a203
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-18 16:08:29 -06:00
Seth Call
Brian Smith
Steven Miers
Jonathan Kolyer
Anthony Davis