Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,187 Commits 1 Branch 0 Tags
c9bf6dc6b54eee75c466da87fd6e790ab9eebbe8
Commit Graph

13841 Commits

Author SHA1 Message Date
wajeeha-khalid
c9bf6dc6b5 jia/MA-1815 retrieve count for child comments 2016-04-14 13:33:34 +05:00
Amir Qayyum Khan
0d8237680c Fixed exception related to course not found for ccx 2016-04-13 21:48:12 +05:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04:00
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming 
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
 2016-04-12 10:55:04 -04:00
Diana Huang
fa61c04894 Revert "Make it impossible to click "final check" without selecting a choice" 
This reverts commit 4c83a2f0de.
 2016-04-12 10:11:15 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN 
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
 2016-04-11 15:34:29 -04:00
Nimisha Asthagiri
e343fbe99c Merge pull request #12115 from edx/naa/fix-dashboard-xss 
Fix dashboard safe template issues
 2016-04-11 13:08:34 -04:00
Nimisha Asthagiri
59b8bb54e3 Fix Dashboard safe template. 2016-04-11 12:23:22 -04:00
Nimisha Asthagiri
8e591f6323 Fix Safe template issues (again) 2016-04-11 12:23:11 -04:00
Clinton Blackburn
d6ba8839bf Stripping auth querystring from S3 URLs 
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
 2016-04-11 12:20:37 -04:00
Bill DeRusha
f4208e7c58 Revert "Safe Templatize: wiki templates" 
This reverts commit e6edba18b4.
 2016-04-11 11:53:52 -04:00
Nimisha Asthagiri
7d43e3994c Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-11 11:46:12 -04:00
Feanil Patel
3592819720 Update migration to add a dependency. 
Because this migration depends on enrollment code and that code relies on a new table.
 2016-04-08 14:51:53 -04:00
Brian Jacobel
36917398c0 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 11:41:04 -04:00
Muzaffar yousaf
31ca2a637a Merge pull request #12041 from edx/mzfr/fixup-safe-templates 
Safe  template for edxnotes.
 2016-04-08 11:46:59 +05:00
clrux
0571103bdb Merge pull request #11369 from edx/clrux/ac-223 
AC-223 updating transcript skip links
 2016-04-07 13:23:02 -04:00
Adam
810a5a79d1 Merge pull request #12072 from edx/merge-release-into-master 
Merge release into master
 2016-04-07 13:16:18 -04:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
muzaffaryousaf
03c801255f Safe template for edxnotes. 2016-04-07 15:10:38 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Awais Jibran
03925474b9 Verification Upgrade Deadline panel on course home page should not show if user is already verified 2016-04-06 12:53:31 -04:00
Awais Jibran
1799634c2e Fix certificate exception view. 
ECOM-3910
 2016-04-06 12:53:04 -04:00
Adam Palay
a254d7542a make sure email from addresses don't exceed 320 characters (TNL-4264) 
clean up and fix quality violations

since get_course can never return None, we can remove these lines
 2016-04-06 12:52:39 -04:00
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -04:00
Omar Khan
c5072d63ac Add azuread SSO button style 2016-04-06 12:51:07 -04:00
Omar Khan
07892a75f2 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-06 12:50:55 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price 
Disallow free verified course modes
 2016-04-06 12:32:00 -04:00
Douglas Hall
a9a330a0e4 Merge pull request #11021 from StraNNiKK/LTI-9 
LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack
 2016-04-06 10:10:15 -04:00
Waheed Ahmed
6a9157e409 Fixed progress page grade requirements text. 
ECOM-3127
 2016-04-06 15:37:28 +05:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page 
Introduce Pattern Library test pages
 2016-04-05 15:36:11 -04:00
John Eskew
fc1669734a Merge pull request #11947 from mitocw/fix/aq/max_enrollments_and_staff 
Excluded admins, staff and coach of master course from max enrollment
 2016-04-05 14:01:59 -04:00
Amir Qayyum Khan
58bde7f301 Excluded admins, staff and coach of master course from max enrollment 2016-04-05 21:31:54 +05:00
Kevin Falcone
905d18638b Allow migrations to run if CCX is enabled 
Without this, when CCX runs 0003 it'll invoke course_overviews while
loading a course, but that table has a model change, and the migration
has not run yet.  This ensures the course_overviews migration happens
first.
 2016-04-05 11:47:55 -04:00
Christina Roberts
d9ad47c901 Merge pull request #12026 from edx/christina/verified-track-cohort 
Automatic cohorting of verified track learners
 2016-04-05 11:12:15 -04:00
muzaffaryousaf
cc7aa349a1 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-05 10:21:25 -04:00
cahrens
18d0161556 Automaticaly move learners to verified cohort. 
TNL-4281.
 2016-04-05 10:12:03 -04:00
Nimisha Asthagiri
7639d6c3e5 Merge pull request #12032 from edx/nasthagiri/fixup-safe-template 
Fix safe template change on dashboard
 2016-04-05 09:44:26 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages 
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
 2016-04-05 09:22:14 -04:00
Renzo Lucioni
003cbd5a1d Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-05 09:09:09 -04:00
Renzo Lucioni
77a90a08ca Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-04-05 09:08:51 -04:00
Simon Chen
649e8b1158 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-04-05 09:07:56 -04:00
Renzo Lucioni
3cce6c1e46 Merge pull request #12034 from edx/renzo/discussion-topics 
Fix discussion category map for self-paced courses
 2016-04-05 08:29:49 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request 
Request API access.
 2016-04-04 22:56:49 -04:00