Brian Smith
|
709150edac
|
Merge branch 'develop' into feature/rsvp_slot_conflict
|
2014-10-26 12:41:17 -04:00 |
Brian Smith
|
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
|
48dea5688e
|
* commit out fault audiomixer tests
|
2014-10-25 09:07:20 -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 |
Brian Smith
|
d8a8a0d33b
|
remove byebug reference
|
2014-10-21 19:51:55 -04:00 |
Jonathan Kolyer
|
af2159fe72
|
VRFS-1945 added create_type to music_sessions; filtering session search based on create_type
|
2014-10-21 07:27:26 +00:00 |
Brian Smith
|
a8987efaa1
|
VRFS-2337 added latency badge to musician hover bubble
|
2014-10-19 21:18:05 -04:00 |
Steven Miers
|
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 |
Steven Miers
|
e3dadf9c4b
|
VRFS-2032 : Youtube test account app name/developer key.
|
2014-10-15 15:17:03 -05:00 |
Steven Miers
|
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 |
Steven Miers
|
d95a063648
|
VRFS-2029 : Rails model attribute for upload_to_youtube flag
Also includes Rails validation.
|
2014-10-15 13:45:30 -05:00 |
Steven Miers
|
077d3f4253
|
VRFS-2033 - YouTube client library
|
2014-10-15 12:25:05 -05:00 |
Steven Miers
|
5691fbc51f
|
Require new scheduled_music_session_cleaner at class level.
Fixes broken unit test.
|
2014-10-14 14:54:18 -05:00 |
Brian Smith
|
3641521740
|
VRFS-2244 handle duplicate friend requests better
|
2014-10-14 02:12:33 -04:00 |
Jonathan Kolyer
|
649027cda7
|
VRFS-2282 tests and music session time queries
|
2014-10-14 03:54:58 +00:00 |
Jonathan Kolyer
|
6f27455b02
|
Merge branch 'develop' into VRFS-2282
|
2014-10-13 16:18:47 +00:00 |
Brian Smith
|
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 |
Seth Call
|
078de098ce
|
* fix test
|
2014-10-13 09:48:34 -05:00 |
Brian Smith
|
257421a1d0
|
VRFS-2318 show JOIN button for non-scheduled (future) session
|
2014-10-13 08:40:10 -04:00 |
Jonathan Kolyer
|
9f869f200f
|
VRFS-2282 added resque schedule cleaner test
|
2014-10-13 02:32:45 +00:00 |
Jonathan Kolyer
|
95b26e9c00
|
Merge branch 'develop' into VRFS-2282
|
2014-10-13 02:15:01 +00:00 |
Jonathan Kolyer
|
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 |
Jonathan Kolyer
|
26b124dde8
|
VRFS-2282 first pass purging stale sessions
|
2014-10-12 07:49:31 +00:00 |
Brian Smith
|
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 |
Brian Smith
|
bdd8c6db5a
|
VRFS-2219 activate session in feed when the active_music_session record is created
|
2014-10-11 08:53:26 -04:00 |
Steven Miers
|
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 |
Brian Smith
|
d08475c34e
|
VRFS-2321 comment out session join email notification
|
2014-10-08 20:27:28 -04:00 |
Jonathan Kolyer
|
f06ef0c716
|
VRFS-1430 fixed broken tests
|
2014-10-08 03:48:05 +00:00 |
Brian Smith
|
b30d71de6a
|
VRFS-2320 use from_user_mailer template for session comment
|
2014-10-07 21:16:56 -04:00 |
Brian Smith
|
eddd8a526c
|
VRFS-2320 include from user info in session comment emails
|
2014-10-07 20:39:13 -04:00 |
Steven Miers
|
9473ffa352
|
Merge branch 'feature/video_mvp' into develop
|
2014-10-07 17:37:06 -05:00 |
Steven Miers
|
e26c254d36
|
VRFS-2028 : Tests for verifying both types are there and have expected attributes in the hash.
I.E., type is “recorded_track” or “recorded_video” as appropriate, and
videos have client_video_source_id attribute. Also test pagination.
|
2014-10-07 15:36:16 -05:00 |
Steven Miers
|
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 |
Steven Miers
|
160108a217
|
Merge video_mvp branch
|
2014-10-07 11:33:34 -05:00 |
Brian Smith
|
bffba5fcbc
|
VRFS-2219 changes based on Seth code review
|
2014-10-06 21:03:19 -04:00 |
Steven Miers
|
e25e3b16a9
|
VRFS-2027: Create video recordings from source in ApiRecordingsController#start
Also includes spec.
|
2014-10-06 18:17:08 -05:00 |
Steven Miers
|
8ec75bb4e7
|
VRFS-2025 : Specs for video_sources park.
|
2014-10-06 17:02:33 -05:00 |
Steven Miers
|
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 |
Steven Miers
|
47490ea3d9
|
VRFS-2025 Incremental
|
2014-10-06 16:17:46 -05:00 |
Steven Miers
|
dffdb78f71
|
Merge develop into this branch.
|
2014-10-06 16:17:36 -05:00 |
Seth Call
|
d5eeb03bd3
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-10-06 09:37:04 -05:00 |
Seth Call
|
993074b136
|
* pinning back devise
|
2014-10-06 09:36:55 -05:00 |
Brian Smith
|
7856e43f1e
|
VRFS-2219 active sessions should sort to top of Feed
|
2014-10-06 09:20:31 -04:00 |
Brian Smith
|
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 |
Steven Miers
|
66feb39de8
|
VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track.
|
2014-10-03 14:12:09 -05:00 |
Steven Miers
|
5135fe7faf
|
VRFS-2024 - Migration, model and spec for video source.
|
2014-10-03 13:36:51 -05:00 |
Jonathan Kolyer
|
3080a92096
|
VRFS-1430 merge conflict correction
|
2014-10-01 22:12:48 +00:00 |
Jonathan Kolyer
|
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
|
40506afaa0
|
* fix score tests
|
2014-10-01 09:55:51 -05:00 |
Seth Call
|
8889b8ce42
|
* merge in faster score searches (VRFS-2202)
|
2014-09-30 10:51:23 -05:00 |
Brian Smith
|
6442674c91
|
VRFS-2216 fix tests; include pending RSVPs and invites for session details screen
|
2014-09-28 22:37:52 -04:00 |
Brian Smith
|
a07fdfe2a8
|
Merge branch 'develop' into feature/sprint_12_work
|
2014-09-28 12:00:32 -04:00 |
Brian Smith
|
38b336c707
|
VRFS-2216 fix issue with sms_index function
|
2014-09-28 11:59:59 -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 |
Brian Smith
|
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 |
Seth Call
|
350f7ae19a
|
* poke for build
|
2014-09-24 09:15:52 -05:00 |
Brian Smith
|
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 |
Brian Smith
|
096c43c0e4
|
Merge branch 'develop' into feature/sprint_12_work
|
2014-09-19 00:25:20 -04:00 |
Brian Smith
|
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
|
0db38e17d6
|
* adding tests for VRFS-2221
|
2014-09-17 10:22:05 -05:00 |
Seth Call
|
6b96bdcd05
|
* VRFS-2221 - fix bad reconnect path
|
2014-09-17 10:22:00 -05:00 |
Brian Smith
|
1203a26271
|
Merge branch 'develop' into feature/opt_out_notification_fix
|
2014-09-15 23:02:53 -04:00 |
Brian Smith
|
4ddd4e4c13
|
VRFS-2066 fixed some issues with session landing and feed
|
2014-09-14 19:17:16 -04:00 |
Brian Smith
|
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 |
Brian Smith
|
f296932f27
|
fix more session join/leave bugs
|
2014-09-14 15:12:25 -04:00 |
Brian Smith
|
e5a6ad862b
|
fix notification bugs - active_music_session vs. music_session confusion
|
2014-09-14 14:41:32 -04:00 |
Brian Smith
|
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
|
9824fa2c61
|
* VRFS-2159 - rewriting some expectations for build server
|
2014-09-12 22:45:07 -05:00 |
Seth Call
|
2bd189b697
|
* VRFS-2159 merge
|
2014-09-12 22:30:51 -05:00 |
Brian Smith
|
d8d987e21f
|
VRFS-2179 send email to friends/followers when user joins a session
|
2014-09-12 22:57:03 -04:00 |
Brian Smith
|
a47ffea5ad
|
VRFS-2136 added tests
|
2014-09-12 22:34:59 -04:00 |
Brian Smith
|
4bdcf103ce
|
VRFS-2136 only return recordings that have at least 1 claimed recording
|
2014-09-11 21:52:26 -04:00 |
Brian Smith
|
c55413d349
|
added more tests, minor refactor, only send scheduled session notifications if target user is online
|
2014-09-11 21:29:48 -04:00 |
Brian Smith
|
632d806825
|
remove debug statement
|
2014-09-11 09:04:14 -04:00 |
Brian Smith
|
abc8f18c00
|
VRFS-2140 added more tests, fixed bug in band recording notification
|
2014-09-11 09:03:32 -04:00 |
Brian Smith
|
71487d989b
|
Merge branch 'develop' into feature/opt_out_notification_fix
|
2014-09-11 08:38:56 -04:00 |
Brian Smith
|
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 |
Brian Smith
|
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
|
cab20ba017
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-09-08 21:39:04 -05:00 |
Seth Call
|
406c86be29
|
* VRFS-2098 - protect against dup sessions showing up in daily email
|
2014-09-08 21:38:35 -05:00 |
Brian Smith
|
d547e4c2d6
|
VRFS-2094 fix tests
|
2014-09-08 22:23:35 -04:00 |
Brian Smith
|
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 |
Brian Smith
|
07024a44a6
|
VRFS-2094 wip notation upload bug fixes
|
2014-09-08 09:13:20 -04:00 |
Brian Smith
|
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
|
f0304f2ca3
|
* VRFS-1981 - delete old scores
|
2014-08-31 22:24:11 -05: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 |
Brian Smith
|
f39312662d
|
VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @
|
2014-08-27 23:36:57 -04:00 |
Brian Smith
|
82090f5f55
|
VRFS-2072 copy all 1-time cancellations instead of just the first
|
2014-08-24 15:12:38 -04:00 |
Brian Smith
|
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
|
3daedbd549
|
* wip
|
2014-08-19 10:07:21 -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 |
Brian Smith
|
25e3f23dcf
|
VRFS-1891 VRFS-2022 bug fixes / test additions
|
2014-08-15 00:32:45 -04:00 |
Brian Smith
|
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 |
Brian Smith
|
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 |
Brian Smith
|
e8847280bc
|
VRFS-1995 do not send notifications to users with canceled RSVPs
|
2014-08-12 02:20:25 -04:00 |
Brian Smith
|
dece2afc1b
|
VRFS-1478 fix bugs
|
2014-08-12 00:24:57 -04:00 |
Brian Smith
|
cc26969f8a
|
VRFS-1891 cancel RSVP flow fix
|
2014-08-09 23:22:17 -04:00 |
Brian Smith
|
fd9893ca42
|
Merge branch 'develop' into hotfix/cancel_rsvp_flow
|
2014-08-09 18:35:23 -04:00 |
Brian Smith
|
f97a416867
|
VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog
|
2014-08-08 02:22:32 -04:00 |
Jonathan Kolyer
|
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
|
2aab3c902d
|
* fixing test that failed on build server
|
2014-07-30 17:29:26 -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 |
root
|
915bb4ad13
|
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
|
2014-07-30 07:13:19 +02:00 |
Brian Smith
|
93cef4e0cd
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-07-29 22:46:14 -04:00 |
Brian Smith
|
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 |
Brian Smith
|
d3b22afe16
|
schedule sessions that are at least 4 hours old
|
2014-07-29 22:40:42 -04:00 |
Brian Smith
|
0a075da783
|
VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester
|
2014-07-29 22:07:46 -04:00 |
Brian Smith
|
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 |
root
|
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 |
Jonathan Kolyer
|
e87ae50dfe
|
VRFS-1942 tuning admin view
|
2014-07-26 04:10:40 +00:00 |
Jonathan Kolyer
|
d28a65c5ff
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-07-26 03:59:11 +00:00 |
Jonathan Kolyer
|
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
|
55e304e109
|
* try to fix millisecond sensitivity in rspec matcher
|
2014-07-22 14:46: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
|
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 |
Jonathan Kolyer
|
ecf4b6f397
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-07-21 05:14:11 +00:00 |
Jonathan Kolyer
|
b4ab41637c
|
VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration
|
2014-07-21 05:14:05 +00:00 |
Jonathan Kolyer
|
25cff163dc
|
VRFS-1874 added query constraint to filter out users with last_jam_locidispid = NULL
|
2014-07-21 05:12:07 +00:00 |
Brian Smith
|
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
|
75b2f21823
|
* adding support for opting out of transaction cleaner for tests that make transactions
|
2014-07-19 21:35:48 -05: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 |
Bert Owen
|
5027000c49
|
VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP
|
2014-07-16 20:19:43 +02:00 |
Bert Owen
|
590e6d8028
|
VRFS-1926 fixed, fix scheduled session query
|
2014-07-16 18:21:21 +02:00 |
Seth Call
|
9b29189cc0
|
* VRFS-1922 - trying to fix test
|
2014-07-14 17:25:20 -05: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 |
Bert Owen
|
26f7d2755b
|
VRFS-1918 Session Details Update Screen - once over with tests
|
2014-07-14 20:40:00 +02:00 |
Brian Smith
|
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 |
Brian Smith
|
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 |
Brian Smith
|
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 |
Brian Smith
|
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 |
Brian Smith
|
4872c037ad
|
added field to approved_rsvps method per request from Bert
|
2014-07-05 21:51:45 -04:00 |
Seth Call
|
b96cc32d3c
|
* VRFS-1858 use open_rsvp instead of music_access for scheduled session
|
2014-07-04 08:26:46 -05:00 |
Seth Call
|
9cb702f9de
|
* VRFS-1858 - fix sessions with no scheduled_start time being filtered
|
2014-07-03 22:47:11 -05:00 |
Seth Call
|
eecc402744
|
* pin faker to 1.3.0
|
2014-07-03 20:52:36 -05:00 |
Seth Call
|
3f53cb9819
|
* removing jquery draggable from web and landing
|
2014-07-03 17:53:16 -05:00 |
Brian Smith
|
4e1a68f344
|
VRFS-1855 fixed Create / Find Session issues related to open RSVPs
|
2014-07-03 00:51:54 -04:00 |
Bert Owen
|
421d183ba3
|
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
|
2014-07-02 15:57:55 +02:00 |
Bert Owen
|
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 |