Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

27583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubiar-arbi
1990a412dd escape single quotes in optioninput (optionresponse) tags 
STUD-893
 2014-01-10 18:50:25 +05:00
Will Daly
4a9c239c3d Merge pull request #2030 from edx/will/bok-choy-integration 
Added configuration for running tests using the bok-choy framework
 2014-01-10 05:26:42 -08:00
Usman Khalid
864267a286 Removed stripped-main.html since it is not being used anymore. 
LMS-1584
 2014-01-10 17:29:52 +05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html 
LMS-1584
 2014-01-10 17:29:24 +05:00
Ned Batchelder
c329270f43 Dont extract test_root strings 2014-01-10 07:18:17 -05:00
Anton Stupak
54eaabce3f Merge pull request #2107 from edx/anton/fix-image-response 
Fix show answer button for ImageResponse.
 2014-01-10 04:13:19 -08:00
polesye
95a88823b9 BLD-633: Fix show answer for ImageResponse. 2014-01-10 13:32:16 +02:00
Sarina Canelake
9363dba535 Merge pull request #2121 from edx/sarina/neuter-static-files 
Edit template for unused edx.org pages
 2014-01-09 15:46:20 -08:00
Greg Price
5147a41b07 Merge pull request #2034 from carsongee/cg/notification_prefs_missing_slash 
Added missing slash to avoid 302 when calling /notification_prefs/status
 2014-01-09 13:01:29 -08:00
Calen Pennington
a6a004314a Use block type, rather than class names for StudentPreference field storage in LMS 2014-01-09 15:59:16 -05:00
Ned Batchelder
520822c3a6 Merge pull request #2122 from edx/ned/i18n-xblock-support 
Make LMS use runtime.service("i18n") for i18n.
 2014-01-09 12:52:13 -08:00
David Baumgold
96558c85f9 Merge pull request #2113 from edx/db/enable-theme-in-startup 
Do theme post-processing in startup hook
 2014-01-09 12:19:17 -08:00
Don Mitchell
67a5f862ab Merge pull request #2117 from edx/dhm/memory_definition 
Set definition_locator on in-memory xblocks
 2014-01-09 11:58:23 -08:00
Ned Batchelder
d138a2c6be Use Django for runtime i18n 
The django.utils.translation module has the right interface to serve as a
gettext.Translations object, so we use it for the runtime i18n service.

LMS-1597
 2014-01-09 14:19:56 -05:00
Ned Batchelder
7f1fc01f80 Change XModule i18n to use runtime.service 
LMS-1597
 2014-01-09 14:19:56 -05:00
Ned Batchelder
ef6c8a95e0 Update XBlock to version with Runtime.service 2014-01-09 13:56:20 -05:00
Sarina Canelake
b7eb3406e1 Edit template for unused edx.org pages 2014-01-09 13:32:28 -05:00
Sarina Canelake
c285bd11d5 Merge pull request #2108 from edx/jtauber/neuter-static-files 
remove edx.org-specific content no longer used
 2014-01-09 10:06:44 -08:00
Will Daly
dde5455227 Added configuration for running tests using the bok-choy framework 2014-01-09 12:57:50 -05:00
Don Mitchell
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Sarina Canelake
56a917cfb7 Fix 'JOBS' and 'PRESS' links at bottom of old site 2014-01-09 12:30:15 -05:00
Sarina Canelake
674670b687 Remove unused image files from old website 2014-01-09 12:04:35 -05:00
Mark Hoeber
43e7efc511 Section and Subsection release dates change 
Changed to reflect default change for new sections/subsections
 2014-01-09 11:52:20 -05:00
Sarina Canelake
2f8088eaaf Merge pull request #2057 from edx/ormsbee/js_gettext 
Remove JS gettext() in templates
 2014-01-09 07:54:37 -08:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
Feanil Patel
7d9b6a55dd Add a command to transfer students from one course to another. 
Move only active students and also update cert item for verified students.
 2014-01-08 16:39:24 -05:00
David Baumgold
954787d772 Add changelog entry for theming change 2014-01-08 15:20:54 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore 
During testing: drop contentstore when cleaning up modulestore
 2014-01-08 11:37:42 -08:00
Mark Hoeber
b0e8885c60 Updated change log 
for STUD-1038
 2014-01-08 14:18:38 -05:00
Mark Hoeber
1cc16d8730 Added doc for file sorting change 
For STUD-1038
 2014-01-08 13:54:00 -05:00
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -05:00
Mark Hoeber
42e810f14b Course Start Date Changes 
Doc updated for STUD-1132
 2014-01-08 12:18:55 -05:00
Andy Armstrong
eeb5f81272 Merge pull request #2086 from edx/andya/asset-sorting 
Add sorting to Studio's Files & Uploads page
 2014-01-08 09:09:54 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -05:00
Mark Hoeber
82ef40d8b9 Merge pull request #2110 from edx/markhoeber/documentation/stud1012 
Removed old unused images for Building a Course doc
 2014-01-08 08:05:51 -08:00
Mark Hoeber
7b3819adc7 Removed old unused images for Building a Course doc 
STUD-1012
 2014-01-08 11:03:41 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page 
Added sorting to the new pagination logic for STUD-995.
 2014-01-08 10:35:40 -05:00
Julia Hansbrough
e783d42cdb Merge pull request #2083 from edx/flowerhack/updated-codejail-reqs 
Updated codejail version
 2014-01-08 07:22:32 -08:00
James Tauber
5ef94f1496 removed edx.org-specific content no longer used 2014-01-08 17:51:28 +08:00
Will Daly
75ce79fb5a Merge pull request #1957 from edx/will/devstack-rake 
Added rake commands for devstack
 2014-01-07 14:43:17 -08:00
Don Mitchell
19eaaaed6f Merge pull request #2051 from edx/dhm/arch-docs 
architectural documents
 2014-01-07 14:30:47 -08:00
Matt Drayer
9098cc1140 Merge branch 'master' of git://github.com/edx/edx-platform into feature/mattdrayer/authors-addition 2014-01-07 16:40:30 -05:00
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date 
Set default section start date to Jan 1, 2030
 2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030 
STUD-1072
 2014-01-07 15:46:15 -05:00
Mark Hoeber
5e174e223a Merge pull request #2102 from edx/markhoeber/documentation/release-notes-1-7-14 
Markhoeber/documentation/release notes 1 7 14
 2014-01-07 12:24:55 -08:00
Calen Pennington
db10dc38cb Merge pull request #2088 from cpennington/fix-release-script-unicode 
Make the release script not fall over when piping data to a file
 2014-01-07 12:23:23 -08:00
spearce
a853c7de14 Make changes based on feedback from Lyla and Adam. 2014-01-07 15:22:51 -05:00
Andy Armstrong
f306c4d73a Merge pull request #2101 from edx/andya/pagination-test-fix 
Fix pagination test failures
 2014-01-07 12:10:29 -08:00
Calen Pennington
536d824252 Merge branch 'release' 2014-01-07 15:08:45 -05:00
Mark Hoeber
c303687be0 Merge pull request #2100 from edx/markhoeber/documentation/stud-1034 
Updates for 1-7-2014 release changes in Studio -- Outline and Files pages
 2014-01-07 12:05:17 -08:00