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

6912 Commits

Author SHA1 Message Date
Adam
7600d9b03d Merge pull request #12139 from edx/fix-certificate-display-issue 
fix issue where the wrong text appeared for certificate generation hi…
 2016-04-15 09:52:27 -04:00
Adam
f1a9f81efa Merge pull request #12148 from edx/add-logging-to-certs 
Add logging to certs
 2016-04-15 08:38:31 -04:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master 
Manually merge release into master
 2016-04-15 00:47:54 -04:00
Christina Roberts
08a8164201 Merge pull request #12155 from edx/christina/allow-multiple-random-cohorts 
Allow multiple random cohorts.
 2016-04-14 17:49:37 -04:00
cahrens
1cd54d5fb7 Rename "is_default_cohort" method. 2016-04-14 16:38:34 -04:00
Simon Chen
582debcd58 Merge pull request #12135 from edx/schen/ECOM-3195 
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
 2016-04-14 15:51:19 -04:00
Simon Chen
75951b5936 ECOM-3195 Edit the navigation header on dashboard to expose program listing page 2016-04-14 14:44:40 -04:00
Renzo Lucioni
affee69296 Manually merge release into master 2016-04-14 14:23:06 -04:00
cahrens
ce6ffe6d61 Allow multiple random cohorts. 2016-04-14 13:17:24 -04:00
Adam Palay
18474b2d18 raise 404 if non-int user is passed to cert view 2016-04-14 09:43:56 -04:00
Adam Palay
883712b25b add logging for when the cert view doesn't render (ECOM-4202) 2016-04-14 09:43:43 -04:00
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
wajeeha-khalid
a52cafcc9e Merge pull request #10973 from edx/jia/MA-1815 
jia/MA-1815 retrieve count for child comments
 2016-04-14 13:25:35 +05:00
Adam Palay
f985169225 fix issue where the wrong text appeared for certificate generation history (ECOM-4201) 2016-04-13 16:55:10 -04:00
Clinton Blackburn
b0535def87 Improved OAuth client credentials support 
- Updated django-oauth2-provider libraries
- Added test ensuring issued access tokens have the basic scopes needed to get user info

ECOM-4197
 2016-04-13 16:23:54 -04:00
Amir Qayyum Khan
0d8237680c Fixed exception related to course not found for ccx 2016-04-13 21:48:12 +05:00
wajeeha-khalid
c31164c3ad Merge pull request #11838 from edx/jia/TNL-3818 
TNL-3818: fixed recent activity mapping in thread-list sort
 2016-04-13 20:57:52 +05:00
Vedran Karačić
a533472ae8 Merge pull request #12052 from edx/vkaracic/SOL-1668 
[SOL-1668] Coupon codes application is not available for a user who has just activated his account
 2016-04-13 16:01:49 +02:00
wajeeha-khalid
5b5fb2464d TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web 2016-04-13 17:47:31 +05:00
Vedran Karacic
02c5e7f939 Redirect to ecommerce checkout on the PayAndVerify view. 
When a user tries to purchase a verified certificate for the first
time or upgrade to verified, if the ecommerce checkout is enabled
redirect the user to the ecommerce checkout basket.
 2016-04-13 10:14:09 +00:00
Omar Khan
6fc4b38ea0 Disallow free verified course modes 
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
 2016-04-12 18:06:16 -07: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
Nimisha Asthagiri
7d43e3994c Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-11 11:46:12 -04:00
cahrens
28d743e2c8 Allow the "Default Group" to be renamed. 
TNL-4355
 2016-04-08 19:10:41 -04:00
Diana Huang
53517df0a7 Add new name for verified track. 2016-04-08 16:02:48 -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
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Nimisha Asthagiri
91f63af852 Fix sequence navigation issues for CCX courses 
MA-2258
 2016-04-07 18:41:10 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
Syed Hassan Raza
76057fc4d2 semantic task_input for certificate generation ECOM-3505 2016-04-07 09:06:36 -04:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05: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
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
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
wajeeha-khalid
18956af053 jia/MA-1815 retrieve count for child comments 2016-04-06 13:51:22 +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
cahrens
18d0161556 Automaticaly move learners to verified cohort. 
TNL-4281.
 2016-04-05 10:12:03 -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