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

7251 Commits

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
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
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
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
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
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05: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
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
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
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
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
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
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -05:00
James Tauber
5ef94f1496 removed edx.org-specific content no longer used 2014-01-08 17:51:28 +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
Calen Pennington
536d824252 Merge branch 'release' 2014-01-07 15:08:45 -05:00
Greg Price
afaa463f7f Merge pull request #2093 from edx/gprice/forum-vote-button-a11y 
Improve accessibility of forum vote buttons
 2014-01-07 10:54:17 -08:00
frances botsford
1adc4fe253 Merge pull request #2092 from tusbar/course-bottom-university-span 
Use <span> for course preview’s university #os
 2014-01-07 08:24:33 -08:00
Ned Batchelder
209f8cc3db Lorem is now fancy, and HTML tags are recognized with single-quote attributes. 2014-01-07 09:43:46 -05:00
Ned Batchelder
549d9230f8 Merge pull request #2077 from edx/ned/misc-msg-fixes 
Miscellaneous fixes to strings found during i18n work.
 2014-01-07 06:41:42 -08:00
Bertrand Marron
ac1eed4102 Remove hover state on university name in course preview 2014-01-07 11:25:14 +01:00
Sarina Canelake
fa856d3338 Logging to catch duplicate instructor tasks 2014-01-06 18:20:41 -05:00
Greg Price
b7d7751dc2 Improve accessibility of forum vote buttons 
This change involves substantial refactoring of the relevant code to
reduce duplication. It also makes the templates for the vote buttons
more consistent and cleaner.

JIRA: FOR-64
 2014-01-06 17:08:53 -05:00
Greg Price
d4f7cd68d8 Remove redundant URI.min.js fron lms/ 
A newer version was added to common/, so that is used instead. It is
also added to the set of JS files used in unit tests to allow forums
code in common/ to be tested.
 2014-01-06 17:02:31 -05:00
Greg Price
c44e527615 Remove unused forums-related cruft 2014-01-06 16:59:30 -05:00
Bertrand Marron
9372ba6ef7 Use <span> for course preview’s university 
The course’s university was displayed using a <a> tag that points to
nothing ('#'). There was some stanford specific behavior to replace that
<a> tag with a <span>. This commit removes that.
 2014-01-06 21:09:15 +01:00
Usman Khalid
57710d7226 Added django commands to get statistics and repost submissions to grader for open ended problems. 
ORA-286
 2014-01-06 19:13:28 +05:00
Ned Batchelder
c7cf0c6d3e Fixes to Translator comments found while debugging the i18n pipeline. 2014-01-03 17:50:16 -05:00
Ned Batchelder
2157b4d8b7 Miscellaneous fixes to strings found during i18n work. 2014-01-03 17:50:16 -05:00
brianhw
5dccff518c Merge pull request #2008 from edx/brian/dump-inherited-metadata 
Add options to dump_course_structure to output inherited metadata.
 2014-01-03 12:53:57 -08:00
Brian Talbot
fcda913691 LMS: adds in developer-centric Sass file 
* provides new .scss file for developers to add temporary/in-progress Sass for further refactor/polish
* cleans up note/import order in all application scss files
 2014-01-03 13:52:13 -05:00
Brian Wilson
d0fea42902 Add tests for inherited metadata to test_dump_course, and move to commands/tests dir. 2014-01-03 10:32:42 -05:00
Brian Wilson
4569ee9daa Add options to dump_course_structure to output inherited metadata. 2014-01-03 10:32:42 -05:00
Ned Batchelder
39380f2d22 Very Minor tweaks to the LMS and CMS startup. 
I was going to do something in the startup code, then changed my mind,
but didn't want to just discard these changes.
 2014-01-02 14:27:52 -05:00
Adam Palay
e7f029f615 a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) 2013-12-30 16:11:20 -05:00
Adam
9f2c31d91e Merge pull request #2036 from edx/adam/remove-@edx-emails 
removes references to specific edx email addresses (STUD-1069)
 2013-12-30 08:20:56 -08:00
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02:00