Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,707 Commits 1 Branch 0 Tags
12e8a3ea6ea116f57cd7fa075f3f9a8d46b066e3
Commit Graph

34707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
12e8a3ea6e Merge pull request #11206 from edx/merge-release-into-master 
HOTFIX Release for Jan 12, 2016
 2016-01-12 16:33:10 -05:00
Douglas Hall
28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-01-12 15:12:06 -05:00
Douglas Hall
8d06679681 Merge pull request #11203 from edx/hotfix/2016-01-12 
HOTFIX 2016-01-12
 2016-01-12 14:58:57 -05:00
Brian Talbot
7ac287af19 Merge pull request #11185 from open-craft/sequence-link-color-default 
Mark sequence link-color scss variable default.
 2016-01-12 14:57:10 -05:00
Matt Drayer
b549adf476 Merge pull request #10623 from eduNEXT/fmo/wiki-support-for-microsites 
WIP wiki support for microsite templates
 2016-01-12 14:27:27 -05:00
Jesse Zoldak
157bd19e20 Clear out the bok choy DB with reset_db, not flush 2016-01-12 11:33:02 -05:00
Christina Roberts
6f66483876 Merge pull request #11202 from edx/release 
Release for Jan 12, 2016
 2016-01-12 11:29:42 -05:00
Toby Lawrence
775c3cac2a Merge pull request #11190 from edx/PERF-227 
Disable Optimizely in the courseware view.
 2016-01-12 11:09:55 -05:00
Felipe Montoya
f2a6a27ec9 Adding support for microsite template_paths on django templates 
Stripping the leading / for the django_templates finder

Enabling the microsite configurations before running django.setup()

Adding only the templates directory before startup

Adding the missing overrides file at the django templates main

Using the comp_theming way of overriding css

Adding test for the microsite_template_path filter
 2016-01-12 10:34:00 -05:00
M. Rehan
0b685d8983 fix for course number display string as none 2016-01-12 09:49:18 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None. 
Added tests & general message to js when parsing fails.

TNL-3989
 2016-01-12 09:47:51 -05:00
Douglas Hall
2c00004d4b Updated edx-proctoring requirement to fix PHX-242 2016-01-12 09:36:35 -05:00
Mark Sadecki
dd6dc0195e Merge pull request #11180 from edx/rc/2016-01-12 
Release Candidate rc/2016-01-12
 2016-01-12 09:10:30 -05:00
Awais Jibran
ded3786d0c Merge pull request #11157 from edx/aj/tnl3968-mathjax-in-static-pages 
Enable MathJax in Course Pages
 2016-01-12 18:25:33 +05:00
Peter Pinch
65cec380d9 Merge pull request #11125 from mitocw/ehnancement/aq/dont_allow_user_to_register_ccx_without_invitation 
Hide CCX course registration from unenrolled students
 2016-01-12 08:25:03 -05:00
Muzaffar yousaf
50be807e78 Merge pull request #11188 from edx/muzaffar/disable-bookmark-button-tnl4004 
Disable button while adding/removing bookmark to a unit.
 2016-01-12 17:28:53 +05:00
Amir Qayyum Khan
6443070901 Hide register to course page from student, so that only coach can invite students to join ccx 2016-01-12 14:21:20 +05:00
raeeschachar
d6673ca3fd Merge pull request #11174 from edx/raees/chrome-bokchoy-test-quality-button-works-correctly 
Fixed test quality button works correctly in Video tests failing on C…
 2016-01-12 14:01:11 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages 
TNL-3968
 2016-01-12 13:49:30 +05:00
Adam
aacad7e992 Merge pull request #11191 from edx/revert-10648-edraak/calculator-fixups-rc 
@Revert 10648 edraak/calculator fixups
 2016-01-11 13:49:10 -05:00
Adam
e4ab6dc2c3 Revert "Calculator layout and help popup fixes" 2016-01-11 12:47:05 -05:00
Toby Lawrence
09f2040cbf Disable Optimizely in the courseware view. 2016-01-11 10:57:05 -05:00
muzaffaryousaf
cc6024e97b Disable button while adding/removing bookmark to a unit. 
TNL-4004
 2016-01-11 19:31:05 +05:00
David Ormsbee
95434f7b3c Merge pull request #11183 from edx/ormsbee/fix_atomic_thumbnail_error 
Prevent course image thumbnail race condition from causing TransactionManagementError
 2016-01-11 09:17:36 -05:00
David Ormsbee
c4b0c7b483 Move test_get_all_courses_by_mobile_available to CourseOverviewTestCase 
It somehow ended up in CourseOverviewImageSetTestCase (merge artifact?).
 2016-01-11 04:30:44 -05:00
David Ormsbee
0e70676ba7 Prevent course image thumbnail race condition. 
Without this change, we'd throw a TransactionManagementError in the case
where we have a race condition and generate multiple CourseOverviewImageSets
for the same CourseOverview concurrently.
 2016-01-11 04:30:35 -05:00
Matjaz Gregoric
95884642a2 Mark sequence link-color scss variable default. 
There's already a global $link-color variable defined in
lms/static/sass/base/_variables.scss. Mark the $link-color
variable in sequence scss file with !default, so that the
global $link-color variable gets used, if defined.
 2016-01-11 08:52:21 +01:00
Toby Lawrence
936c431096 Merge pull request #11181 from edx/perf-224-migrations 
Add the migrations necessary for asset base URL support.
 2016-01-08 14:51:37 -05:00
