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

20294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
c4792e667e Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem 
Add apostrophe to lorem and fix single-quoted strings
 2014-01-13 13:48:23 -08:00
Mark Hoeber
bd079648e2 Merge pull request #2155 from edx/sylvia/documentation/AA_updates 
Sylvia/documentation/aa updates
 2014-01-13 12:57:17 -08:00
spearce
2cd03b7eb7 Delete placeholder topic 2014-01-13 15:50:04 -05:00
spearce
229e921631 Update docs per Anant's feedback 2014-01-13 15:47:02 -05:00
Jason Bau
7692f0d8db Merge pull request #2143 from edx/jbau/sass-path-bugfix 
small bugfix for theming+sass path
 2014-01-13 12:06:34 -08:00
Will Daly
13cda103c2 Merge pull request #2154 from edx/will/disable-teams-and-static-tests 
Disabled static pages and course team test seen to fail in master
 2014-01-13 11:18:01 -08:00
Will Daly
7adb48c0f0 Disabled static pages and course team test seen to fail in master 2014-01-13 14:14:52 -05:00
Will Daly
167cf94a6f Merge pull request #2153 from edx/will/disable-video-test 
Disabled video start and end time test
 2014-01-13 10:39:58 -08:00
Will Daly
3f126ac46c Disabled video start and end time test 2014-01-13 13:37:58 -05:00
Feanil Patel
a86086b771 Merge pull request #2041 from edx/feanil/transfer_students 
Add a command to transfer students from one course to another.
 2014-01-13 08:30:51 -08:00
Christina Roberts
6c49e0db14 Merge pull request #2105 from edx/christina/reorder-privates 
Fix bug about draft verticals reordering.
 2014-01-13 07:22:17 -08:00
Anton Stupak
9abe8ae39a Merge pull request #2135 from edx/anton/fix-video-volume-cookie 
Video: Fix volume cookie.
 2014-01-13 07:08:40 -08:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00
Jason Bau
5f3313ece4 small bugfixes for theming+sass+templates 2014-01-10 16:36:23 -08:00
Ned Batchelder
fd13908b90 Fix single-quoted translated strings to be double-quoted. 2014-01-10 14:40:34 -05:00
Ned Batchelder
4e298a1abb Add an apostrophe to the Lorem text. 2014-01-10 14:35:17 -05:00
Feanil Patel
16d6d23fbc Save state before unenrolling student from old course. 2014-01-10 14:16:04 -05:00
Usman Khalid
76f4eaf947 Merge pull request #2068 from edx/usman/lms1584-edge-home-page 
Fix register button on edge
 2014-01-10 11:01:44 -08:00
Feanil Patel
1be33651b0 CertificateItems should be updated for all course students. 
Not just students that are currently active.  Students may have enrolled with verified certs, paid, gotten
a refund, and un-enrolled from the original course.  This function should now capture that.
 2014-01-10 13:18:39 -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
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
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