Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,834 Commits 1 Branch 0 Tags
90d29550bb69a4d4d5c13aafcba0ce6cb80682ea
Commit Graph

17694 Commits

Author SHA1 Message Date
Douglas Hall
5ccd465d85 Merge pull request #17304 from edx/douglashall/ENT-854 
ENT-854 Add django-fernet-fields to requirements.
 2018-01-25 13:56:24 -05:00
Douglas Hall
d158da2792 ENT-854 Add django-fernet-fields to requirements. 2018-01-25 11:05:18 -05:00
Eric Fischer
aa44292890 render discussion_profile_page as a fragment 2018-01-25 10:08:08 -05:00
Jeremy Bowman
7c2826b8e8 Merge pull request #17300 from edx/jmbowman/PLAT-1899 
PLAT-1899 Fix some issues running under Django 1.10+
 2018-01-25 09:39:26 -05:00
Dennis Jen
d3d64970c3 Merge pull request #17263 from caesar2164/update-course-about-date-conditionals 
Updates course about date conditionals
 2018-01-25 08:23:35 -05:00
AlasdairSwan
cc7431526f Merge pull request #17301 from edx/alasdair/learner-analytics-dashboard-week-streak-tweak 
Update to week streak display logic
 2018-01-25 08:20:05 -05:00
Albert (AJ) St. Aubin
f07880bb38 Merge pull request #17297 from edx/aj/LEARNER-3629_refactor 
Refactor of the CourseEntitlement Refund API to handle refund failures
 2018-01-25 07:13:44 -05:00
Adeel Khan
d9d4ae5535 Fix invalid certificate page for a11y and translation. 
Invalid certificate page has hardcoded lang='en' for
html, that would cause a11y issue for other languages user.
Some of screen reader text is not under translation. This patch
would fix both issues.

LEARNER-3110
 2018-01-25 14:02:12 +05:00
John Eskew
d21a098280 Merge pull request #17146 from open-craft/clemente/move-heartbeat-settings-to-env 
Allow customizing heartbeat checks
 2018-01-24 20:21:51 -05:00
AlasdairSwan
6f1d41c171 Update to week streak display logic 2018-01-24 18:56:06 -05:00
Giulio Gratta
f7795f8a68 Updates course about date conditionals 
- Formatted date start strings can contain unicode, so six.string_types is a better `is_instance` check
- "end_date" is no longer a required key in the `get_course_about_section` dictionary, so that check can fail and is bad.
 2018-01-24 13:11:48 -08:00
Jeremy Bowman
ff4732bcf6 PLAT-1899 Fix some issues running under Django 1.10+ 2018-01-24 16:04:28 -05:00
Albert St. Aubin
f0436aa832 Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-24 14:46:58 -05:00
Brian Mesick
bffd906909 Merge pull request #17115 from edx/bmedx/django111_cms_test_failures 
Fixes to CMS failures in Django 1.11 tests
 2018-01-24 14:46:52 -05:00
Jeremy Bowman
ebc54c8f1a PLAT-1890 Fixed assorted ModifyingEnforceTypeWarning warnings 2018-01-24 11:49:42 -05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Harry Rein
2935578b9a Merge pull request #17294 from edx/HarryRein/a11y-footer-upgrade-div 
Ensuring div and not button inside link tag for a11y.
 2018-01-24 11:18:04 -05:00
Matthew Piatetsky
d716d7409c Merge pull request #17293 from edx/bundles_dashboard_fix 
Bundles dashboard fix
 2018-01-24 10:21:02 -05:00
Michael Frey
90bb8af3c6 Merge pull request #15618 from open-craft/bdero/failed-password-reset-email 
Add optional password reset failure emails
 2018-01-24 10:06:16 -05:00
Michael Frey
51499e2c4b Merge pull request #15921 from open-craft/haikuginger/advertised-start-date-courseware-detail-page 
Show advertised start date on course details page
 2018-01-24 10:04:57 -05:00
