Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
John Eskew
99ded6c7ee Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
9cc1d4f91d Remove include_xml option. 2016-04-12 11:53:00 -04:00
John Eskew
f9a85c4471 Remove XML modulestore code - discovery work 2016-04-12 11:49:32 -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
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
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
0e7247f2a7 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-04 21:15:26 -04:00
John Eskew
35a235b348 Merge pull request #11899 from edx/jeskew/ccx_safe_templating 
Safe templating changes for CCX.
 2016-04-04 12:45:24 -04:00
John Eskew
13ef2b7d1a Safe templating changes for CCX. 2016-04-04 09:59:45 -04:00
Nimisha Asthagiri
f5ad6aaddb Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings 
Translate preferred languages in user account settings
 2016-04-04 09:31:35 -04:00
Régis Behmo
d2317be682 Translate available preferred languages in user account settings 
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
 2016-04-04 10:33:00 +02:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
ca959ab1d1 Patch for badge migrations to fix date specificity change. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
1a6394b781 Add share modal to badge listing. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
ccb5b6c74c Adjust get_completion_badge usages to handle exceptions. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
4fde73fae3 Address notes. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cb4ed42075 Disable badge issuance for courses where badges are disabled. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cff9343889 Change issuing_component for included badge events. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
a2104634a1 Implement Badging API views. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
61c76771f8 Add completion and enrollment badges. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
25958febbf Add XBlock Badging Service. 2016-04-01 10:13:08 -05:00