a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
4c2d4958fe
VRFS-2894 Update email / user info in recurly upon finalize. Test to verify.
2015-03-31 20:25:54 -05:00
ddc4decfd3
merging feature/musician_profile_enhancements
2015-03-30 06:07:43 +00:00
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
Seth Call
0848a59082
* merged develop again
2015-03-25 14:32:03 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04:00
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00: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
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
Seth Call
f2b453ea19
* VRFS-2917 - shopping cart can be anonymous
2015-03-11 20:55:11 -05: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
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00: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
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
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
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06:00
babd9d7d90
VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify.
2015-01-12 12:41:44 -06:00
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
e9e9962c42
Conflicts:
...
db/manifest
ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -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
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
786486026b
* wip
2014-12-30 17:10:16 -06: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
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
Seth Call
76adc44a50
* wip
2014-11-17 17:16:30 -06:00
Seth Call
b780b4a462
* merged
2014-11-17 13:32:13 -06:00
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06: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
c6bfd59999
VRFS-2462 fixed session count on musician hover bubble
2014-11-07 13:05:07 -05:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
Seth Call
fe7edbba5d
* many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181
2014-10-22 23:10:49 -05:00
a8987efaa1
VRFS-2337 added latency badge to musician hover bubble
2014-10-19 21:18:05 -04:00
160108a217
Merge video_mvp branch
2014-10-07 11:33:34 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05: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
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
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
4bdcf103ce
VRFS-2136 only return recordings that have at least 1 claimed recording
2014-09-11 21:52:26 -04:00
f39312662d
VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @
2014-08-27 23:36:57 -04: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
Seth Call
2dd6153ed8
* wip on score export
2014-07-26 14:18:17 -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
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
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05: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
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
f4b4734c94
VRFS-1669 find session work
2014-06-23 00:58:37 -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
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
a557e9966a
VRFS-1749 more session info tests / fix "deprecated" warnings
2014-06-14 13:13:45 -04: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
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
3b3776f065
get score from Search.musician_filter into json sent to client
2014-05-29 13:03:33 -05:00
ebfe72e11d
fix tests for scoring musician search
2014-05-28 21:19:50 -05:00
7446898071
added tests for new_musicians
2014-05-26 14:16:01 -05:00
836baee962
merging with develop
2014-05-21 21:55:26 +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
7428a2f26b
VRFS-1664 new musician weekly email
2014-05-16 07:58:06 +00:00
79136d2127
correct weirdness in how user location is set
2014-05-12 21:13:16 -07: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
732fd66f0e
* all tests pass; but need to now rename music session tables to match class names...
2014-05-06 16:17:26 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
bf04fca205
VRFS-1503 implement session chat feature
2014-05-03 00:30:56 +08: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
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
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
937efed3e5
VRFS-1576 affiliate_partner model
2014-04-20 22:54:49 +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
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
accaa99e38
VRFS-1483 integrating opt-out; fixing tests
2014-04-01 14:42:26 +00: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
e29907f09b
merging
2014-03-19 18:44:35 +00:00
eecdbebf3d
VRFS-1483 integrating admin interface
2014-03-19 18:42:28 +00: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
b9ee475db5
* working on event page
2014-03-10 06:31:20 +00: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
Seth Call
7753a2d4b3
* VRFS-1228 - can add, but not update ,user biography
2014-02-25 05:41:43 +00:00
956ff422f4
fix sidebar for recordings
2014-02-19 22:48:34 -05: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
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
5ba98b93ab
fixing tests in progress
2014-02-16 08:40:03 -05:00
36287d0b5f
VRFS-1028 hover bubble / like and follow refactor
2014-02-16 02:28:35 -05: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
5a03ec87ae
follow/like refactor to use polymorphic associations
2014-02-15 11:55:01 -05:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +00: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
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
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00: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
c22331c010
conflict merge
2014-01-29 23:05:09 -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
998ebfdc6c
VRFS-986 landing page sidebar complete / session landing fixes
2014-01-26 16:46:41 -05:00
30b13ed538
merge develop
2014-01-22 21:21:40 -05:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
aa056d53fd
VRFS-986 recent history sidebar for landing pages
2014-01-21 01:45:51 -05:00
3d75f8dd97
vrfs-988: refactoring search as text by entity, rather than site-wide
2014-01-11 06:26:40 -06:00
Seth Call
45a18c4449
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-06 20:35:41 +00:00
Seth Call
ba3b9ab873
* VRFS-946 - in-session recording
2014-01-05 03:47:23 +00:00
7e78163bb9
VRFS-933 notification work
2013-12-28 23:51:35 -05:00
fcd093f5a6
vrfs737: added first_recording_at
2013-12-21 23:23:33 -06:00
4b3b8491b3
vrfs-916: added favorite_count method
2013-12-18 22:10:55 -06:00
4e136659e8
vrfs-916: added following? method
2013-12-18 17:48:55 -06:00
1d0b07cbe1
vrfs-775: fixed arg handling in new musicians email
2013-11-27 23:35:16 -06:00
c792b5216a
vrfs-775: tuning the new musician email
2013-11-26 08:40:06 -06:00
cde19cde56
vrfs-775: formatting new musicians email
2013-11-26 03:08:22 -06:00
ee9b203f99
vrfs-775: integrating new musician emails
2013-11-26 00:03:42 -06:00
58bed4bc04
vrfs774: added musicians_geocoded scope
2013-11-23 06:15:49 -06:00
432e5ad59b
vrfs-774: added musicians scope
2013-11-23 01:44:13 -06:00
Seth Call
95bc077634
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
2013-11-16 14:05:23 +00:00
Brian Smith
Steven Miers
Jonathan Kolyer
Seth Call
Scott Comer
Bert Owen
Brian Smith