Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
1778c1fc95 Fix paver tests for watcher. 2017-05-01 17:09:32 -04:00
Ben Patterson
6e5769f279 Fix webpack service location for testing. 2017-05-01 17:09:32 -04:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Brian Jacobel
3b43fb38a4 Paver runs Webpack (incl watcher) in dev and test 2017-05-01 17:09:32 -04:00
Brian Jacobel
ef4b5cb8c3 Clean up spec and feature; both pass lint and run in Karma 2017-05-01 17:09:32 -04:00
Brian Jacobel
c5df4aa6b7 Work on getting Karma to run 2017-05-01 17:09:32 -04:00
Brian Jacobel
57e8250619 Webpack in LMS 2017-05-01 17:09:32 -04:00
J. Cliff Dyer
ea0027f338 refactor CAPA to use scorable xblock mixin 
for TNL-6594
 2017-05-01 15:08:17 -04:00
Ben Patterson
ec6dfeeac4 Merge pull request #15011 from edx/benp/update-lettuce-db-cache 
Update lettuce db cache for faster test set-up.
 2017-05-01 14:10:47 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Matthew Piatetsky
d1729c555a Fix footer css 2017-05-01 11:56:10 -04:00
Ben Patterson
449228ec31 Update lettuce db cache for faster test set-up. 2017-05-01 11:32:57 -04:00
Ben Patterson
0959399849 Merge pull request #14998 from edx/benp/update_bokchoy_db_cache 
Update bok-choy cache files.
 2017-05-01 09:24:02 -04:00
Cliff Dyer
ea9fe1de62 Merge pull request #15004 from edx/neem/shuffled-backfill-tasks 
Shuffle tasks.
 2017-05-01 09:17:51 -04:00
Ahmed Jazzar
0da29d1786 Added unicode to CourseUserGroup 2017-05-01 13:14:20 +03:00
Calen Pennington
2ca367a147 Extract some common logic about dirty serializers into a helper method 2017-04-28 16:10:22 -04:00
Calen Pennington
0ca11f6428 Add a trailing comma to make future diffs cleaner 2017-04-28 15:40:46 -04:00
Calen Pennington
1c78d7c02e Remove a stray maxDiff = None 2017-04-28 15:17:05 -04:00
J. Cliff Dyer
1daa4eadd5 Shuffle tasks. 2017-04-28 14:19:21 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Calen Pennington
1811f7235f Minimize the number of queries done while noop updating a user-preference 2017-04-28 12:26:41 -04:00
Calen Pennington
20caf52bea Use the existing user object in the case where a user is making changes to their own preferences 2017-04-28 12:26:39 -04:00
Eric Fischer
5e3f5f11ca Update edx-ora2 to 1.4.0 2017-04-28 11:02:24 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
M. Rehan
ce93ad2af4 Merge pull request #14973 from edx/mrehan/educator-122-enable-course-sharing-in-future-courses 
EDUCATOR-112 – Enable sharing icons for future courses
 2017-04-28 18:33:53 +05:00
M. Rehan
3ffde4a425 Merge pull request #14766 from edx/mrehan/add-flag-for-lti-xblock 
TNL-6688 – Add flag to control lti-consumer-xblock's request username/email editing in Studio
 2017-04-28 18:33:30 +05:00
Qubad786
f3b4803066 Update lti_consumer xblock to latest version 2017-04-28 15:59:23 +05:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
M. Rehan
6ea581793d Merge pull request #14810 from edx/mrehan/create-or-update-overview-on-course-publish 
TNL-6601 – Create or update course overview on a course publish
 2017-04-28 15:45:58 +05:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Qubad786
fad53592d2 Create or update course overview on a course publish event received from studio. 2017-04-28 14:31:45 +05:00
Ahsan Ulhaq
401eac8fa8 Merge pull request #14971 from edx/ahsan/ECOM-4478-Stop-program-cert-awarding-task-from-retrying-on-4xx 
Stop program cert awarding if cert is not configured in credentials
 2017-04-28 13:57:40 +05:00
Douglas Cerna
927c5d3789 Set MEDIA_ROOT and MEDIA_URL in cms.envs.aws module 2017-04-27 16:14:36 -06:00
Diana Huang
7a0d52bb00 Merge pull request #15000 from edx/diana/fix-url-name 
Use correct url helper.
 2017-04-27 16:40:04 -04:00
Nimisha Asthagiri
9e71538d33 Merge pull request #14984 from edx/neem/refactor-instructor-grades 
Refactor Grade Report in prep for parallelization
 2017-04-27 16:22:42 -04:00
Ben Patterson
4d3f4f8596 Update bok_choy_data_default.json 
Fix errors
 2017-04-27 16:04:38 -04:00
Diana Huang
b10c7dfc74 Use correct url helper. 2017-04-27 15:36:34 -04:00
Matthew Piatetsky
a46453fc6a Merge pull request #14995 from edx/minor_tweaks 
ECOM-6602 Minor program progress fixes
 2017-04-27 15:22:53 -04:00
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Ben Patterson
7bafafac84 Update bok-choy cache files. 
This should provide some performance improvements when running
bok-choy tests, particularly during set-up.
 2017-04-27 14:44:38 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Matthew Piatetsky
fb0e9b7574 Minor program progress fixes 
ECOM-6602
 2017-04-27 14:02:32 -04:00
Matthew Piatetsky
ee98a525ee Merge pull request #14993 from edx/fix-karma-test 
Fix karma test
 2017-04-27 14:01:26 -04:00
Douglas Hall
1f8125df40 Merge pull request #14987 from edx/douglashall/add_certificates_model_admin 
Add the CertificateGenerationCourseSetting model to Django admin.
 2017-04-27 12:47:05 -04:00
Uzair Rasheed
c1e63cb086 Merge pull request #14935 from edx/uzairr/ECOM-7252-refund 
ECOM-7252-fix refund discrepancy after the course mode expiry
 2017-04-27 20:58:21 +05:00
Matthew Piatetsky
ada78f5d3b Fix failing karma test 
ECOM-6602
 2017-04-27 11:31:51 -04:00
Ahsan Ulhaq
b6993c392d Stop program cert awarding if cert is not configured in credentials 
ECOM-4478
 2017-04-27 20:13:17 +05:00
Matthew Piatetsky
79a40eb340 Merge pull request #14974 from edx/fix_progress_css_bug 
Fix progress css bug
 2017-04-27 10:49:53 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00