Harry Rein
98b8eaf27e Ensuring div and not button inside link tag for a11y. 2018-01-24 10:01:50 -05:00
Saleem Latif
4ed64ee5d0 Fix styling of enterprise sidebar on registration page. 2018-01-24 14:28:04 +05:00
Tasawer Nawaz
f16cfea801 update help link in header 
LEARNER-2437
 2018-01-24 11:53:06 +05:00
Matthew Piatetsky
8cf1e04781 Add screenshots 2018-01-23 17:51:03 -05:00
Matthew Piatetsky
eeb05406a0 fix list price on bundle button 2018-01-23 17:46:55 -05:00
Jae Bradley
6bfb9c9478 Merge pull request #17291 from edx/mobile-learner-analytics-modal 
Make Learner Analytics Test Modal Mobile Responsive
 2018-01-23 16:48:30 -05:00
Jae Bradley
7fb4ca5ce1 Merge pull request #17284 from edx/jaebradley/LEARNER-3945 
LEARNER-3945: Add try/catch in Learner Analytics View
 2018-01-23 15:48:06 -05:00
jaebradley
a2cc48d37d fix mobile responsive modal 
fix errors
 2018-01-23 15:38:37 -05:00
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00
AlasdairSwan
77d254dcad LEARNER-3935 Style updates 2018-01-23 11:28:06 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls 
add comment

update jsx comment

simplify try block and update comment

fix comment
 2018-01-23 11:10:04 -05:00
AlasdairSwan
1b11f055a4 Merge pull request #17283 from edx/alasdair/LEARNER-3935-learner-analytics-dashboard-tweaks 
LEARNER-3935 Last minute updates
 2018-01-23 10:30:20 -05:00
AlasdairSwan
8be1079186 Last minute updates 2018-01-23 09:14:33 -05:00
Michael Frey
47272087cf Merge pull request #17247 from caesar2164/problem-loading-spinner 
Add FA loading spinner to each problem
 2018-01-23 08:24:58 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00
rabia23
96df2eb35e EDUCATOR-2147 update message info for Community TA's in Membership Dashboard 2018-01-23 10:04:22 +00:00
Harry Rein
e3e363a342 Merge pull request #17274 from edx/HarryRein/a11y-issues-verification-sock 
LEARNER-3055: Clean up a11y issues on the verification sock
 2018-01-22 16:18:36 -05:00
Christopher Lee
3959509696 Merge pull request #17242 from edx/clee/optimizely 
Disable optimizely for xblocks for the mobile app
 2018-01-22 15:36:20 -05:00
Harry Rein
9dab9d2c20 a11y issues on upgrade footer. 
LEARNER-3055
 2018-01-22 13:14:47 -05:00
Harry Rein
d5e6ddc4f0 Fixing alignment of View Course button on course dashboard. 2018-01-22 12:07:47 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00
Sofiya Semenova
b3294bdea1 Merge pull request #17240 from edx/sofiya/ed-2140 
Video completion recording does not happen at the end of the video
 2018-01-22 11:38:00 -05:00
Ahsan Ulhaq
3b0f16649d Increase rate-limit rate 
LEARNER-3858
 2018-01-22 12:57:58 +05:00
Jose Antonio Gonzalez
cd2a31aacc set default course visibility in catalog 2018-01-22 08:35:57 +02:00
Nimisha Asthagiri
dd136b457b Merge pull request #17197 from edx/arch/cert-import-signals-cleanup 
Certificates: clean up imports and signals
 2018-01-20 09:32:59 -05:00
Ned Batchelder
c71530558e Merge pull request #17245 from caesar2164/separate-file-index-overlay 
Move default overlay content to themable file
 2018-01-19 16:55:55 -05:00
Ned Batchelder
64a72397bc Merge pull request #17246 from caesar2164/separate-file-index-promo-video 
Move default Promo Video html to themable file
 2018-01-19 16:55:37 -05:00
Giulio Gratta
2ceda12346 Move default Promo Video html to themable file 2018-01-19 12:51:15 -08:00
Giulio Gratta
234c20b202 Move default overlay content to themable file 2018-01-19 12:48:08 -08:00
Nimisha Asthagiri
dd20106c8b Quiet quality 2018-01-19 15:12:29 -05:00