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

20272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
4e298a1abb Add an apostrophe to the Lorem text. 2014-01-10 14:35:17 -05:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Will Daly
4a3cffbb3f Merge pull request #2131 from edx/db/fix-theme-name-issues 
Fix theme issues in Sass preprocessing
 2014-01-10 08:03:23 -08:00
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05:00
brianhw
20489f22d8 Merge pull request #2079 from edx/brian/track-commands 
Define TrackedCommand for use as base class for tracking management commands
 2014-01-10 07:39:23 -08:00
Carson Gee
df1b7f44b9 Merge pull request #1985 from edx/cg/sysadmin-enhancements 
Several code enhancements to git_add_course
 2014-01-10 07:31:52 -08:00
Ned Batchelder
56f0c89461 Merge pull request #2127 from edx/ned/dont-extract-test_root-strings 
Dont extract test_root strings
 2014-01-10 07:04:43 -08:00
Carson Gee
ab151f9e7b Several code enhancements to sysadmin dashboard 
Improved testing (cleaning up afterwards, catching stdout)
Refactored import function to it's own file
Removed monkey patch to log capturing, but still needs work
Translation fixes
Removal of several gettext phrases
 2014-01-10 09:31:53 -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
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
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
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
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -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
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