Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Clinton Blackburn
bcd762ef91 Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-06 10:51:06 -04:00
Clinton Blackburn
9b24735cb9 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-06 02:59:11 -04:00
Clinton Blackburn
51715b9ec5 Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-06 02:59:11 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Douglas Hall
53604648d3 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 23:45:16 -04:00
Calen Pennington
b3880714b9 Assert that caches are being overridden correctly (and being reset in the right order) 2016-05-04 14:51:31 -04:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests 
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
 2016-05-04 14:51:30 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp. 
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
 2016-05-04 11:35:55 -04:00
Douglas Hall
da5b97284e Merge pull request #12322 from edx/malikshahzad228/additional_course_fields 
WL-401 Add CourseDetails model to course_about template context
 2016-05-03 17:21:26 -04:00
Robert Raposa
60d11bf2fd Fix Python false positives with AST. 
- Use AST to parse Python.
- Refactor Mako to use Python linting.
- Add optional verbose script argument.
- Skip tests.py files when linting.
 2016-05-03 15:17:09 -04:00
Malik Shahzad
d64e4b064c Add CourseDetails model to course_about template context. 2016-05-03 14:00:35 -04:00
Bill DeRusha
25df9db6ff WIP django catalog admin 2016-05-02 11:20:31 -04:00
Bill DeRusha
ffdacc9129 Use asymmetric key for signing JWTs 2016-05-02 11:17:32 -04:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Ben Patterson
b9558a90f1 Create a 3rd explicit shard for unit tests. 
More accurately, this creates a 4th shard because the
last shard is always the default.
 2016-04-28 10:09:32 -04:00
Waheed Ahmed
b7b4e0b041 Added Kosovo in django country list. 
ECOM-4292
 2016-04-28 00:17:06 +05:00
David Ormsbee
0acccf2fd4 Merge pull request #12280 from edx/release 
Release to Master (2016-04-26 release)
 2016-04-27 14:05:12 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal 
Remove XML modulestore code from most tests.
 2016-04-27 11:20:02 -04:00
Renzo Lucioni
5da6a598dd 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-04-26 13:36:58 -04:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio 
WL-309 Add new text fields to Studio schedule and details settings page
 2016-04-26 14:30:43 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Matt Drayer
5adf6fec66 Merge pull request #12252 from edx/mattdrayer/microsite-override-ecommerce-api 
mattdrayer: Add microsite settings overrides
 2016-04-25 21:17:09 -04:00
Matt Drayer
fdd045b108 mattdrayer: Add microsite settings overrides 2016-04-25 17:09:11 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Nimisha Asthagiri
40951bc7f5 Change BlockStructure logging from DEBUG to INFO 2016-04-25 14:30:50 -04:00
Peter Fogg
687197481f Merge pull request #12154 from edx/peter-fogg/client-keys 
Generate API client keys.
 2016-04-25 11:05:01 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Peter Fogg
b9b67d1091 Generate API client credentials. 
ECOM-3946
 2016-04-25 09:27:04 -04:00
Renzo Lucioni
1ffa81f746 Retrofit programs data mixin with factories 
This should make it easier to test programs-related features. Preface to ECOM-3200.
 2016-04-21 15:03:38 -04:00
Clinton Blackburn
5a7bc01986 JWT authentication updates 
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
 2016-04-20 16:25:25 -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
wajeeha-khalid
86e954f642 version-based mobile app upgrade 2016-04-14 15:43:34 +05:00
Bill DeRusha
bf37b4a028 Email notification 2016-04-13 15:59:30 -04:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui 
API request page improvements.
 2016-04-12 15:58:49 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI. 
ECOM-4024
 2016-04-12 14:05:31 -04:00
John Eskew
8a9845c26e Remove ModuleStoreEnum.Type.xml 2016-04-12 11:53:51 -04:00
John Eskew
91c94977d5 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-04-12 11:53:51 -04:00
John Eskew
4221ca6f2a Use ToyCourseFactory instead of the XMLModuleStore-backed toy course. 2016-04-12 11:53:50 -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
Christina Roberts
bb06e57115 Merge pull request #12099 from edx/christina/fix-default-cohort 
Allow the "Default Group" to be renamed (automatic cohorting)
 2016-04-12 08:03:03 -04:00