seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
7,135 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

7135 Commits

Author SHA1 Message Date
Nuwan f1f64aedb1 skip api_signed_in_user for auth in api_music_sessions_controller 2021-04-27 23:52:31 +05:30
Nuwan Chaturanga 9f924fee3c Merged in VRFS-5166-ad_campaigns_report_fixes_3 (pull request #21) 
ad_campaigns.rb fixes

Approved-by: Seth Call
 2021-04-27 16:57:18 +00:00
Nuwan eb3064f8aa ad_campaigns.rb fixes 2021-04-27 22:21:34 +05:30
Nuwan Chaturanga f9e3e644f1 Merged in VRFS-5147-user_view_edit_improvements (pull request #17) 
changes to user show and edit pages ref: VRFS-5147

* changes to user show and edit pages ref: VRFS-5147

Approved-by: Seth Call
 2021-04-26 12:19:08 +00:00
Nuwan Chaturanga 316cbdab83 Merged in VRFS-5146-school_user_form (pull request #16) 
new admin form to quickly add school user

* new admin form to quickly add school user

* add required: true to all form fields in quick add school user
 2021-04-23 17:10:01 +00:00
Nuwan Chaturanga 3a248df971 Merged in VRFS-5144-deleted_user_improvements (pull request #15) 
exclude deleted users from search

Approved-by: Seth Call
 2021-04-22 21:55:17 +00:00
Nuwan 37c5cab83f exclude deleted users from search 
exclude deleted musicians and fans from search results
 2021-04-22 17:14:35 +05:30
Nuwan Chaturanga c2fe4ffb98 Merged in VRFS-5128_report_for_ad_campaigns (pull request #14) 
VRFS-5128 report for ad campaigns

* Ad campaign report

add new admin report for monitor and analyze the results
from a variety of paid campaigns

* reload report after updating values using best_in_place

* add users first_subscribed_plan_code

use this new column in ad campaigns report to filter by
subscription plan

* set first_subscribed_plan_code in recurly subscription creation

* set correct value for first_subscribed_plan_code
 2021-04-21 21:27:55 +00:00
Nuwan Chaturanga 253d82a32c Merged in VRFS-5099_clean_up_dump_paths (pull request #12) 
VRFS-5099 clean up dump paths

Approved-by: Seth Call
 2021-04-16 21:24:10 +00:00
Nuwan 098e828d0f refactor crash_dump 2021-04-16 05:16:22 +05:30
Nuwan Chaturanga da8133bd8f Merged in VRFS-5123_change_video_button_url (pull request #13) 
change video_btn url generation

Approved-by: Seth Call
 2021-04-15 10:51:50 +00:00
Nuwan e3fb76cb54 change video_btn url generation 
directly call the video conferencing server url API
and bind that value to the button click handler
 2021-04-15 14:02:18 +05:30
Nuwan ba9a91eb1f crash_dump fix test error in content_type 2021-04-13 01:19:03 +05:30
Seth Call 714dab3e8d default conf host 2021-04-12 13:51:32 -05:00
Nuwan eae35db92d refactor crash_dump in users api 2021-04-13 00:20:46 +05:30
Seth Call 95483b759f fix bundler 2021-04-11 14:01:49 -05:00
Nuwan Chaturanga dccd971d2e Merged in VRFS-5004-revamp_notification (pull request #11) 
VRFS-5004 revamp notification
 2021-04-11 18:50:51 +00:00
Seth Call 940470dbc3 done 2021-04-11 13:33:59 -05:00
Nuwan Chaturanga f42fc31c03 Merged in VRFS-5005-open_video_conf_page (pull request #10) 
VRFS-5005 open video conf page

Approved-by: Seth Call
 2021-04-11 16:44:01 +00:00
Nuwan b574b5e0c6 Support optional video server 2021-04-11 11:42:01 -05:00
Seth Call 43aae66fb2 add in wp changes 2021-04-10 20:49:49 -05:00
Nuwan 9711a9a666 change to notification toast and sidebar 
* show 3 notification toasts instead of one
* open notification tray automatically for for priority notifications
 2021-04-10 08:15:51 +05:30
Seth Call c6d1e0b466 add exception 2021-04-03 09:40:41 -05:00
Seth Call 2000dc0663 more debugging 2021-04-02 17:05:48 -05:00
Seth Call 09233022ac debug print 2021-04-02 13:26:01 -05:00
Seth Call 2b229f0409 still confused 2021-04-02 11:55:05 -05:00
Seth Call 4d797c48a1 remoove ver qualifier 2021-04-02 11:23:03 -05:00
Seth Call 421e335315 check 2021-04-01 23:15:10 -05:00
Nuwan 4db1c3b686 for testing enable video capability of the client 2021-03-29 14:44:02 +05:30
Seth Call 6f27f40962 Fix the notification highlighter tests 2021-03-28 23:29:42 -05:00
Seth Call cf4f5c89e0 session_video_spec 2021-03-28 17:34:32 -05:00
Seth Call dcbf52a88b ignore extra args when test env 2021-03-24 20:18:18 -05:00
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