Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,090 Commits 1 Branch 0 Tags
2d2913ef5d3f35eb45e914554a0eebf1d3ca1559
Commit Graph

35090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
2d2913ef5d Merge pull request #11426 from edx/peter-fogg/fix-date-block-format 
Correctly format date block dates.
 2016-02-04 15:45:04 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Ned Batchelder
21218ef989 Merge pull request #11372 from open-craft/omar/remove-multiple-enrollment-feature 
Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
 2016-02-04 13:42:48 -05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
clrux
9ef9bc6efb Merge pull request #11129 from edx/clrux/ac-201 
LMS: darkening a gray on the profile page
 2016-02-04 10:11:24 -05:00
Chris Rodriguez
652e4ce0c1 LMS: darkening a gray on the profile page 2016-02-04 09:09:45 -05:00
Ben Patterson
db8b61bb2a Merge pull request #11388 from edx/benp/more-testsonly-support 
Do not flush the database when using bok-choy in testsonly mode.
 2016-02-04 08:41:55 -05:00
muhammad-ammar
3127ac9180 bookmark button js caching 
TNL-3954
 2016-02-04 17:59:47 +05:00
Ben Patterson
e5da5006fb Testsonly mode should also skip clearing mongo. 2016-02-04 06:58:57 -05:00
Ben Patterson
4caed6184c Do not flush the database when using bok-choy in testsonly mode. 
Testsonly will not work currently, because the database flush will
remove some data fixtures. Even when they are loaded at the beginning
of the next test run, there are database corruptions. Instead of
flushing, do not do anything with the database at the end of the
testsonly test run. That way, tests that use dynamic data can be
run many times in a row.
 2016-02-04 06:58:57 -05:00
M. Rehan
9d5a4a244b Merge pull request #11336 from edx/mrehan/wrong-units-in-group-tnl-3727 
Fix - skip orphans from content group usage information for split
 2016-02-04 14:13:05 +05:00
Muhammad Rehan
50c7b7ceb8 TNL-3727 Skip orphans from content group usage information for split 2016-02-04 12:18:18 +05:00
Nimisha Asthagiri
599173c6b6 Merge pull request #11198 from edx/block-cache/collect-phase 
Refactor Block Cache to separate Collect and Transform phases
 2016-02-03 20:18:09 -05:00
Robert Raposa
90f2fb868e Merge pull request #11257 from edx/robrap/refactor-js-utils 
Refactor js_util helpers
 2016-02-03 20:07:19 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers 
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
 2016-02-03 17:13:21 -05:00
Nimisha Asthagiri
05767b433d Collect Course Blocks on Course Publish and Management Command 
MA-1368
 2016-02-03 16:56:22 -05:00
Nimisha Asthagiri
66397c35b9 Refactor Block Cache to separate Collect and Transform phases 2016-02-03 16:54:29 -05:00
Christina Roberts
901cafe57a Merge pull request #11419 from edx/christina/enable-test 
Remove skip from studio page bok choy test
 2016-02-03 16:37:10 -05:00
cahrens
19162fb752 Asset page is hopefully loading more reliably now. 2016-02-03 15:46:51 -05:00
Peter Fogg
8ed051e3cf Merge pull request #10642 from edx/feature/self-paced 
Course home page improvements.
 2016-02-03 15:06:59 -05:00
Christina Roberts
9a786d08a2 Merge pull request #11395 from edx/christina/fix-test-typo 
Fix unit tests so they are testing aria-expanded.
 2016-02-03 14:41:49 -05:00
Peter Fogg
244843d929 Track events on the course home page. 
Events are added for accessing the courseware, entering the verified
upgrade flow, and toggling a course update.

ECOM-2983
 2016-02-03 13:58:24 -05:00
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page. 
ECOM-2960
 2016-02-03 13:58:23 -05:00
Peter Fogg
77aa07544e Internationalize course info sidebar default. 2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools." 
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
 2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests. 
ECOM-2809
 2016-02-03 13:58:23 -05:00
Peter Fogg
75bef91e17 Fix query counts after Django 1.8 merge. 2016-02-03 13:58:23 -05:00
Peter Fogg
9b7ce7f3f2 Lighten course tab font weight. 2016-02-03 13:58:22 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools. 
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
 2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page. 
ECOM-2806
 2016-02-03 13:58:22 -05:00
Matt Drayer
71a6779dfa Merge pull request #11138 from fghaas/no-video-if-unset 
lms: Only show welcome video if show_homepage_promo_video is set
 2016-02-03 13:08:31 -05:00
Douglas Hall
b35bfe04f1 Merge pull request #11403 from edx/afzaledx/SOL-1480_Allowance_UI_Changes_bump_version 
Bump edx-proctoring to 0.12.8
 2016-02-03 12:47:06 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs 
ECOM-2678
 2016-02-03 12:20:53 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page. 
ECOM-2810
 2016-02-03 12:20:53 -05:00
Jesse Zoldak
1cd5086b58 Merge pull request #11407 from edx/release 
Merge pull request #11383 from edx/rc/2016-02-02
 2016-02-03 11:18:25 -05:00
Hasnain
d275dd4a70 Added bok choy test for proctoring instructor dashboard 2016-02-03 10:48:55 -05:00
Afzal Wali
79dd597557 Bump edx-proctoring to 0.12.8 2016-02-03 10:47:56 -05:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Omar Khan
5b84043428 Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting 
This feature check was commented out in 8ee9a967 more than 2 years ago,
we might as well remove the setting.
 2016-02-03 21:20:23 +07:00
Diana Huang
69e3267941 Merge pull request #11408 from edx/diana/exclude-i18n-js 
Be specific about JS files for cms-squire.
 2016-02-03 09:15:08 -05:00
Ahsan Ulhaq
ddb2133fc9 Merge pull request #11405 from edx/ahsan/ECOM-3604-Add-xseries-certificates-in-edx-theme 
Add xseries certificates sidebar section in edx.org theme
 2016-02-03 16:10:49 +05:00
Florian Haas
e1ce4059e1 Update AUTHORS 
As required by CONTRIBUTING.rst.
 2016-02-03 09:37:27 +01:00
Florian Haas
fef6f64a7b lms: Only show welcome video if show_homepage_promo_video is set 
While show_homepage_promo_video would previously toggle the control to
play the welcome video on and off, the YouTube embed iframe would be
included in index.html unconditionally. This created the ugly
situation that YouTube would try to pull in a non-existent video, and
that a DoubleClick tracking beacon would be introduced to the start
page for no reason.

Instead, make sure show_homepage_promo_video toggles the entire modal
video section on and off, suppressing it altogether unless
show_homepage_promo_video is set.
 2016-02-03 09:37:27 +01:00
Zia Fazal
23b24d503e Merge pull request #11404 from edx/ziafazal/WL-305 
ziafazal/WL-305: removed constraints on MicrositeHistory model to allow Updates on Microsite
 2016-02-03 11:17:35 +05:00
Diana Huang
f00841d38e Be specific about JS files for cms-squire. 2016-02-02 17:16:31 -05:00
Peter Fogg
cd9b39ec48 Merge pull request #11409 from edx/peter-fogg/partner-email-setting 
Convert PARTNER_SUPPORT_EMAIL to a setting.
 2016-02-02 16:49:43 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Peter Fogg
ce769b363d Convert PARTNER_SUPPORT_EMAIL to a setting. 2016-02-02 15:18:16 -05:00
Jesse Zoldak
4dffa32be2 Merge pull request #11383 from edx/rc/2016-02-02 
Release Candidate rc/2016-02-02
 2016-02-02 14:46:42 -05:00