Commit Graph

7253 Commits

Author SHA1 Message Date
Seth Call 1f862baccf make tests go a little faster 2021-03-24 20:12:38 -05:00
Nuwan f6074d75d8 more fixes to spec 2021-03-24 19:23:33 +05:30
Nuwan 5db2cdeca4 fixing test driver related errors in notification_highlighter_spec 2021-03-24 18:47:16 +05:30
Seth Call 49ab06180d skip_repatcha pass through to method 2021-03-19 15:27:51 -05:00
Seth Call bb0de9570d skip recaptcha 2021-03-19 11:57:52 -05:00
Nuwan Chaturanga b1484f0a71 Merged in VRFS-5011-fix_landing_signup_error (pull request #9)
VRFS-5011 fix landing signup error

Approved-by: Seth Call
2021-03-19 15:29:18 +00:00
Nuwan 69d4a01298 Update landing page to match spec 2021-03-19 10:22:31 -05:00
Seth Call fc7a685423 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2021-03-17 20:51:38 -05:00
Seth Call 7a5c731b25 Fix bug with affiliate links and also move paypal.me text 2021-03-17 20:51:32 -05:00
Nuwan Chaturanga b9b62f1661 Merged in VRFS-5012_fix_nil_error_in_admin_affiliate_cohorts (pull request #8)
fix error cause by nil partner_user in admin affiliate_cohorts

Approved-by: Seth Call
2021-03-17 22:18:03 +00:00
Nuwan c5e7b37420 fix error cause by nil partner_user in admin affiliate_cohorts 2021-03-17 15:05:33 +05:30
Seth Call 8b94c17d0e Remove bugsnag hit 2021-03-16 15:23:56 -05:00
Seth Call 86a7994d02 don't count refunds 2021-03-16 13:34:50 -05:00
Seth Call 30a3fce222 fix affiliate rate cut 2021-03-16 10:09:55 -05:00
Nuwan Chaturanga d8f7582790 Merged in VRFS-4993_signup_and_download_page_changes (pull request #6)
VRFS-4993 signup and download page changes

Approved-by: Seth Call
2021-03-16 14:00:51 +00:00
Seth Call ad7a02746b advance time better 2021-03-16 08:35:47 -05:00
Nuwan c00d75b032 fixing merge conflicts 2021-03-16 18:40:46 +05:30
Nuwan 6e51f57bff new landing pages for signup and download pages 2021-03-16 17:10:58 +05:30
Nuwan c2a3cd3cc1 remove musician radio buttons in signup form 2021-03-16 17:10:58 +05:30
Nuwan 29a4491a38 add download_spec to bin/test 2021-03-16 17:10:58 +05:30
Nuwan 9ab8cb276c change layout/template of signup and downloads
change to new layout for user signup and download pages.
2021-03-16 17:10:58 +05:30
Seth Call 9a0c70517b add rake_util 2021-03-15 08:59:46 -05:00
Nuwan c99d8e2dd3 remove musician radio buttons in signup form 2021-03-15 11:50:17 +05:30
Seth Call 4dbf9fa17c Bug fixes for affiliate syncing 2021-03-14 16:23:43 -05:00
Seth Call f58be87187 turn crash emails off by default 2021-03-14 09:29:29 -05:00
Seth Call 0aac1329e2 Add wordpress plugin and fix one link 2021-03-13 17:40:31 -06:00
Nuwan 8f7f7b4b68 add download_spec to bin/test 2021-03-13 12:03:32 +05:30
Nuwan 9315a3f01a change layout/template of signup and downloads
change to new layout for user signup and download pages.
2021-03-13 11:46:20 +05:30
Seth Call deadc2fd68 Update test xml and mocks to match real API 2021-03-11 20:26:15 -06:00
Nuwan Chaturanga 95dea2c6f3 Merged in change_to_affiliate_program (pull request #5)
Update affiliate program to 2021 spec.

Includes modifications to showing affiliate signups and earnings in client and affiliate cohorts in admin
2021-03-12 01:37:55 +00:00
Seth Call cf47777115 Update Affliate Code and Reports to 2021 spec
Add support to account for subscriptions
Change rate to 30%.  JamTracks 25cents
Reports updated for end users and admin
2021-03-11 19:36:14 -06:00
Seth Call c07e799fdb turn off personal feed again 2021-02-22 09:04:02 -06:00
Seth Call 201bc94947 build bump 2021-02-22 08:29:39 -06:00
Seth Call cecd09b726 Merge in develop 2021-02-21 15:09:10 -06:00
Seth Call 03fab14ef3 Add more test cases and logic changes 2021-02-21 15:07:31 -06:00
Seth Call ad2f29fe01 add executable 2021-02-14 12:10:55 -06:00
Seth Call 13b230a247 run working tests with bin/test 2021-02-14 12:10:46 -06:00
Seth Call 2058631c50 Merged VRFS-4950-add_rails_db_migrations into develop 2021-02-13 20:39:50 -06:00
Nuwan 48dfb68f89 change database migrations to be natural rails db migrations. 2021-02-13 20:17:18 -06:00
Seth Call d52755876f remove extra bullet 2021-02-13 15:26:18 -06:00
Seth Call 6f39421c74 new welcome email 2021-02-13 15:04:28 -06:00
Nuwan e8d74a119c fix session overlapped duration with other users
change calculation of MusicSessionUserHistory.duration_minutes to
exactly get the number of minutes overlapped with other user sessions.

previously it returned the entire music session time if a other user
joined in and left without staying compleyely within the session.

this commit also fixs an edge case of the query in
MusicSessionUserHistory.overlapping_connections
2021-02-11 20:17:36 +05:30
Seth Call 1e00b9b44e force false because only used by client path 2021-02-09 10:49:12 -06:00
Seth Call 6d14054310 http for natve client 2021-02-09 09:19:48 -06:00
Seth Call 7f6198299a use HTTP to sign 2021-02-08 22:58:53 -06:00
Seth Call 005e54f80b Add back in correct true check for email 2021-02-08 11:38:57 -06:00
Seth Call dc7c7a0c33 Slightly bigger 2021-02-08 10:52:01 -06:00
Seth Call 7d56d644ba fix hover 2021-02-07 22:08:51 -06:00
Seth Call e1d0fe2760 Fix notify bug; bette crash dump subject 2021-02-03 10:57:44 -06:00
Seth Call 877ea031d1 Pin sass/sass-rails 2021-02-02 08:29:30 -06:00