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

36791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
4c0019c3d8 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-12 11:31:58 -04:00
Matt Drayer
13b8b10c5a mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-12 11:31:39 -04:00
Douglas Hall
9c834feb35 Merge pull request #12420 from edx/hotfix/2016-05-11 
Hotfix 2016-05-11
 2016-05-11 10:53:47 -04:00
Douglas Hall
4bd7b71f99 Remove course details field character limits 2016-05-10 16:00:54 -04:00
Brian Jacobel
8a5a69f4cd Merge pull request #12392 from edx/rc/2016-05-10 
Release Candidate rc/2016-05-10
 2016-05-10 09:47:00 -04:00
Brian Jacobel
fdf7fc04ef Merge pull request #12407 from edx/benp/fix-lint-rc-2016-05-10 
Fix linting issue.
 2016-05-09 14:16:58 -04:00
Ben Patterson
c00355ae51 Fix linting issue. 2016-05-09 13:26:34 -04:00
Clinton Blackburn
e7df92b765 Merge pull request #12405 from edx/clintonb/credit-fixes 
Multiple Credit Fixes
 2016-05-09 13:09:44 -04:00
Clinton Blackburn
78f4af7d6f 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-09 12:52:54 -04:00
Clinton Blackburn
17e92f5518 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-09 12:52:49 -04:00
Clinton Blackburn
46775d0f2d Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-09 12:52:43 -04:00
Brian Jacobel
24b1c54b8d Merge branch 'release' into rc/2016-05-10 2016-05-07 10:32:39 -04:00
Douglas Hall
e4ed23faa3 Merge pull request #12367 from edx/rc/2016-05-05 
Patch Release 2016-05-05
 2016-05-06 17:22:56 -04:00
Brian Jacobel
5cbeea7b66 Merge pull request #12394 from edx/renzo/cherry-pick-sprintf-revert 
Revert "Add js test for analytics event on LMS receipt page"
 2016-05-06 16:22:46 -04:00
Renzo Lucioni
93b1131192 Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 16:02:58 -04:00
Ben Patterson
72af8afd67 Skip tests that are too flaky to be reliable. FEDX-88. 2016-05-06 11:27:33 -04:00
Kevin Falcone
61ef49b94c Merge pull request #11922 from edx/jibsheet/html-escape-activation 
Enable safe by default in the activation flow
 2016-05-05 20:52:58 -04:00
Kevin Falcone
15e8829308 Enable safe by default in the activation flow 
The largest changes here were around HTML escaping in the translations.
 2016-05-05 16:39:17 -04:00
Simon Chen
759ad2eaf9 Merge pull request #12379 from edx/schen/ECOM-4352 
ECOM-4352 Update the min height of the title of the program cards
 2016-05-05 16:15:01 -04:00
Simon Chen
e13ab68090 ECOM-4352 Update the min height of the title of the program cards 2016-05-05 15:21:07 -04:00
Usman Khalid
8b645754a1 Merge pull request #12344 from edx/usman/tnl4398-karma-config-improvements 
Karma config improvements.
 2016-05-05 23:36:42 +05:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
39f32f9869 Simplified normalizePathsForCoverage. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files. 
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
 2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js. 
The config files just declare lists of files.
 2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Ned Batchelder
850bc6bb06 Merge pull request #12375 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-05 12:46:35 -04:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -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
Peter Fogg
e6f3af654b Merge pull request #12363 from edx/peter-fogg/fix-api-email 
Correctly pull in API access email config.
 2016-05-05 09:58:36 -04:00
Edward Zarecor
ce7d4f03ae Merge pull request #12339 from edx/e0d/update-libary 
Bump SAML version.
 2016-05-05 07:45:43 -04:00
Afzal Wali
bdc398de17 Bumped the proctoring version. 2016-05-05 00:53:58 -04:00
Douglas Hall
ab8093ccd6 Allow content gating to work with library_content blocks 2016-05-05 00:53:45 -04:00
Douglas Hall
ee7f0302b0 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-05 00:53:33 -04:00
Douglas Hall
9c71395de1 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-05 00:53:23 -04:00
Malik Shahzad
e8e713c508 Add CourseDetails model to course_about template context. 2016-05-05 00:53:09 -04:00
Douglas Hall
1feb4fdb9f Merge pull request #12366 from edx/douglashall/microsite_platform_name 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-05 00:47:27 -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
Clinton Blackburn
546f5f3da4 Merge pull request #12365 from edx/release-2016-05-03-conflict 
Merging release 2016-05-03 into master
 2016-05-04 23:12:42 -04:00
Clinton Blackburn
868d962002 Merge branch 'release' into release-2016-05-03-conflict 2016-05-04 20:01:29 -04:00
AlasdairSwan
816882a130 Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update 
Alasdair/ecom 4338 program progress a11y update
 2016-05-04 19:41:49 -04:00
Douglas Hall
2a8f44ad5c Merge pull request #12362 from edx/douglashall/fix_logistration_platform_name_display 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-04 18:33:01 -04:00