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
Steven Miers
Brian Smith
Seth Call
Jonathan Kolyer
Scott Comer