e91ee68d58
VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure).
2015-03-09 10:11:47 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
33f10e3197
VRFS-2795 fixing search specs
2015-03-09 06:13:56 +00:00
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +00:00
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00:00
c6497c8457
Kill puts.
2015-03-04 16:31:03 -06:00
003b06cae0
VRFS-2782 : Fix error found by test.
2015-03-04 16:14:26 -06:00
a34031728e
Cleanup
2015-03-04 16:14:01 -06:00
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
2004d48fa1
Merge
2015-03-04 16:03:28 -06:00
12b610d2cb
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-04 02:03:22 -05: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
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
bfd3f3fac6
VRFS-2795 filled out JSON_SCHEMA
2015-02-28 22:45:43 +00:00
171dcb04f0
VRFS-2795 interests filter
2015-02-28 21:18:43 +00:00
88315fcc40
VRFS-2795 instrument and genre filtering tests
2015-02-28 20:37:15 +00:00
d95279e694
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:18:56 +00:00
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
2d8748d4ee
VRFS-2795 iterating on tests
2015-02-28 04:24:53 +00:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
d314c3327c
VRFS-2782 : Fix error found by test.
2015-02-27 11:38:40 -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
2823645a60
Merge with develop & fix manifest.
2015-02-26 17:49:10 -06:00
718e43df5d
Cleanup
2015-02-26 17:43:30 -06:00
030fa1a351
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-02-26 17:43:22 -06:00
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -06:00
0c599ca023
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-25 21:55:57 -05:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
ef287187ba
VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates.
2015-02-25 17:19:03 -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
9c9c01b2fd
VRFS-2785 : Make id fields accessible for admin UI.
2015-02-25 09:41:51 -06:00
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
a2ef5e9859
VRFS-2795 gig and studio tests
2015-02-24 06:06:40 +00:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00:00
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
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
65a8cb5ca4
* VRFS-2800 - cleanup metronome and backing track info on active music session on leave of session
2015-02-18 16:22:24 -06:00
Seth Call
b5a70b8ec1
* skip master track types
2015-02-18 10:33:10 -06:00
Seth Call
04cce7ef98
* skip master track types
2015-02-18 10:27:17 -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
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -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
09b4ed09a4
VRFS-2696 edit musician profile API enhancements
2015-02-15 08:23:26 -05:00
4b97807fc8
fix syntax error
2015-02-14 21:14:13 -05:00
0a1837c4e6
VRFS-2695 VRFS-2696 wip get/update musician profile API changes
2015-02-14 21:02:26 -05:00
28ff54b000
VRFS-2695 wip new profile API
2015-02-13 03:16:48 -05:00
8bd311647a
VRFS-2693 performance model/tests
2015-02-13 01:32:55 -05:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
895fb92365
VRFS-2693 VRFS-2694 performance sample model wip
2015-02-11 22:33:10 -05:00
e3f27eeebc
VRFS-2694 user presence model tests
2015-02-10 02:44:16 -05:00
9ede0912a1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-07 23:22:48 -05:00
Seth Call
3563e6e08a
* VRFS-2747 - incorporating welcome message from David; made headers white
2015-02-06 17:07:18 -06:00
33aef8a380
VRFS-2694 user presence model
2015-02-05 03:34:25 -05:00
05ba1ea5d3
VRFS-2694 wip user presence model and spec
2015-02-03 23:37:20 -05:00
80305c05aa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-02 19:22:33 -05:00
cce2ce2ffc
minor change to ensure current instance session id is used
2015-02-01 17:15:01 -05:00
79507f5f06
VRFS-2693 VRFS-2694 wip new musician profile models and specs
2015-02-01 08:42:44 -05: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
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
5ed67cc8f6
VRFS-2667, VRFS-2668 : Fix broken spec.
2015-01-29 09:50:13 -06:00
f521f3ba4c
VRFS-2689 new ruby models supporting db schema updates
2015-01-29 00:48:24 -05:00
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
63574f5a25
VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests.
2015-01-28 19:22:36 -06:00
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
Seth Call
6de64a1005
Merge branch 'develop' into feature/session_jamtracks
2015-01-26 21:22:59 -06:00
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
65f1f0fe79
* VRFS-2640 - double-check if jobs are concurrent safe
2015-01-23 14:50:09 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -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
c70a5ee2bb
Merge branch 'develop' into feature/backing_tracks
2015-01-21 14:16:04 -06:00
f80b0e4f66
VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions
2015-01-20 02:21:25 -05:00
fe64995f54
Merge branch 'develop' into feature/backing_tracks
2015-01-19 17:10:28 -06:00
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
8f9e49ccf1
* VRFS-2660 - fixing dead links in welcome email and some corp pages
2015-01-19 15:07:52 -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
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -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
c6f03a91b8
VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec.
2015-01-12 17:44:20 -06:00
Seth Call
5b17c50f83
* make reconnect messages warn
2015-01-12 14:10:26 -06:00
babd9d7d90
VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify.
2015-01-12 12:41:44 -06: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
d139966445
VRFS-2643 - run eventmachine in it's own thread
2015-01-11 16:41:49 -06:00
Seth Call
2c8a4b8483
* VRFS-2642 - reconnect at start of each job
2015-01-11 15:43:42 -06:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
d0c0c6d01e
VRFS-2498, VRFS-2499 : Validations.
2015-01-11 14:15:47 -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
b5c446dd04
* VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks
2015-01-08 11:38:46 -06:00
Seth Call
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -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
d58cf2a048
* VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API)
2015-01-07 16:16:57 -06:00
3028e421fb
VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
...
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Seth Call
405c155c71
* VRFS-2606 get offset time into MM:SS:MLS format
2015-01-07 11:07:26 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
67b1132d24
VRFS-2554 fixed notification for scheduled session with TBD date/time
2015-01-06 21:20:41 -05: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
1cb9f47f6c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-06 09:41:53 -06:00
Seth Call
7df0258015
* VRFS-2600 - tracks saved as id.ext to expose metadata
2015-01-06 09:36:05 -06:00
18d06096b5
Revert "Fix spec that was magically passing sporadically."
...
This reverts commit 4cc70f2082
2015-01-05 19:04:08 -06:00
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
eb990dd930
One more foxy
2015-01-05 18:27:14 -06:00
4cc70f2082
Fix spec that was magically passing sporadically.
2015-01-05 17:47:27 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
d677b43c28
* VRFS-2603 private key now stored
2015-01-05 15:19:20 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
abbc01fc44
VRFS-2597 : Fix logging method in cleaner to fix spec.
2015-01-04 16:38:28 -06:00
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
d3b613c2dc
* updating new JamTrack resque jobs for non-forking behavior, log corrections (a bad pattern I started), and extending from Stats-enabled base jobs
2015-01-04 14:18:25 -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
77d62a4744
Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
...
Conflicts:
web/jt_metadata.json
web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -06:00
8eb7430d9a
One more stray puts.
2015-01-03 11:47:28 -06:00
Seth Call
82b7c005ec
* if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591
2015-01-02 11:18:39 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00
Seth Call
0f288539cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-01 14:23:00 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
559d2d720d
VRFS-2552 update query to include users started scheduled sessions not yet finished
2015-01-01 19:29:18 +00: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
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
786486026b
* wip
2014-12-30 17:10:16 -06:00
bb298dd6b9
VRFS-2548 : Config-ize location of jamtracks python tool
2014-12-29 15:05:19 -06:00
bbee617c4b
VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec.
2014-12-22 14:23:05 -06:00
Seth Call
7ca3acb676
* wip
2014-12-22 09:50:59 -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
3bac8252e9
* fixing websocket tests
2014-12-18 16:26:56 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
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
795cb6f536
Dedicated spec for testing cleaner. Some cleanup/renaming.
2014-12-15 23:57:57 -06:00
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
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
8ac9d19e73
VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool).
2014-12-15 18:02:51 -06:00
6407d2f22a
Merge from working branch
2014-12-15 12:16:19 -06:00
ac2daed4da
VRFS-2481 : Jam Tracks python layer and source.
2014-12-15 12:16:19 -06:00
f6fef00ea5
VRFS-1952 : Schema changes for proper type and incremental code changes. WIP.
2014-12-15 12:16:19 -06:00
93672844f2
VRFS-2529 remove quick-start scheduled sessions from account tab
2014-12-08 06:26:06 +00:00
937695e829
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 21:35:36 -05:00
605bdbcbf6
VRFS-2463 added tests for excluding currently viewed sessions/recordings
2014-12-07 21:35:30 -05:00
Seth Call
53ce955838
* VRFS-2530 - denormalize online for performance reasons
2014-12-07 16:04:10 -06:00
207b7b9e20
VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.
2014-12-06 14:04:31 -06:00
354f6320fc
VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar
2014-12-06 09:34:30 -05:00
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
868ca0b476
VRFS-1442 sessions band selection
2014-12-03 08:22:35 +00:00
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
465fd6fa94
VRFS-1442 prepend users bands to band search results
2014-12-03 08:22:34 +00:00
Seth Call
589a2f6cc6
* VRFS-2520 - recordings can be cleaned up now
2014-12-02 17:13:34 -06:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
Seth Call
6ad844035d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-21 17:16:21 -06:00
Seth Call
eedc5ae970
* VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks
2014-11-21 17:16:00 -06:00
f0b60f28e4
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
Seth Call
76adc44a50
* wip
2014-11-17 17:16:30 -06:00
Seth Call
b780b4a462
* merged
2014-11-17 13:32:13 -06:00
Seth Call
d1d059b4c5
* disable score_histories for now
2014-11-17 13:28:43 -06:00
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06:00
d65358cea6
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 13:01:28 -05:00
118ed7c39c
undo last change re: other instrument id
2014-11-15 11:59:51 -05:00
12ca12f3cf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 11:33:43 -05:00
8707bb2f16
set instrument ID for unstructured rsvp
2014-11-15 11:33:26 -05:00
Seth Call
92b617898f
* VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality
2014-11-14 20:47:56 -06:00
Seth Call
6277708bb4
VRFS-1491 - create personal/master mix toggle, and beef up user.mods
2014-11-11 16:21:46 -06:00
Seth Call
c3cd742c17
* wip
2014-11-11 16:21:29 -06:00
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
Seth Call
4e00863de6
* merged
2014-11-07 16:16:25 -06:00
Seth Call
8cad33a303
* recording file/manager fixes and aging of recordings
2014-11-07 16:12:36 -06:00
c6bfd59999
VRFS-2462 fixed session count on musician hover bubble
2014-11-07 13:05:07 -05:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
Seth Call
ea601711fa
* make desk keys configurable
2014-11-05 20:32:37 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
Seth Call
4f9bdb2c5c
* VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state
2014-11-03 15:24:46 -06:00
Seth Call
ace7ac15c8
* VRFS-2432 notify when stream mix is done
2014-11-03 10:00:42 -06:00
0007930936
VRFS-2401 revert to inline styles for email links for now, need to revisit better solution
2014-11-02 16:43:56 -05:00
33a431f822
VRFS-2427 fixed broken test
2014-11-02 14:26:56 -05:00
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
Seth Call
5f8953011c
* VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command
2014-11-01 21:21:42 -05:00
Seth Call
f0d675c10d
* fix typo in exist check
2014-11-01 21:10:12 -05:00
a310c46288
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 20:41:05 -04:00
Seth Call
4ee75adcf2
* make intermediary mp3 higher bitrate
2014-10-29 13:51:33 -05:00
Seth Call
62833198b3
* VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix
2014-10-29 11:28:13 -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
28e752629a
* show private recording on recording landing page to someone who was in the session
2014-10-29 07:22:45 -05:00
6d8ec70087
VRFS-2401 text links in emails should be yellow
2014-10-29 07:12:43 -04:00
300bc2cd82
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-27 21:37:28 -04:00
Seth Call
53706aec71
* VRFS-2405 - cleanup more files in audiomixer, and input/output files in quickmixer
2014-10-27 17:52:56 -05:00
Seth Call
004674c562
* VRFS-2405 - cleanup files after successful audiomix
2014-10-27 17:49:14 -05:00
Seth Call
5f87fdab00
* bah adding junk to AudioMixer file
2014-10-27 13:51:29 -05:00
Seth Call
bbff3ccab5
* remove debug print
2014-10-27 13:50:44 -05:00
Seth Call
970401374b
* VRFS-2399 - fixed recording sync track issue
2014-10-27 12:42:30 -05:00
709150edac
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 12:41:17 -04:00
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
68b9008ba8
* fix wrong class name in AudioMixerRetry
2014-10-25 11:35:59 -05:00
Seth Call
58d96fc171
* VRFS-2192 - export recording button added to file sync dialog
2014-10-23 16:45:25 -05: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
af2159fe72
VRFS-1945 added create_type to music_sessions; filtering session search based on create_type
2014-10-21 07:27:26 +00:00
a8987efaa1
VRFS-2337 added latency badge to musician hover bubble
2014-10-19 21:18:05 -04:00
cce9fc1577
VRFS-2029 : Fix issue where a nil (instead of false)
...
is causing claimed_recording not to save properly.
2014-10-15 17:59:59 -05:00
c1f2a2083f
VRFS-2029 : Update REST API ApiRecordingsController#claim
...
to accept and distribute upload_to_youtube flag as appropriate. Spec
to verify.
2014-10-15 13:54:10 -05:00
d95a063648
VRFS-2029 : Rails model attribute for upload_to_youtube flag
...
Also includes Rails validation.
2014-10-15 13:45:30 -05:00
3641521740
VRFS-2244 handle duplicate friend requests better
2014-10-14 02:12:33 -04:00
649027cda7
VRFS-2282 tests and music session time queries
2014-10-14 03:54:58 +00:00
6f27455b02
Merge branch 'develop' into VRFS-2282
2014-10-13 16:18:47 +00:00
ab66504532
VRFS-2344 show musician hover on pages 2-n on Find Session screen
2014-10-13 20:58:30 -04:00
Seth Call
1673d88760
* fix broken mixer behavior
2014-10-13 09:49:52 -05:00
257421a1d0
VRFS-2318 show JOIN button for non-scheduled (future) session
2014-10-13 08:40:10 -04:00
95b26e9c00
Merge branch 'develop' into VRFS-2282
2014-10-13 02:15:01 +00:00
aef2b873f2
VRFS-1430 changed db default sender back to noreply; changed text for batch mails to FFFFFF from AAAAAA
2014-10-13 00:51:13 +00:00
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00:00
c2c157a0ba
VRFS-2124 fix feed issue when session switches from fan_access=true to fan_access=false
2014-10-11 13:57:05 -04:00
bdd8c6db5a
VRFS-2219 activate session in feed when the active_music_session record is created
2014-10-11 08:53:26 -04:00
4d08359ef1
Fixes VRFS-2334 : re-add filter for users
...
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
2014-10-10 11:07:36 -05:00
d08475c34e
VRFS-2321 comment out session join email notification
2014-10-08 20:27:28 -04:00
b30d71de6a
VRFS-2320 use from_user_mailer template for session comment
2014-10-07 21:16:56 -04:00
eddd8a526c
VRFS-2320 include from user info in session comment emails
2014-10-07 20:39:13 -04:00
9473ffa352
Merge branch 'feature/video_mvp' into develop
2014-10-07 17:37:06 -05:00
94963f2ad1
VRFS-2028 : Add videos to list_uploads, in addition to tracks.
...
This is accomplished using a SQL union via arel.
2014-10-07 15:34:05 -05:00
160108a217
Merge video_mvp branch
2014-10-07 11:33:34 -05:00
bffba5fcbc
VRFS-2219 changes based on Seth code review
2014-10-06 21:03:19 -04:00
e25e3b16a9
VRFS-2027: Create video recordings from source in ApiRecordingsController#start
...
Also includes spec.
2014-10-06 18:17:08 -05:00
1ce0ac34ef
VRFS-2025 : Add video_sources to join_the_session and its callers.
...
Creates and attaches video_sources just as it does tracks.
2014-10-06 17:02:10 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
47490ea3d9
VRFS-2025 Incremental
2014-10-06 16:17:46 -05:00
dffdb78f71
Merge develop into this branch.
2014-10-06 16:17:36 -05:00
7856e43f1e
VRFS-2219 active sessions should sort to top of Feed
2014-10-06 09:20:31 -04:00
14c9a5b469
VRFS-2278 show tooltip for instrument icons on Find Session and Session Detail screens, show user friendly error when unable to approve RSVP
2014-10-05 22:12:50 -04:00
66feb39de8
VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track.
2014-10-03 14:12:09 -05:00
5135fe7faf
VRFS-2024 - Migration, model and spec for video source.
2014-10-03 13:36:51 -05:00
5d524cd7b0
VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98
2014-10-01 22:10:54 +00:00
Seth Call
8889b8ce42
* merge in faster score searches (VRFS-2202)
2014-09-30 10:51:23 -05:00
6442674c91
VRFS-2216 fix tests; include pending RSVPs and invites for session details screen
2014-09-28 22:37:52 -04:00
a07fdfe2a8
Merge branch 'develop' into feature/sprint_12_work
2014-09-28 12:00:32 -04:00
Seth Call
39ed460d14
* VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data
2014-09-25 23:13:34 -05:00
da771acdaf
merge develop
2014-09-25 09:09:44 -04:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
3f1eb86684
Merge branch 'develop' into feature/sprint_12_work
2014-09-23 21:27:52 -04:00
Seth Call
51b5923022
* fix broken tests
2014-09-22 15:55:02 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
096c43c0e4
Merge branch 'develop' into feature/sprint_12_work
2014-09-19 00:25:20 -04:00
1858e0da49
VRFS-2218 VRFS-2197 allow unstarted scheduled sessions to be listed up to 12 hours after start time; allow completed sessions to be listed up 2 to hours after completion time
2014-09-19 00:24:38 -04:00
Seth Call
a396671f8b
* VRFS-2223 typo in music_session
2014-09-17 20:38:33 -05:00
Seth Call
6b96bdcd05
* VRFS-2221 - fix bad reconnect path
2014-09-17 10:22:00 -05:00
1203a26271
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-15 23:02:53 -04:00
4ddd4e4c13
VRFS-2066 fixed some issues with session landing and feed
2014-09-14 19:17:16 -04:00
03fe5e8a1e
VRFS-2066 consolidate users if they are listed multiple times in MSUH for the same session
2014-09-14 15:52:17 -04:00
f296932f27
fix more session join/leave bugs
2014-09-14 15:12:25 -04:00
e5a6ad862b
fix notification bugs - active_music_session vs. music_session confusion
2014-09-14 14:41:32 -04:00
072f3101c7
VRFS-2179 minor refactor of offline notifications to prevent a second loop from executing
2014-09-13 08:04:40 -04:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
d8d987e21f
VRFS-2179 send email to friends/followers when user joins a session
2014-09-12 22:57:03 -04:00
4bdcf103ce
VRFS-2136 only return recordings that have at least 1 claimed recording
2014-09-11 21:52:26 -04:00
c55413d349
added more tests, minor refactor, only send scheduled session notifications if target user is online
2014-09-11 21:29:48 -04:00
632d806825
remove debug statement
2014-09-11 09:04:14 -04:00
abc8f18c00
VRFS-2140 added more tests, fixed bug in band recording notification
2014-09-11 09:03:32 -04:00
71487d989b
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-11 08:38:56 -04:00
0b1f9d0c97
VRFS-2140 added more tests, fixed bug found in recording notification
2014-09-11 08:38:26 -04:00
Seth Call
7761c2e9a8
* VRFS-2155 fix passing of yellow
2014-09-10 09:25:43 -05:00
Seth Call
5b9987aa17
* fix broken artifacts path: VRFS-2153
2014-09-10 09:13:02 -05:00
a7623aac26
VRFS-2140 do not send any email notifications if the user has opted out of receiving emails
2014-09-10 03:04:35 -04:00
Seth Call
8c22d68b60
* sort by date, not the array VRFS-2130
2014-09-08 21:50:51 -05:00
Seth Call
406c86be29
* VRFS-2098 - protect against dup sessions showing up in daily email
2014-09-08 21:38:35 -05:00
850709e51a
VRFS-2094 include hour, minutes, seconds in filename to avoid overwriting files in S3 added on the same day for different sessions
2014-09-08 21:13:08 -04:00
Seth Call
75d50b8286
* make notations private bucket; only allow access if user has can_join? permissions for session
2014-09-08 16:51:28 -05:00
07024a44a6
VRFS-2094 wip notation upload bug fixes
2014-09-08 09:13:20 -04:00
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
c35cfcf0f9
* VRFS-2104 make sure APP_CONFIG exists in websocket-gateway
2014-08-31 14:45:48 -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
f39312662d
VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @
2014-08-27 23:36:57 -04:00
82090f5f55
VRFS-2072 copy all 1-time cancellations instead of just the first
2014-08-24 15:12:38 -04:00
b1f4ede997
VRFS-2072 fix session scheduler bug where RSVP requests were not being carried forward
2014-08-22 02:14:07 -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
Seth Call
9d46f07153
* VRFS-2070 - work current_scores into a better query, and update the entire site to use it correctly
2014-08-20 17:06:57 -05:00
Seth Call
554d100c31
* VRFS-1962, VRFS-2047, VRFS-2046, VRFS-2006 - score breakdown hover and score badges are all tested and working
2014-08-19 20:58:24 -05:00
Seth Call
9c4ab6418c
* wip
2014-08-19 14:23:41 -05:00
Seth Call
8f49a9ab66
Merge branch 'develop' into feature/latency_hover
2014-08-19 12:49:54 -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
0c3a43a177
* wip
2014-08-18 10:37:55 -05:00
25e3f23dcf
VRFS-1891 VRFS-2022 bug fixes / test additions
2014-08-15 00:32:45 -04:00
af1a4596e0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-14 23:57:51 -04:00
Seth Call
d34929d70b
* landing pages in VRFS-2037
2014-08-14 22:23:22 -05:00
Seth Call
b9a5c75ec5
* VRFS-2055 - escape keyword in hand-crafted SQL query\!
2014-08-14 21:28:30 -05:00
5691e6092f
VRFS-2022 show private sessions/recordings in the feed
2014-08-14 01:45:37 -04:00
Seth Call
4c85740597
* wip
2014-08-13 11:09:52 -05:00
e8847280bc
VRFS-1995 do not send notifications to users with canceled RSVPs
2014-08-12 02:20:25 -04:00
dece2afc1b
VRFS-1478 fix bugs
2014-08-12 00:24:57 -04:00
cc26969f8a
VRFS-1891 cancel RSVP flow fix
2014-08-09 23:22:17 -04:00
fd9893ca42
Merge branch 'develop' into hotfix/cancel_rsvp_flow
2014-08-09 18:35:23 -04:00
f97a416867
VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog
2014-08-08 02:22:32 -04:00
9249e99581
added method min_create_date
2014-08-05 12:09:12 +00:00
Seth Call
e871cc5390
fix latency presention - divide by 2 then round
2014-08-03 21:38:53 -05:00
Seth Call
aa863240b9
* VRFS-1992 finished (daily session email improvements)
2014-08-01 16:17:04 -05:00
Seth Call
8048c5012d
* wip
2014-07-31 21:06:06 -05:00
Seth Call
00dee99e17
* wip
2014-07-31 20:16:38 -05:00
Seth Call
9544e3d075
* rename new column because it's not working for reasons I can't understand on the build server
2014-07-30 21:05:59 -05:00
Seth Call
a11ae44a90
* VRFS-1951 - make sure staging emails don't get sent from my machie
2014-07-30 16:39:59 -05: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
915bb4ad13
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-30 07:13:19 +02:00
93cef4e0cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 22:46:14 -04:00
24eb53cc07
fix syntax error and tests
2014-07-29 22:46:07 -04:00
Seth Call
dd318a9b8a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 21:43:44 -05:00
Seth Call
9013ff2e94
* VRFS-1987 fix stupid typo caused by refactor of MusicSession to ActiveMusicSession
2014-07-29 21:42:35 -05:00
d3b22afe16
schedule sessions that are at least 4 hours old
2014-07-29 22:40:42 -04:00
0a075da783
VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester
2014-07-29 22:07:46 -04:00
19f36b7d1b
copy is_unstructured_rsvp flag on RsvpSlot
2014-07-29 21:52:08 -04:00
Seth Call
027456105b
* VRFS-1968 - locids are now in score history
2014-07-29 18:11:00 -05:00
Seth Call
c3461e82a7
* VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email
2014-07-29 17:52:20 -05:00
95dcea9ca7
fixed issue #1632 #1954
2014-07-29 18:15:23 +02:00
Seth Call
1e6524e534
* VRFS-1956 - fixes for musicians page
2014-07-28 23:04:56 -05:00
Seth Call
e9a4f33420
* VRFS-1957 - use median instead of just most recent for current_scores
2014-07-28 17:37:47 -05:00
Seth Call
4f7c1ef22e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-27 11:46:38 -05:00
Seth Call
2dd6153ed8
* wip on score export
2014-07-26 14:18:17 -05:00
e87ae50dfe
VRFS-1942 tuning admin view
2014-07-26 04:10:40 +00:00
d28a65c5ff
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-26 03:59:11 +00:00
ff73c170bd
VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries
2014-07-26 03:58:58 +00:00
Seth Call
adb0b15555
* fixing bad schedules on scheduler.yml, and wip on admin web reporting
2014-07-25 15:01:14 -05:00
Seth Call
6a037d9987
* VRFS-1944 - user info added to scores and score_histories
2014-07-24 18:39:26 -05:00
Seth Call
cc6f3fe974
* VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page
2014-07-23 15:11:02 -05:00
Seth Call
333e321877
* updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc)
2014-07-22 14:36:45 -05:00
Seth Call
57728fbfe8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 16:42:36 -05:00
Seth Call
6c4bcd98be
* VRFS-1924 - score_history added
2014-07-21 16:42:30 -05:00
ecf4b6f397
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 05:14:11 +00:00
b4ab41637c
VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration
2014-07-21 05:14:05 +00:00
25cff163dc
VRFS-1874 added query constraint to filter out users with last_jam_locidispid = NULL
2014-07-21 05:12:07 +00:00
4aa359fc13
VRFS-1921 legal policy links are now specific to environment, fixed bug with legal policy link on Session Info page
2014-07-21 01:05:07 -04:00
Seth Call
513a46067a
* merged
2014-07-19 21:12:11 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
5027000c49
VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP
2014-07-16 20:19:43 +02:00
590e6d8028
VRFS-1926 fixed, fix scheduled session query
2014-07-16 18:21:21 +02:00
Seth Call
ae8c3120aa
* wip
2014-07-14 17:22:49 -05:00
Seth Call
8441acacef
* VRFS-1922 - marking unscheduled sessions as started if activemusicsession is created, and added a migration to fix up old sessions
2014-07-14 16:43:46 -05:00
Seth Call
c2a5936720
* wip
2014-07-14 15:53:04 -05:00
26f7d2755b
VRFS-1918 Session Details Update Screen - once over with tests
2014-07-14 20:40:00 +02:00
6b00538436
miscellaneous formatting fixes
2014-07-13 13:36:56 -04:00
Seth Call
4b4a6606bf
VRFS-1882 - you can create (actually, join) a session multiple times...
2014-07-12 22:20:15 -05:00
a7621b0326
VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification
2014-07-12 18:24:12 -04:00
Seth Call
14dad29c59
* VRFS-1861 - show something useful in the session section of the account screen
2014-07-12 08:55:58 -05:00
Seth Call
ba4fa985bf
* VRFS-1877; list 4 hours old and newer sessions - also noticed that create session listed sessions were filtering TBD scheduled sessions; brought those back in
2014-07-11 22:44:49 -05:00
Seth Call
d47218961e
* working on formatting still
2014-07-11 21:11:34 -05:00
Seth Call
471a0d13a0
* VRFS-1917 - timezone set correctly
2014-07-11 20:54:54 -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
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
Seth Call
55aea1109f
* VRFS-1869 - use offset
2014-07-10 22:08:03 -05:00
Seth Call
74b2f19460
* VRFS-1897 - fix the creator getting approval notice
2014-07-10 16:37:48 -05:00
Seth Call
afa2fa58cf
* VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user
2014-07-10 15:57:48 -05:00
Seth Call
f693470c63
* VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model
2014-07-10 15:22:00 -05:00
Seth Call
3a5d146ef3
* change can_delete to can_cancel, and don't cehck for start_at anymore
2014-07-10 11:38:17 -05:00
Seth Call
f2975c8838
* VRFS-1908 - add more canceled checks
2014-07-10 11:27:26 -05:00
0041562933
VRFS-1419 VRFS-1906 do not delete music session when canceling because it leaves dangling notifications / added paging support for Find Session screen
2014-07-10 00:39:38 -04:00
Seth Call
71737f3f5e
* VRFS-1879 - handle case of no instruments selected for others; VRFS-1894 - canceled RSVPs that have not been dealt with are not shown
2014-07-08 16:52:25 -05:00
Seth Call
0020a8eb0d
* VRFS-1889 completed; VRFS-1879 - partially done
2014-07-08 13:34:03 -05:00
Seth Call
27fe4f4ae9
* VRFS-1880 - fixed issue and added test
2014-07-07 16:08:36 -05:00
4872c037ad
added field to approved_rsvps method per request from Bert
2014-07-05 21:51:45 -04:00
Seth Call
3f53cb9819
* removing jquery draggable from web and landing
2014-07-03 17:53:16 -05:00
4e1a68f344
VRFS-1855 fixed Create / Find Session issues related to open RSVPs
2014-07-03 00:51:54 -04:00
421d183ba3
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-02 15:57:55 +02:00
2ced001f77
add account scheduled session properties page, add spec, fix detail page, create session flow
2014-07-02 15:57:18 +02:00
Seth Call
7dcf205a6b
* VRFS-1821 - clarify error message on music notation fail
2014-07-01 13:58:58 -05:00
Seth Call
607c0a145d
* get rid of print
2014-07-01 13:26:27 -05:00
Seth Call
ba57c00dec
* VRFS-1429 - instruments stay selected, and tos stays selected
2014-07-01 13:19:33 -05:00
b0011137b9
VRFS-1827 add Fan Page URL to session info page
2014-07-01 00:44:10 -04:00
0ece384569
VRFS-1828 VRFS-1829 add date/time info to Find Session screen, fix RSVP dialog issues
2014-07-01 00:36:06 -04:00
Seth Call
2cdc1b87e3
VRFS-1817 remove jamtracks option
2014-06-30 16:24:56 -05:00
Seth Call
7a10e67c76
* take out restriction for max 12 hours in the future for scheduled sessions
2014-06-30 16:14:01 -05:00
Seth Call
63dfb8929c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-30 15:44:38 -05:00
Seth Call
cbe4bf1747
* VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed
2014-06-30 15:44:28 -05:00
156095f3c8
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-06-29 15:55:18 +02:00
07d96d7a57
VRFS-1667, VRFS-1729 implemented account session page, session detail page
2014-06-29 15:54:51 +02:00
287faa765c
VRFS-1812 added latency indicators to the session info page
2014-06-28 13:06:32 -04:00
Seth Call
b130818011
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-27 14:18:09 -05:00
Seth Call
865b488f93
* VRFS-304 - user history (feed) tab
2014-06-27 14:17:56 -05:00
eb30ee3391
VRFS-1672 music notation file upload work
2014-06-26 23:07:48 -04:00
Seth Call
f9ce995a8f
* tweak date offset logic
2014-06-25 21:50:20 -05:00
Seth Call
c7a0208804
* create session/find session 'what app' guard movement; * VRFS-1753 - network guard in place (and FTUE guard withit)
2014-06-25 16:54:31 -05:00
Seth Call
fe7c58bafc
* adding code to handled positive timezone
2014-06-25 10:21:36 -05:00
31ec7ae6b1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-25 14:49:44 +00:00
05b3d855d7
VRFS-1458 cleaned up labels and selection issues with country/region/city selects
2014-06-25 14:49:33 +00:00
Seth Call
464c595d6b
* fixing controller/request tests
2014-06-24 10:33:31 -05: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
e211871168
merge develop
2014-06-23 01:09:03 -04:00
f4b4734c94
VRFS-1669 find session work
2014-06-23 00:58:37 -04:00
bc47a0a599
VRFS-1669 find session wip
2014-06-21 16:16:39 -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
af06127403
fix create session flow, rsvp
2014-06-20 02:43:21 +08:00
b4151c27e9
VRFS-1669 VRFS-1672 session settings dialog / find session work
2014-06-19 00:21:34 -04:00
74d5053a8a
allow session organizer to create RSVP for self without having invitation
2014-06-18 22:32:21 -04:00
7f6a5e75ff
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-19 00:16:24 +02:00
f27ff725ef
fix create session flow errors.
2014-06-19 00:15:56 +02:00
Seth Call
8efe5ee575
* adding name proxy method
2014-06-18 09:54:08 -05:00
Seth Call
e3d521e07a
* adding in session.name to show.rabl and history_show.rabl
2014-06-18 08:09:36 -05:00
Seth Call
39a55f562c
* VRFS-1684 and VRFS-1684 (find session APIs) completede
2014-06-17 17:16:49 -05:00
Seth Call
106222638f
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
2014-06-17 14:10:24 -05:00
Seth Call
3ef4619872
* cleaning up minor things
2014-06-16 15:58:44 -05:00
Seth Call
8d16bdacfa
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-16 15:41:52 -05:00
Seth Call
f680fafaf3
* VRFS-1684 - adding latency to participants and approved_rsvps JSON response.
2014-06-16 15:41:37 -05:00
35f630bdd7
VRFS-1690 add autoapprove option to RSVP creation
2014-06-16 08:11:05 -04:00
75b22ced5b
added ability to retrieve RSVP requests by approval status
2014-06-16 01:46:52 -04:00
4c81fdc1eb
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:49:47 -04:00
7f3f47c3e6
VRFS-1749 session info tests
2014-06-15 15:49:43 -04:00
07c1a4c85d
added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec
2014-06-15 10:35:15 -05:00
ab2ad1b93c
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:12:07 +08:00
db6d6fa315
fix tests, rsvp error
2014-06-15 15:10:44 +08:00
ab5a7dc47a
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-14 21:27:43 -05:00
3c3565893d
wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction
2014-06-14 21:27:34 -05:00
a557e9966a
VRFS-1749 more session info tests / fix "deprecated" warnings
2014-06-14 13:13:45 -04:00
03705547dd
fix music session - rsvp
2014-06-14 21:42:46 +08:00
d4b467fd42
scheduled session - RSVP slot updated
2014-06-14 21:25:32 +08:00
2799a6443e
added asm_index method to controller and fix a few issues with asm_index and included a simple test
2014-06-13 23:51:54 -05:00
b918d24d32
reverse query ams_index to produce list of augmented music_sessions
2014-06-13 19:47:34 -05:00
beca3b5608
stub out active_music_sessions#ams_index
2014-06-13 12:38:36 -05:00
bedb377be8
VRFS-1749 session info tests wip
2014-06-13 03:45:45 -04:00
aa95dd783b
fix tests
2014-06-11 09:15:03 -04:00
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
161f75a126
use current_scores instead of scores
2014-06-10 20:50:59 -05:00
7c058fd3e0
fix notification test
2014-06-10 01:38:11 -04:00
4c758f3185
VRFS-1749 finished RsvpSlot model tests
2014-06-10 01:08:28 -04:00
0fe76dae13
VRFS-1749 finished RsvpRequest model tests
2014-06-10 00:35:38 -04:00
11c7f87fa1
Merge branch 'feature/create_session_flow' into feature/scheduled_sessions
2014-06-10 06:16:01 +08:00
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
c0287cc224
VRFS-1664 enhancing tests
2014-06-09 05:12:29 +00:00
f333f110b8
fix type error
2014-06-09 10:43:07 +08:00
a09326470e
VRFS-1749 RsvpRequest model tests wip
2014-06-07 13:01:03 -04:00
cff09fd4de
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-06 03:05:14 -04:00
1a93b5f1f3
VRFS-1710 added scheduled session info to hover bubble / show session hover bubble for session-related notifications
2014-06-06 03:04:52 -04:00
eee0281c37
VRFS-1665 fixed typo
2014-06-06 06:08:53 +00:00
98ede13fbc
VRFS-1664 fixed typo
2014-06-06 06:08:32 +00:00
18167e898d
VRFS-1665 added large batch test
2014-06-06 05:31:53 +00:00
743bb1e0dd
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-05 16:29:09 +00:00
a657236814
VRFS-1664 fixed large batch test
2014-06-05 16:29:01 +00:00
e669205c64
VRFS-1664 added looping test
2014-06-05 15:42:23 +00:00
1141f2bd2e
VRFS-1693 bug fixes
2014-06-05 00:55:15 -04:00
8cc14b1ede
VRFS-1693 copy canceled RSVP for slot if none were chosen
2014-06-04 23:17:45 -04:00
60a004a252
integrating api, (without music_notations, start scheduled information)
2014-06-05 03:19:45 +08:00
d07e649c7b
VRFS-1693 music session scheduler
2014-06-04 01:47:28 -04:00
50706e7858
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-03 01:10:39 -04:00
a9b67a9a6b
VRFS-1693 resque job to schedule recurring music sessions
2014-06-03 01:10:25 -04:00
84ed2949f6
VRFS-736 refactoring tests
2014-06-03 04:21:00 +00:00
d36ec17436
VRFS-1664 fixed mail sending test
2014-06-03 03:25:23 +00:00
1f726df320
VRFS-1665 prevent session creator from getting notified of sessions
2014-06-02 06:17:31 +00:00
7ea659c71f
VRFS-1665 rewrote daily email queries and adding pagination; other tweaks
2014-06-02 06:01:55 +00:00
2719b35dee
VRFS-1664 added paging to fetc_recipients
2014-06-02 02:31:42 +00:00
e35e318884
VRFS-1664 replace tmp tbl with subquery
2014-06-02 02:11:00 +00:00
9c0afd6ccd
VRFS-1664 fixed var name
2014-06-02 01:56:26 +00:00
b5503afd0d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-31 18:07:30 -05:00
c0d08ebe27
scores integrated into display where i could, not exactly where david wanted. this finishes vrfs-1455
2014-05-31 18:07:25 -05:00
0edacbe3e2
merging with develop
2014-05-31 21:07:18 +00:00
4f5adf1340
VRFS-1664 fixing query
2014-05-31 20:41:48 +00:00
aa44302517
VRFS-1664 tweaking query
2014-05-31 20:34:42 +00:00
edbd3b1c6d
VRFS-1664 new musicians email
2014-05-31 19:09:18 +00:00
689e0a8609
VRFS-1664 new musicians emailer
2014-05-31 09:36:10 +00:00
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
5b438ffaef
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-31 07:35:07 -04:00
e1e89d55e8
VRFS-1672 session settings dialog work / other bug fixes
2014-05-31 07:34:52 -04:00
30037bc967
VRFS-1698 removed sendgrid email error handling
2014-05-31 09:03:18 +00:00
2009b9715f
VRFS-736 removed html from title in text-based emails
2014-05-31 08:47:26 +00:00
b8736ff389
VRFS-1698 changed batch sending to one-at-a-time
2014-05-31 07:44:56 +00:00
275c997591
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-30 14:12:35 -05:00
e9b77ff5b5
attempt to try to add scoring to musicians web page; add appropriate back-end filtering for score
2014-05-30 11:34:06 -05:00
a607124e63
VRFS-1746 RSVP cancel dialog bug fixes
2014-05-29 22:19:30 -04:00
Seth Call
7da75e94d9
* VRFS-1575
2014-05-29 14:44:37 -05:00
Seth Call
dff3fa4870
*wip
2014-05-29 14:44:37 -05:00
Seth Call
fcc7130536
* wip
2014-05-29 14:44:37 -05:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
Seth Call
05666f7927
wip
2014-05-29 14:34:18 -05:00
3b3776f065
get score from Search.musician_filter into json sent to client
2014-05-29 13:03:33 -05:00
77b6bdf106
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-29 16:32:29 +00:00
ff15da9f4e
VRFS-1665 mail formatting; bug fixing
2014-05-29 16:32:22 +00:00
f90f55fb11
VRFS-1665 added mail delivery test
2014-05-29 09:15:46 +00:00
243e06533b
VRFS-1665 scheduled session impl
2014-05-29 07:19:55 +00:00
f1229f6842
VRFS-1746 RSVP cancel dialog work
2014-05-29 02:33:37 -04:00
b640c31301
fix test
2014-05-29 01:28:40 -04:00
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
4d63dad502
VRFS-1671 RSVP submit dialog
2014-05-28 23:43:57 -04:00
ebfe72e11d
fix tests for scoring musician search
2014-05-28 21:19:50 -05:00
c7fc7bdc22
VRFS-1668 clean up notifications / fix comment notification for session info page
2014-05-27 22:35:26 -04:00
6f57265a0d
finish up mods for geocoding based on scores
2014-05-27 11:52:18 -05:00
989a2a2b3a
VRFS-1670 session info page work
2014-05-27 00:32:14 -04:00
f31248815d
VRFS-1670 session info page work
2014-05-26 23:52:59 -04:00
7446898071
added tests for new_musicians
2014-05-26 14:16:01 -05:00
304008d693
VRFS-1670 more session info work
2014-05-26 14:00:34 -04:00
cc4686ab79
VRFS-1670 session info page work
2014-05-26 01:35:57 -04:00
2cef0872d9
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
2014-05-25 18:26:54 -04:00
bc0e3ba0eb
VRFS-1681 cleanup unused notation files
2014-05-26 01:30:10 +08:00
16b240fdc8
merge scheduled_sessions branch
2014-05-24 04:01:40 -04:00
a06ba7197e
VRFS-1670 session info page work
2014-05-24 03:58:47 -04:00
fbeddf1735
VRFS-1682, VRFS-1679 : upload music notation, download music notation
2014-05-24 02:58:59 +08:00
918d65cd92
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-23 10:12:30 -05:00
50d1696ad3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-23 04:54:57 +00:00
5f5bcaf04c
VRFS-736 updated welcome message; fixed queue loading issue by updating jam_ruby.rb
2014-05-23 04:54:46 +00:00
81495315f7
simplify Search.new_musicians api
2014-05-22 21:42:07 -05:00
bf06df36a3
added better regions database; added appropriate indexing for regions table
2014-05-22 15:17:00 -05:00
5685e2f0e8
VRFS-1678 added music session update feature
2014-05-22 17:49:35 +08:00
00d06fe6f2
* merge
2014-05-22 16:07:17 +08:00
57f1fab935
VRFS-1677 fixed
2014-05-22 16:02:48 +08:00
b4f7035fed
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
2014-05-22 00:42:50 -04:00
03eb125fa8
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-22 00:42:33 -04:00
0e419a7881
VRFS-1692 cancel RSVP complete
2014-05-22 00:40:17 -04:00
176e862338
VRFS-1691 update RSVP request complete
2014-05-21 23:36:34 -04:00
94421c03c0
merge conflict with db/manifest resolved
2014-05-21 21:33:38 -05:00
09231c5fe6
fix for vrfs-1476 - scoring should store the detail data
2014-05-21 21:30:43 -05:00
bbd0c27d23
VRFS-736 cleanup of sess_notrecord text; added progress mailer queue
2014-05-21 22:41:17 +00:00
836baee962
merging with develop
2014-05-21 21:55:26 +00:00
25f325d720
VRFS-1690 create RSVP request working
2014-05-21 17:47:11 -04:00
a1f288fe4d
VRFS-1676 fixed
2014-05-22 03:11:50 +08:00
4a76e0c983
get_work has a larger radius and excludes the current connections address
2014-05-21 14:05:45 -05:00
1904c8f474
VRFS-1675 completed
2014-05-22 00:24:40 +08:00
6c0807ac5a
VRFS-736 adding email content for progression steps
2014-05-21 07:17:42 +00:00
9ad0badff1
VRFS-736 filling out remaining subtypes
2014-05-21 06:20:15 +00:00
7f5940ac01
VRFS-1739 API for RSVP slots
2014-05-21 01:36:32 -04:00
70f34120b3
VRFS-736 refactoring
2014-05-21 05:24:52 +00:00
f793b14879
VRFS-1738 more RSVP API work
2014-05-21 00:57:32 -04:00
3e0667e24d
added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api
2014-05-20 09:46:45 -05:00
22f4d0ffc5
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-20 21:26:55 +08:00
cebbd869cb
VRFS-1675 add join session feature
2014-05-20 21:26:32 +08:00
96f62b1364
VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work
2014-05-20 02:45:00 -04:00
f53ca0010d
VRFS-736 looping through results
2014-05-20 05:58:06 +00:00
cd801d7852
VRFS-736 fixing progression email algorithm and tests
2014-05-20 05:21:11 +00:00
d665a09080
scheduled session rsvp wip
2014-05-20 00:31:26 -04:00
ca53ee0ead
update data model / fix tests
2014-05-19 23:34:56 -04:00
97843035ba
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-19 23:36:23 +08:00
cdc9d121cb
VRFS-1674 Create Session API
2014-05-19 23:35:38 +08:00
e44ccc7653
VRFS-736 client_notdl mailer
2014-05-19 15:12:59 +00:00
4ddd699302
VRFS-736 filling out progression steps
2014-05-19 04:35:25 +00:00
30f2387658
VRFS-736
2014-05-19 03:23:14 +00:00
dce007a13d
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
2014-05-18 22:31:25 -04:00
f6196bb2c8
VRFS-736 consolidating query
2014-05-19 00:43:37 +00:00
95100a1b49
VRFS-1668 added some edge case tests for new notifications (still need sunny day tests)
2014-05-18 14:59:57 -04:00
1271b74bc4
VRFS-736 passing tests
2014-05-18 06:14:19 +00:00
fbb86dd9e7
VRFS-736 tests passing and what-not
2014-05-18 05:24:07 +00:00
0b2acda11e
VRFS-1668 email notifications for scheduled sessions
2014-05-18 01:22:20 -04:00
8fc30baf42
VRFS-1668 more notification work
2014-05-18 00:09:21 -04:00
a1b8d78e6a
fix a problem with band location vs. user location management
2014-05-17 22:09:31 -05:00
6e7562ffc8
VRFS-736 progression emails first pass
2014-05-18 00:12:01 +00:00
9eaa34b07f
disable lat lng and distance in queries for users
2014-05-17 14:55:26 -05:00
72110cb057
Merge branch 'develop' into vrfs1664
2014-05-17 17:43:35 +00:00
e330fb96c7
VRFS-1664 some tweaks
2014-05-17 17:38:22 +00:00
7428a2f26b
VRFS-1664 new musician weekly email
2014-05-16 07:58:06 +00:00
091998c200
* fix music_session test
2014-05-16 01:22:21 +08:00
027fd61606
* added recurring_mode to music_session for recurring sessions
2014-05-16 00:19:44 +08:00
24117c1b67
VRFS-1718 added MusicNotation model, migration
2014-05-15 23:49:06 +08:00
baee1b7506
VRFS-1668 merge with test fixes for notification changes
2014-05-15 01:06:48 -04:00
Seth Call
a19d6dcc07
* adding RsvpRequest and RsvpSlot models
2014-05-14 15:48:42 -05:00
212ef168c9
VRFS-1668 fixing tests related to notification changes
2014-05-14 01:16:33 -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
2302c89154
VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic
2014-05-13 01:22:23 -04:00
9deb7fcc74
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-12 21:13:33 -07:00
79136d2127
correct weirdness in how user location is set
2014-05-12 21:13:16 -07:00
5327be79eb
VRFS-1664 changed batch to 500
2014-05-11 09:43:40 +00:00
91ca1af98b
VRFS-736 like us GA support
2014-05-11 06:42:20 +00:00
2c58ded35f
VRFS-1700 fixed
2014-05-10 00:37:51 +08:00
ca27a6ab97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
db/manifest
2014-05-08 19:47:17 -05:00
3f688a8392
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
2014-05-08 19:44:52 -05:00
Seth Call
244f79eefb
* merging develop into feature/scheduled_sessions
2014-05-07 15:04:41 -05:00
Seth Call
6817d2f458
* fixing another bug in the SQL of MusicSession.index and MusicSession.index (bad inner join with music_session and active_music_session)
2014-05-07 14:16:35 -05:00
Seth Call
23aec0d1a5
* uncommenting the index tests; fixed a bug too
2014-05-07 10:53:39 -05:00
Seth Call
5f1ea4c754
* merging manifest
2014-05-07 05:17:17 -05:00
ebe9aa1047
VRFS-1577 VRFS-736
2014-05-07 01:33:27 +00: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
23082beb2f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-06 08:34:54 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
5f74bce061
VRFS-1577
2014-05-06 06:41:10 +00:00
294bb22cdd
Merge branch 'develop' into vrfs1577
2014-05-06 05:21:31 +00:00
0119001d3d
VRFS-1698 testing
2014-05-06 05:21:09 +00:00
a519191394
replaced find with find_by_id
2014-05-06 02:55:32 +00:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
Seth Call
acd1efd877
* wip
2014-05-05 10:06:27 -05:00
6be0791adb
merge
2014-05-02 15:20:21 -05:00
5cc515d615
a small cleanup of connection fields and fix broken tests
2014-05-02 13:44:29 -05:00
7d3ac6fc54
VRFS-1503 implement session chat feature
2014-05-03 00:33:27 +08:00
bf04fca205
VRFS-1503 implement session chat feature
2014-05-03 00:30:56 +08:00
Seth Call
53850a716b
* fixing bad ref to user_id in client cleanup code
2014-05-02 07:33:41 -05:00
Seth Call
c0ce26c602
* fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-05-01 14:09:33 -05:00
affb1cd875
VRFS-1577
2014-05-01 06:35:16 +00:00
a11dd664ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-30 22:01:57 -05:00
fe59865bd9
change join_the_session api to add tracks; move the impl to connection; a few bug fixes
2014-04-30 22:01:43 -05:00
5e27268fa4
VRFS-1577 VRFS-736 added should_rate_session?; fixed bug in add_rating
2014-05-01 01:46:57 +00:00
Seth Call
ad266e5b80
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-04-30 15:29:10 -05:00
2ee96c49ec
merging develop
2014-04-30 14:21:23 +00:00
dddc0311c0
VRFS-1577 VRFS-736 session ratings
2014-04-30 14:07:23 +00:00
Seth Call
6463512420
* a fix for race condition that can hang eventmachine startup
2014-04-30 03:03:37 +00:00
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
Seth Call
3e2f39cc85
* VRFS-1653 - don't bother with cleanup in onerror, and make startup of EventMachine better (VRFS-1659)
2014-04-29 16:27:50 +00:00
e82ae132bd
fix method for adding connection to music session
2014-04-28 22:38:30 -05:00
Seth Call
26dc80436c
* merging build script
2014-04-24 18:07:52 +00:00
Seth Call
26a9f9a162
* commenting 'Measurement Protocol' into related classes
2014-04-24 02:27:31 +00:00
Seth Call
29dfba8276
* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643
2014-04-23 15:08:19 +00:00
3921324b32
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:34:59 +02:00
07e141cc8f
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:27:49 +02:00
ed09892284
merging develop and vrfs1576
2014-04-23 07:50:50 +00:00
22566f1b29
VRFS-1576 added block to referrals_by_date
2014-04-23 06:34:21 +00:00
c66f5879cf
VRFS-1576 fixed referrals_by_date to support pagination
2014-04-23 02:43:13 +00:00
Seth Call
5695338266
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-22 17:53:49 +00:00
Seth Call
30ca8d7c5c
* wip still on new ftue. also push release branches to repository VRFS-1639
2014-04-22 17:53:41 +00:00
b232344336
VRFS-1576 added referrals_by_date and associated test
2014-04-22 07:12:05 +00:00
af63b03d6a
VRFS-1576 case insensitive codes
2014-04-22 02:14:22 +00:00
6ee83f8dcc
VRFS-1576 error handling; referral page; new admin menu
2014-04-22 01:55:40 +00:00
15064ad6c0
VRFS-1567 fix default sender, add new migration for email_batches table
2014-04-21 10:39:08 -07:00
4cfc1b878a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-21 17:18:11 +02:00
62dbeaa818
VRFS-1576 added validation and tests
2014-04-20 23:20:27 +00:00
937efed3e5
VRFS-1576 affiliate_partner model
2014-04-20 22:54:49 +00:00
f85f303da8
VRFS-1331 - JamKazam instead of Jamkazam
2014-04-20 16:43:58 -05:00
fc1fa1412f
VRFS-1592 fixed
2014-04-20 20:16:37 +02:00
bf1e315b48
Merge branch 'develop' into vrfs925
2014-04-14 10:59:58 +00:00
9ddbc6ba5c
VRFS-925 finishing up tests
2014-04-14 10:57:21 +00:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
Seth Call
cc7bbf3f6a
* resolved merge
2014-04-09 18:31:40 +01:00
Seth Call
95f1a59851
* VRFS-1404 reconnect with tests
2014-04-09 18:25:52 +01:00
5a4bff14d2
VRFS-925 running tests for server side GA events
2014-04-08 17:15:49 +00:00
Seth Call
3dfc455fa4
* reconnect working for in-session; beginning in-situ reconnect refactor
2014-04-08 12:43:26 +01:00
7203124e89
merging
2014-04-08 07:21:50 +00:00
880027a87f
VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog
2014-04-07 07:54:17 +00:00
887795bead
VRFS-1483 final cleanup
2014-04-05 22:16:32 +00:00
15090e3c70
VRFS-1483 error collector; cleanup
2014-04-05 21:25:47 +00:00
e59d9cbe7a
VRFS-1483 email error handling
2014-04-05 18:52:12 +00:00
d49c4624cd
VRFS-1483 added test Rails.env check
2014-04-04 10:23:20 +00:00
e9f99dbe08
develop merge
2014-04-04 10:22:48 +00:00
b4a3c73917
VRFS-1483 fixed batch email test so it should always work in test Rails.env
2014-04-04 10:18:09 +00:00
Seth Call
700ef04edf
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
2014-04-04 23:16:38 +01:00
Seth Call
d1622cfd95
* fix batch_mailer tests
2014-04-04 20:02:44 +01:00
e750ac9e68
VRFS-1483 error handling
2014-04-04 10:08:00 +00:00
981a7eb4e2
Merge branch 'hotfix/feed_icon_fix' into develop
2014-04-03 23:46:53 -04:00
a7c8d9311f
VRFS-1483 fixing tests
2014-04-03 05:03:28 +00:00
7e8b6eb238
VRFS-1465 add tests
2014-04-03 00:19:39 -04:00
Seth Call
90eb0bc081
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-02 00:43:10 +01:00
Seth Call
7bfe1cb634
* VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
...
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
3509a84de5
VRFS-1483 replaced layout with user_mailer
2014-04-01 14:51:45 +00:00
accaa99e38
VRFS-1483 integrating opt-out; fixing tests
2014-04-01 14:42:26 +00:00
Seth Call
373cda1121
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-31 03:28:16 +01:00
Seth Call
da7fc7d901
* VRFS-1541 done from a code perspective... just need to do some admin work once posted
2014-03-31 03:28:04 +01:00
54ecf4ca97
VRFS-1331 - capitalize K
2014-03-29 19:45:05 -05: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
d6210c0b2f
* VRFS-1474 - link in friend invite
2014-03-25 15:29:08 +00:00
Seth Call
5aaa389a4b
* VRFS-1386 - check if invited_user.email is nil, and change existing test to have email
2014-03-21 22:37:15 +00:00
Seth Call
4aece93b87
* run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509
2014-03-21 04:44:34 +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
e29907f09b
merging
2014-03-19 18:44:35 +00:00
eecdbebf3d
VRFS-1483 integrating admin interface
2014-03-19 18:42:28 +00:00
74a5f3863a
VRFS-1483 various fixes from testing
2014-03-19 16:32:53 +00:00
d15c1dbdfd
VRFS-1483
2014-03-19 07:15:38 +00:00
4ba18a88ee
VRFS-1483 integrating sendgrid_smtpapi
2014-03-19 06:20:58 +00:00
e8dd5f6ae5
VRFS-1483 state transitions and optimistic locking
2014-03-19 04:24:42 +00:00
c6c12e7b9e
Merge branch 'develop' into vrfs1483
2014-03-19 00:23:32 +00:00
17fcd42120
VRFS-1483 include resque::mailer
2014-03-18 23:39:23 +00:00
1c39238fe5
VRFS-1483 adding send batch layouts and such
2014-03-18 23:05:40 +00:00
cdb271bf98
VRFS-1483 added async support
2014-03-18 22:50:06 +00:00
40a2049bdf
VRFS-1483 added from_email column to email_batches
2014-03-18 20:31:23 +00:00
98a4553f72
VRFS-1483 specs for test users
2014-03-18 18:33:48 +00:00
3204de01e6
VRFS-1483 merge
2014-03-18 15:13:03 +00:00
e6d0851391
VRFS-1483 adding first set of updates for batch emails
2014-03-18 15:07:45 +00:00
f7ffa2d7a9
fix problem with missing client_type in login tests
2014-03-17 11:47:27 -05:00
Seth Call
b783d270b1
* VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors
2014-03-15 16:47:21 +00:00
Seth Call
993afe1174
if either fan access or musician access is public, expose rabl VRFS-1427
2014-03-14 14:44:11 +00:00
60aa59e11f
faster signup
2014-03-11 17:35:00 -05:00
3c3f191239
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 13:20:33 -05:00
2dd8ad0be8
data models for countries, regions, and cities tables.
2014-03-11 13:20:00 -05:00
Seth Call
1d1578fde8
* adding social description ability for sharing facebook
2014-03-11 18:14:05 +00:00
Seth Call
24f8bb257c
* VRFS-1168 - done except the distance filter, but that's assigned elsewhere anyway
2014-03-11 07:40:58 +00: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
67b5049913
* VRFS-1380 - lighter links in emails
2014-03-11 02:27:52 +00:00
Seth Call
a2061ff830
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 15:24:55 +00:00
Seth Call
c9625a4529
* VRFS-1377 done, tested. going to manually test soon on production
2014-03-10 15:21:21 +00:00
84011ce339
remove bogus reference to non-existent GeoIpIsp
2014-03-10 07:26:15 -05:00
d63f090657
VRFS-925 merge conflict
2014-03-10 09:01:33 +00:00
6ba8256d1a
VRFS-925 fixed typo for testing
2014-03-10 08:58:03 +00:00
Seth Call
7df02c0778
* merging manifest
2014-03-10 07:13:01 +00:00
8072096427
fix problem where jam_isp importer deleted contents of geoiplocations instead of geoipisp.
2014-03-10 01:45:32 -05:00
Seth Call
b9ee475db5
* working on event page
2014-03-10 06:31:20 +00:00
Seth Call
3c5a14312a
* Event page 'chrome' is setup and pulling from database--now to add band logic
2014-03-09 22:58:57 +00:00
959320f909
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 18:56:24 -04:00
dbed2edee8
VRFS-1397 ensure instruments are always synced in music_sessions_user_history table
2014-03-09 18:56:08 -04:00
bf86b9b30b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 17:35:29 -05:00
af748cba75
rake tasks for importing geoip data
2014-03-09 17:35:12 -05:00
Seth Call
23e5906e55
* VRFS-1253 - account for unknowns
2014-03-09 19:35:42 +00:00
e250b0f175
do not send band session join notification to band members
2014-03-09 14:44:06 -04:00
3b2c3ea755
VRFS-925 merge conflict
2014-03-09 13:42:53 +00:00
2b11cb7abb
VRFS-925 ga event processing
2014-03-09 13:38:46 +00:00
c1bea4ae03
merge conflict
2014-03-09 01:28:41 -06:00
f8e06c476d
fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions.
2014-03-09 00:22:51 -06:00
713344a7a7
merge conflict
2014-03-08 20:50:51 +00:00
Seth Call
5a51bae5fd
* set server_id to be same as hostname
2014-03-07 15:03:44 -06:00
Seth Call
755cd0172e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-07 14:20:43 -06: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
b0525231ab
fix test
2014-03-07 15:17:05 -05:00
eb98b97cd5
merge conflict
2014-03-07 06:53:35 +00:00
667c629c27
VRFS-1052 fix timestamp issue with notifications (moved to timeago plugin)
2014-03-07 01:30:23 -05:00
76e7a873ba
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-07 00:39:37 -05:00
49269443da
VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type
2014-03-07 00:38:10 -05:00
Seth Call
d0885a829e
* change all scheduled jobs to names prefixed with scheduled_
2014-03-06 23:20:24 -06:00
Seth Call
a3289c5d4c
* VRFS-900 - guard against 0 tracks
2014-03-06 11:56:15 -06:00
Seth Call
0d27a47b42
* VRFS-1308 - make configure tracks be cool about no selected items when the user indicates they might want to configure them. fix some recording styling button issues
2014-03-06 11:02:50 -06:00
2effc50f17
oops, use current_scores not scores
2014-03-05 23:00:57 -06:00
20cd9e5dd0
added stuff to support getting the max_score attribute to client via json
2014-03-05 22:26:17 -06:00
b54e7d1ca1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 20:30:54 -06:00
65b0c7115a
first take on api_music_sessions_controller#index replacement, nindex.
2014-03-05 20:30:40 -06:00
Seth Call
1c2585ba92
* VRFS-1047 mosttly done, aside from jamfet link
2014-03-05 17:18:53 -06:00
Seth Call
302341360e
* VRFS-1349 - fixed
2014-03-05 09:35:43 -06:00
1eb4b80482
VRFS-1333 refactoring {recording,music_sessions_history}_plays into playable_plays
2014-03-05 06:40:04 +00:00
87b6654f28
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 18:48:42 -06:00
057a2b79dd
removed updating with with connection location attributes
2014-03-04 18:48:29 -06:00
Seth Call
f5f16e9b91
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 11:08:05 -06:00
Seth Call
7d0ca26bda
* restrict not null
2014-03-04 11:06:53 -06:00
7a991a8032
VRFS-1326 added includes(:latest) to PromoLatest.active impl
2014-03-04 08:17:56 +00:00
b4c168c12a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 08:14:46 +00:00
fa3ca94e53
VRFS-1326 added filter for deleted sessions/recordings
2014-03-04 08:14:38 +00:00
Seth Call
e09b563737
* clean up lowercase k's in emails: VRFS-732
2014-03-04 01:09:13 -06:00
Seth Call
5285078cf6
* VRFS-1285 - hide play button if it can't be played, and show BROADCASTING OFFLINE or PRIVATE SESSION appropriaely
2014-03-04 00:00:01 -06:00
17088d49b5
VRFS-1326 fixed integration of latest/buzz
2014-03-04 05:38:58 +00:00
7d8cb8c458
fix missing better test data and bug in connection_manager.rb relating to line 111
2014-03-03 20:30:34 -06:00
Seth Call
3c4f5c7e55
* merged
2014-03-03 16:18:03 -06: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
1e8d2bb724
update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff
2014-03-02 23:16:48 -06:00
284cbeefc4
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 23:37:00 -06:00
a64ab23c97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 20:37:15 -06:00
5d899f57dd
complete unit tests for api_scoring_controller and add some better test data
2014-03-01 20:36:51 -06:00
37745101e2
add comment explaining sort
2014-03-01 21:35:11 -05:00
Seth Call
b7a1e06889
* working on generic recording widget logic
2014-02-28 19:28:17 +00:00
Seth Call
fd584967f2
Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 18:38:12 +00:00
Seth Call
aaef11add4
* VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only
2014-02-27 18:38:02 +00:00
fd42fc56fe
wire up get_work
2014-02-27 10:42:47 -06:00
09899e8f0a
VRFS-1247 include Listen link in session emails
2014-02-27 00:00:01 -05:00
e9e3cd886f
VRFS-1246 revert some emails back to use to field
2014-02-26 21:15:40 -05:00
4588149876
VRFS-1246 bcc users on generated emails
2014-02-26 20:56:58 -05:00
ca20570a16
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-26 20:56:33 -05:00
Seth Call
7c99c44eaf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 00:38:06 +00:00
Seth Call
f0e916e736
* VRFS-1047 - looks good; no audio hooked up
2014-02-27 00:38:01 +00:00
2a66b1ec6d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 23:02:06 -06:00
d12e65549d
wire up api/scoring/record
2014-02-25 23:01:55 -06:00
ee0a25293d
VRFS-1235 de-dup tracks on recording hover
2014-02-25 22:04:19 -05:00
2794a03993
VRFS-1231 de-dup instruments for the same musician
2014-02-25 20:36:45 -05:00
Seth Call
45c61ad038
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 19:27:47 +00:00
Seth Call
7a41b74549
* VRFS-1228
2014-02-25 19:22:32 +00:00
4e24b51fe9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 08:32:13 -06:00
1322f72e64
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 07:23:10 -05:00
2163e0172f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 06:17:58 -06:00
Seth Call
686a0980e6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 05:41:47 +00:00
Seth Call
7753a2d4b3
* VRFS-1228 - can add, but not update ,user biography
2014-02-25 05:41:43 +00:00
e9e57c71de
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 00:37:13 -05:00
a873ab29e7
VRFS-1231 fix user/track display on landing pages
2014-02-25 00:36:53 -05:00
b36e87e29f
VRFS-733 disabled validation fail when sessions exist until tests can pass
2014-02-25 04:25:22 +00:00
39b209dfc3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-24 21:51:11 -06:00
8d72f48915
get_work data model
2014-02-24 21:50:58 -06:00
9d3ee833a1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 03:29:38 +00:00
Seth Call
051fcd8b04
* working around conn.update
2014-02-25 03:25:34 +00:00
b33206683b
merged updates
2014-02-24 15:22:26 -06:00
f69cdc3b4d
fix problem with locidispid being int instead of bigint; add scores; flush use of prepared statements for geoip stuff; implement connection manager update of connection and user records with location information
2014-02-24 15:19:46 -06:00
Seth Call
e4718652fd
* merging
2014-02-24 16:57:01 +00:00
Seth Call
0522c20e60
* VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock
2014-02-24 16:55:56 +00:00
31c7cf7b45
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-24 01:10:20 -05:00
fe5163b1fb
added active class accessor
2014-02-24 04:24:13 +00:00
7de74f89af
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 21:42:23 -06:00
69b4342731
remove puts statements
2014-02-23 21:04:02 -05:00
4b91f4493c
VRFS-773 added validation check to ensure users cannot connect to multiple music sessions unless they are admin
2014-02-24 01:46:38 +00:00
810b5e7911
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 17:24:40 -06:00
04dab677f9
model for geoiplocations
2014-02-23 17:24:25 -06:00
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
0a2da28ae4
VRFS-1215 must call deliver to send emails
2014-02-23 14:08:28 -05:00
f318558c4b
VRFS-1215 fix UserMailer so templates are loaded correctly
2014-02-23 13:32:03 -05:00
b0dfa5501f
data model for geoipblocks
2014-02-22 23:39:20 -06:00
74fc2f1b48
data model for jamisp table
2014-02-22 22:00:32 -06:00
Seth Call
b5934bba30
* merging in from scoring cache migrations
2014-02-22 05:11:40 +00:00
Seth Call
dae0f40929
* removed is_downloadable for VRFS-1141, from database and UI
...
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
4a9330523c
*** scoring schema migration
2014-02-21 22:21:31 -06:00
73dce2906d
fix issue with recording url construction
2014-02-20 21:02:41 -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
aab902e8cf
* VRFS-1160 - favorites REST API done
2014-02-20 20:54:35 +00:00
Seth Call
061c74f8c6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 16:28:45 +00:00
Seth Call
f353c04900
* VRFS-1135 - add unique_user_histories to MusicUserHistory, and render that in feed
2014-02-20 16:20:20 +00:00
e0ae2e378e
VRFS-1194 changed recording/session drop-down list selection to unique ID text input
2014-02-20 10:01:25 -06:00
Seth Call
db15c37a53
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 08:03:02 +00:00
Seth Call
df14676495
* VRFS-1135 - user and band targetting possible
2014-02-20 07:45:51 +00:00
069e9c8297
VRFS-1135 allow empty string to be passed in to start parameter
...
(due to jQuery not stripping null / empty params and refactor)
2014-02-20 00:29:28 -05:00
85f8bf6cad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 22:48:47 -05:00
956ff422f4
fix sidebar for recordings
2014-02-19 22:48:34 -05:00
Seth Call
3efb3fc5ab
* feed test fixes
2014-02-20 03:23:38 +00:00
Seth Call
455ddecaaa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 02:28:31 +00:00
Seth Call
6aae1ef0e6
* VRFS-1135 add time filters and type filter
2014-02-20 02:22:41 +00:00
c95a650cdc
add POST button to landing pages for comments, add like_count back to session model
2014-02-19 20:31:44 -05:00
f388f1c7e2
add likes and play count back to model...not sure how it got deleted
2014-02-19 20:06:40 -05: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
fb1adc488f
VRFS-1184 fix join
2014-02-19 00:14:00 -05:00
Seth Call
0c44842bb0
* VRFS-1173 - audio/mpeg instead of audio/mp3 in postback
2014-02-18 22:58:15 +00:00
Seth Call
4e674b312c
* VRFS-1171 - resolved by moving notification out of transaction
2014-02-18 22:35:23 +00:00
Seth Call
ec0eb4bb2a
* VRFS-1140
2014-02-18 20:12:50 +00:00
Seth Call
7449de7aad
* fix test bugs, get VRFS-1135 sorts resolved, and fix for easydropdown not destroying topmost div
2014-02-18 18:53:16 +00:00
Seth Call
e33e3a519f
* fix url problem with tracks
2014-02-18 15:35:47 +00:00
Seth Call
de294d19bb
* VRFS-1135; music session history has creator, participants, and band info now.
2014-02-18 14:24:32 +00:00
Seth Call
4808514032
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 13:35:11 +00:00
Seth Call
222bf23cc5
* VRFS-1135 sorts added to model; need to change next behavior to come from model, not controller
2014-02-18 13:34:51 +00:00
3b8e564495
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 01:27:40 -06:00
b919dbadd8
VRFS-1136 - fix / tweak infinite scroll
...
on band and musicians page.
2014-02-18 02:09:31 -05:00
b822711f1d
Merge branch 'develop' into vrfs1110
2014-02-18 00:13:26 -06:00
0b9eec4823
fixed broken tests again
2014-02-18 00:12:47 -06:00
cba678616f
fixed broken test from refactoring of followers
2014-02-17 23:38:35 -06:00
Seth Call
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00:00
Seth Call
8483239054
* pg_migrate bump to 0.1.13 with relaxed thor version
2014-02-18 03:42:42 +00:00
Seth Call
b9e20ba446
* moving recording_plays to where it belongs
2014-02-17 23:56:17 +00:00
Seth Call
51d446ab62
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-17 23:26:58 +00:00
Seth Call
5654f27b55
* merged
2014-02-17 23:26:17 +00:00
Seth Call
0218ca5ad6
* urls fixed for VRFS-1148
2014-02-17 19:12:52 +00:00
Seth Call
5ae2a769b5
* fix mix regressions due to addition of MixUploader
2014-02-17 03:56:42 +00:00
Seth Call
134974af61
* fix issue
2014-02-17 02:52:00 +00:00
Seth Call
ff6b3795ce
* merged
2014-02-17 00:32:51 +00:00
Seth Call
5ef630cf86
* in progress on next parameter VRFS-1135
2014-02-17 00:30:08 +00:00
348f96f5b0
fix bugs
2014-02-16 17:39:26 -05:00
83f347e84c
merge like/follow refactor and hover bubble work
2014-02-16 16:03:32 -05:00
ebc49b6ccc
VRFS-1028 more refactor work
2014-02-16 14:48:54 -05:00
a1828cd93d
trying to fix tests
2014-02-16 13:06:36 -05:00
Seth Call
8cfe032dc2
* adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135
2014-02-16 14:04:24 +00:00
5ba98b93ab
fixing tests in progress
2014-02-16 08:40:03 -05:00
Seth Call
f7d0ef2b05
* VRFS-1135 only one recording comes back; not per claimed recording
2014-02-16 13:10:00 +00:00
4dd15d1146
Merge branch 'develop' into vrfs1110
2014-02-16 02:32:53 -06:00
cddf9a5013
added active_latests convenience method
2014-02-16 02:31:44 -06:00
37025a68d7
VRFS-1110 changed param name; added api request support
2014-02-16 01:28:39 -06:00
36287d0b5f
VRFS-1028 hover bubble / like and follow refactor
2014-02-16 02:28:35 -05:00
b0dcb4a934
VRFS-1110 add autocomplete tests
2014-02-16 00:17:56 -06:00
c173582aa3
more work on like/follow refactor
2014-02-15 20:24:51 -05:00
c03404d520
like/follow refactor
2014-02-15 18:23:00 -05:00
Seth Call
26a8b8013d
* VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20
2014-02-15 21:19:03 +00:00
5a03ec87ae
follow/like refactor to use polymorphic associations
2014-02-15 11:55:01 -05:00
Seth Call
0fbd3543ca
* VRFS-1118 fix hidden text problem
2014-02-14 23:41:01 +00:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +00:00
Seth Call
52f9bde0a3
* taking gon to 5.0.1 for now
2014-02-13 14:19:08 +00:00
Seth Call
0f0521ccf8
* VRFS-152-replace localhost with 127.0.0.1, if present
2014-02-11 17:25:03 +00:00
Seth Call
652c56dafd
* VRFS-924 haml added
2014-02-11 15:53:20 +00:00
Seth Call
524ef6d833
* left in typo right before commit
2014-02-08 03:09:25 +00:00
Seth Call
b90bfe97ec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-08 03:07:56 +00:00
Seth Call
fa7f83a371
* VRFS-1090 all_discarded add to db schema
2014-02-08 03:05:16 +00:00
966075c885
VRFS-1034 fixed image uploading for buzz; added UI text instructing user to upload image before editing text
2014-02-07 20:26:17 -06:00
Seth Call
64de2bc4cb
* VRFS-980 - escape special characters in the filename of the avatar
2014-02-07 23:56:39 +00:00
Seth Call
7661fc5e39
* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog
2014-02-07 21:28:47 +00:00
Seth Call
e8fe86e504
* VRFS-1083 user_authorizations require user now; found some bugs
2014-02-07 17:18:57 +00:00
Seth Call
b668e54f57
* VRFS-1083 - twitter mostly working; need to deal with edge cases
2014-02-07 14:07:08 +00:00
Seth Call
1c6c1da027
* fixing associations
2014-02-06 21:41:35 +00:00
Seth Call
28c2298931
* removing set of shareable_id
2014-02-06 21:12:40 +00:00
Seth Call
9598c06e1f
* moved shareable_resolver into new controller, and made tests
2014-02-06 21:02:04 +00:00
Seth Call
4c39e45708
* merged
2014-02-06 16:35:33 +00:00
Seth Call
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
bc305cac5e
VRFS-1020 fix share token design
2014-02-06 00:45:48 -05:00
Seth Call
8c1e2c5df6
* backend handles these notfications already VRFS-1067
2014-02-04 21:21:51 +00:00
Seth Call
dab9063fb9
* backend handles these notfications already VRFS-1067
2014-02-04 21:20:30 +00:00
Seth Call
148009ece5
* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg
2014-02-04 20:28:00 +00:00
Seth Call
c3a51989fd
* changing to localhost:3000 instead of jamkazamdev.local
2014-02-04 14:40:05 +00:00
Seth Call
5df00b2883
* VRFS-1012-fixing any URLs that don't start with /client
2014-02-04 13:48:13 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
da9a001e43
fixed issues editing buzz entries
2014-02-01 21:59:25 -06:00
d92d02a361
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 21:52:40 -06:00
61de77c7e1
vrfs152: fixed broken tests
2014-02-01 21:48:46 -06:00
Seth Call
5dc376fa23
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 20:46:04 -06:00
Seth Call
7f409c2cb4
VRFS-1054 removing reload slush
2014-02-01 20:45:58 -06:00
Seth Call
6ae07fa187
* make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043)
2014-02-01 15:59:43 +00:00
Seth Call
4e89a686e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 04:51:49 +00:00
Seth Call
4ce77a44b3
* VRFS-1039 - add extension to mount name
2014-02-01 04:51:38 +00:00
Seth Call
d5478dc926
* removing force:true in IcecastConfigWriter
2014-01-31 13:19:46 -06:00
Seth Call
3517cf048b
* re-establish pg connection before/after fork
2014-01-31 12:37:43 -06:00
Seth Call
c9b58229c4
* fixing broken tests some more
2014-01-31 10:04:17 -06:00
Seth Call
3d6069bdb3
* fix broken tests
2014-01-31 09:32:18 -06:00
edebf42e73
VRFS-1020 share dialog work
2014-01-31 01:39:09 -05:00
Seth Call
b4b120aa3b
* removing first_recording_at method and allowing server_id to be modified
2014-01-30 20:43:35 -06:00
Seth Call
f1a8c1b744
* remove first_recording_at method
2014-01-30 20:39:42 -06:00
Seth Call
3a5321dc5c
* merging manifest and user
2014-01-30 15:53:22 -06:00
Seth Call
6ccfc4cc08
* VRFS-1010 possibly done
2014-01-30 15:51:05 -06:00
Seth Call
956b25c577
* fixing bug when icecast.xml exists VRFS-1010
2014-01-30 09:32:12 -06:00
c22331c010
conflict merge
2014-01-29 23:05:09 -06:00
e839c8cb69
vrfs152: moved generate_signup_url into invited_user
2014-01-29 22:48:35 -06:00
4a1ebb7630
vrfs152: added test for facebook_invite!
2014-01-29 21:37:49 -06:00
a73d4d758d
vrfs152: created one FB invite constraint
2014-01-29 21:22:37 -06:00
Seth Call
3903822ca5
* overriding lock timeout for LonelyJobs
2014-01-29 14:33:47 -06:00
Seth Call
3d453468f2
* adding ability to run everything within jam-web for jobs
2014-01-29 13:24:34 -06:00
555b53e3c3
format code
2014-01-28 10:31:57 -05:00
3ad56b4142
fix session bug
2014-01-28 10:30:16 -05:00
374a9da957
VRFS-986 landing page dev complete
2014-01-28 02:35:35 -05:00
40a8dbd89e
remove binding.pry
2014-01-26 16:48:15 -05:00
Steven Miers
Seth Call
Jonathan Kolyer
Brian Smith
Brian Smith
root
Bert Owen
Scott Comer
Anthony Davis
Daniel Weigh