Adam
e8925972d9 Merge pull request #11168 from edx/adam/fix-userstanding-page 
userstanding is now OneToOneField
 2016-01-08 13:36:54 -05:00
Toby Lawrence
fb984206cf Add the migrations necessary for asset base URL support. 2016-01-08 13:16:50 -05:00
Calen Pennington
96478f823d Merge pull request #11163 from cpennington/shrink-images 
Shrink images
 2016-01-08 13:13:02 -05:00
Douglas Hall
c4aa758d8c Merge pull request #11155 from edx/douglashall/HOL-18/register_form_override 
HOL-18 Register form microsite override
 2016-01-08 12:55:00 -05:00
Christina Roberts
82768d96e1 Merge pull request #11178 from edx/ned/latest-translations 
Update translations (autogenerated message)
 2016-01-08 11:17:36 -05:00
Peter Fogg
bf2f8ca8d5 Merge pull request #11176 from edx/peter-fogg/revert-enrollment-api-changes 
Revert "Add options trailing slashes to the Enrollment API."
 2016-01-08 10:30:46 -05:00
Ned Batchelder
f235247395 Update translations (autogenerated message) 2016-01-08 15:25:43 +00:00
David Baumgold
80836087f7 Merge pull request #11165 from edx/remove-header_extra.html 
Remove unused header_extra.html file
 2016-01-08 10:00:37 -05:00
Peter Fogg
17a69a30e4 Revert "Add options trailing slashes to the Enrollment API." 
This reverts commit 3149aaa319.
 2016-01-08 09:47:39 -05:00
Matt Drayer
59c913985f Merge pull request #11173 from edx/asadiqbal08/WL-269 
WL-269 used gettext(...) in .underscores files.
 2016-01-08 09:41:17 -05:00
Peter Pinch
e5943feecc Merge pull request #11124 from mitocw/fix/aq/progress_of_student_ccx 
Allowed CCX coaches to see individual students progress from grade book
 2016-01-08 09:32:05 -05:00
raeeschachar
41f27f1f9f Fixed test quality button works correctly in Video tests failing on Chrome 2016-01-08 16:27:17 +05:00
Amir Qayyum Khan
c0a131e5d6 Allowed ccx coaches to see individual students progress from grade book 2016-01-08 16:05:33 +05:00
asadiqbal
323b9193d6 WL-269 used gettext in .underscores 2016-01-08 12:35:24 +05:00
Jim Abramson
8d3fe51809 Merge pull request #11170 from edx/jsa/programs-app-username 
add username to program app config attrs in DOM.
 2016-01-07 17:59:42 -05:00
jsa
5ae8f5be23 add username to program app config attrs in DOM. 2016-01-07 16:21:19 -05:00
Peter Pinch
91be959bb7 Merge pull request #10878 from mitocw/refactor/aq/move_code_from_view 
CCX app refactoring. Moved some code to utils.py from views.py
 2016-01-07 15:26:33 -05:00
Adam Palay
7dc54723d3 userstanding is now OneToOneField 2016-01-07 15:11:23 -05:00
Douglas Hall
c2058dbec5 Split register form out into a separately include template so that microsites can override it 2016-01-07 11:58:16 -05:00
David Baumgold
562079460b Merge pull request #11154 from ovnicraft/patch-2 
Remove duplicate import
 2016-01-07 11:57:23 -05:00
David Baumgold
032305df3d Remove unused header_extra.html file 2016-01-07 11:45:16 -05:00
Calen Pennington
bd7e4dd3ab Shrink images using trimage 
lms/static/images/wmd-buttons-transparent.png       | Bin 9698 -> 7046 bytes
 lms/static/images/wmd-buttons.png                   | Bin 7465 -> 5970 bytes
 .../credit_notifications/edx-logo-header.png        | Bin 1894 -> 1225 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_120.jpg        | Bin 3168 -> 2752 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_30.jpg         | Bin 957 -> 648 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_50.jpg         | Bin 1362 -> 1048 bytes
 .../ebe754f90bc88acf8ec6a1d27b87f743_500.jpg        | Bin 15852 -> 13940 bytes
 .../f0d065035a5c4d32df318fbc54138765_120.jpg        | Bin 3168 -> 2752 bytes
 .../f0d065035a5c4d32df318fbc54138765_30.jpg         | Bin 957 -> 648 bytes
 .../f0d065035a5c4d32df318fbc54138765_50.jpg         | Bin 1362 -> 1048 bytes
 .../f0d065035a5c4d32df318fbc54138765_500.jpg        | Bin 15852 -> 13940 bytes
 themes/edge.edx.org/lms/static/images/logo.png      | Bin 7465 -> 4574 bytes
 themes/edx.org/cms/static/images/studio-logo.png    | Bin 4782 -> 4779 bytes
 themes/edx.org/lms/static/images/logo-large.png     | Bin 4581 -> 3367 bytes
 themes/edx.org/lms/static/images/logo.png           | Bin 1244 -> 1184 bytes
 .../lms/static/images/profiles/default_120.png      | Bin 6398 -> 3252 bytes
 .../lms/static/images/profiles/default_30.png       | Bin 993 -> 522 bytes
 .../lms/static/images/profiles/default_50.png       | Bin 2068 -> 1035 bytes
 .../lms/static/images/profiles/default_500.png      | Bin 91560 -> 0 bytes
 themes/red-theme/lms/static/images/logo.png         | Bin 909 -> 559 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:43 -05:00