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

3110 Commits

Author SHA1 Message Date
Ben Patterson
d76f50d93b Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-05-02 13:09:27 -04:00
Ayub khan
c601e9fc48 Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-05-02 13:09:27 -04:00
muzaffaryousaf
872d225921 Replace backbone-min to actual file. 2016-05-02 13:09:27 -04:00
muzaffaryousaf
95952d9b21 Upgrade backbone via npm. 
TNL-4335
 2016-05-02 13:09:25 -04:00
Renzo Lucioni
a74885331b Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-05-02 13:09:24 -04:00
Chris Rodriguez
d68e50a502 Adding legacy event_type for language menu events 2016-05-02 13:09:19 -04:00
J. Clifford Dyer
6a01f18e17 Update seq_* to edx.ui.lms.sequence.* format 
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
 2016-05-02 13:08:59 -04:00
John Eskew
c3c7ce8e9a Address DaveO's comments. 2016-05-02 13:08:58 -04:00
John Eskew
971a198fb9 Remove ModuleStoreEnum.Type.xml 2016-05-02 13:08:57 -04:00
John Eskew
2380fa3c2c Unify usage of a single test mixed modulestore called: 
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
 2016-05-02 13:08:27 -04:00
John Eskew
14a8314adc Remove include_xml option. 2016-05-02 13:08:25 -04:00
Christine Lytwynec
66e2d06235 Merge pull request #12060 from edx/clytwynec/ac-367 
Clytwynec/ac 367
 2016-04-22 09:49:26 -04:00
Christine Lytwynec
6e93cee2da add --skip-fetch flag, update start_urls, update auto_auth to include redirect_to param 2016-04-21 14:21:16 -04:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00
Ayub-khan
ef70d017c8 -fixed failing tests 
-Adressed all comments
 2016-04-15 15:40:21 +05:00
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 06:50:03 +00: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
Andy Armstrong
60fab86f01 Reconcile double reverts 
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
 2016-04-14 23:28:55 -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
tasawernawaz
e962a39ef7 Revert "ECOM-3201" 
This reverts commit 628843f62c.
 2016-04-14 14:23:41 +00:00
Ayub-khan
d8464dbfb0 -changed method name from "from_string_or_404" to "course_key_from_string_or_404". 
-Updated method "course_key_from_string_or_404" to raise message too.
-Wrote tests for "course_key_from_string_or_404" when exception message is given.
-Modified existing methods to use "ddt.data".
-Used Splunk logs to find exectly where we were getting "Invalid Key Error"
-Updated Views where we were getting "Invalid Key Error" in splunk logs.
-Wrote tests for those View End points where we were getting "Invalid Key Error"
 2016-04-14 15:57:39 +05:00
Tasawer
628843f62c ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-14 10:48:21 +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
Ned Batchelder
537dd040c8 Merge pull request #12117 from edx/ned/fix-mako-encoding 
Fix encoding of Django-called Mako files to be safe
 2016-04-12 14:21:12 -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
Toby Lawrence
95fde6d527 Revert "[PERF-274] Add NewRelic instrumentation to contentserver." 
This reverts commit 09586d8a37.
 2016-04-12 10:05:18 -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
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198 
ECOM-3198 Add banner image to the program listing program cards
 2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Ned Batchelder
4f9f87c192 Fix encoding of Django-called Mako files to be safe 
The old code set the output-encoding to None, which means, I want
Unicode strings as output.  This made Mako pass markupsafe objects to
"unicode()", which applied all the escaping.  Then the result would be
given to Django, would would html-escape it again, resulting in
over-escaping.

By setting the output-encoding to utf8, we use filters.encode.utf8
instead, which is aware of Markupsafe, which avoids the over-escaping.
 2016-04-11 14:00:15 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two) 
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

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
 2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages" 
This reverts commit 845e3708f3.
 2016-04-08 14:25:41 -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
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
muzaffaryousaf
c3cd2db384 Moving choices to admin form instead of models. 
TNL-4296
 2016-04-07 12:26:18 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +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
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -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