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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
be6c57f53a Mark XModule strings for i18n 2014-01-03 17:50:16 -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
dd591a4caf Merge pull request #2046 from edx/talbs/lms-devscss 
LMS: Developer-centric Sass Area
 2014-01-03 11:57:57 -08:00
Brian Talbot
092cc4d6f8 Merge pull request #2047 from edx/talbs/studio-devscss 
Studio: Developer-centric Sass Area
 2014-01-03 11:57:34 -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 Talbot
5e3e2ae603 Studio: 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 shame and application Sass files
 2014-01-03 13:50:01 -05:00
Gabe Mulley
34a340a075 Merge pull request #1682 from mulby/gabe/fix-get-items-without-data 
prevent failure when module does not have a data field
 2014-01-03 08:26:18 -08:00
Gabe Mulley
b9096b1bb5 prevent failure when module does not have a data field 2014-01-03 10:49:00 -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
0d3c18df5d Merge pull request #2069 from edx/ned/minor-startup-fixes 
Very Minor tweaks to the LMS and CMS startup.
 2014-01-03 05:23:45 -08: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
Mark Hoeber
628cc8b014 added SPOC info 
For stud-1019
 2013-12-31 17:37:15 -05:00
Mark Hoeber
dc42ebc952 Moved change log 
Moved change log to beginning of document.
 2013-12-31 16:50:19 -05:00
Mark Hoeber
e7da2bcdba Updated change log 
Added new changes in Mistletoe sprint to change log.
 2013-12-31 16:49:24 -05:00
Mark Hoeber
81af005ae4 Find Files doc update 
clarified sentence on what's shown at top of page
 2013-12-31 16:33:20 -05:00
Mark Hoeber
b4ca70ad48 Subsection grading changed 
Changed terminology to not refer to setting grading policy for a
subsection, but selecting an assignment type
 2013-12-31 12:29:22 -05:00
Mark Hoeber
a3fa29a266 Updated topic Testing Your Course for new outline page 
Updated some text and all new images
 2013-12-31 10:40:40 -05:00
David Baumgold
1c97909047 Merge pull request #2060 from edx/louyihua/tzAbbr 
Fix tzAbbr() in non-English browsers #os
 2013-12-31 07:31:12 -08:00
louyihua
fefb7757e7 Add 'Yihua Lou <supermouselyh@hotmail.com>' to the AUTHORS file. 2013-12-31 09:12:31 -05:00
louyihua
31cb9bab26 The function tzAbbr() causes null-reference exception when the browse returns a non-English timezone string. 2013-12-31 09:12:30 -05:00
zubair-arbi
96a3d586be Merge pull request #2052 from zubair-arbi/zub/bugfix/std988-integergradingtypes 
add validation for grading types (allow only integers)
 2013-12-31 06:04:25 -08:00
zubair-arbi
236c50d78a Merge pull request #2048 from zubair-arbi/zub/bugfix/std1071-staticpagespreview 
Hide staticpages preview on render
 2013-12-31 02:02:18 -08:00
zubair-arbi
172e0de727 Merge pull request #2044 from zubair-arbi/zub/bugfix/std674-inserteditlink 
update rewriteStaticLinks utility function(modifiy only relative urls) +...
 2013-12-31 01:54:46 -08:00
zubiar-arbi
2f1e696621 add validation for grading types (allow only integers) 
STUD-988
 2013-12-31 14:35:25 +05:00
zubiar-arbi
5ad73f0839 fix tinymce popup size too small 
STUD-674
 2013-12-31 14:11:34 +05:00
zubiar-arbi
0d1a10659c update rewriteStaticLinks utility function(modifiy only relative urls) 
STUD-674
 2013-12-31 12:58:48 +05:00
Mark Hoeber
1e1beea4ad Added file pagination info 
For files & uploads page.  stud-1034
 2013-12-30 16:46:44 -05:00
Adam
3fc461f492 Merge pull request #1863 from edx/adam/ie-modal-fix 
a11y: manage focus appropriately for modals with iframes in IE (LMS-1539...
 2013-12-30 13:39:38 -08:00
Adam Palay
e7f029f615 a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) 2013-12-30 16:11:20 -05:00
cahrens
0222e57cff Add acceptance test for behavior when & is in problem xml. 
Part of STUD-91
 2013-12-30 15:08:53 -05:00
cahrens
4c126c7b28 Add & to contents to verify that import/export still works. 
Part of STUD-91
 2013-12-30 15:08:53 -05:00
Mark Hoeber
2ff21c485a Doc update for changes to course outline 
For STUD-1034
 2013-12-30 14:35:50 -05:00
Anton Stupak
2852a4f9bf Merge pull request #2054 from edx/anton/disable-js-unit-test 
Disable js unit test due to flakiness.
 2013-12-30 10:03:19 -08: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
polesye
65f903a325 Disable tests due to flakiness. 2013-12-30 18:07:40 +02:00
Christina Roberts
ad6e4f2c64 Merge pull request #2020 from edx/christina/export-bug2 
Support non-ascii chars as arguments to format.
 2013-12-27 08:35:55 -08:00
Christina Roberts
719a898e0f Merge pull request #2018 from edx/christina/export-bug 
Bug fixes related to unicode support in export workflow.
 2013-12-27 08:34:49 -08:00
zubiar-arbi
288a699f37 Hide staticpages preview on render 
STUD-1071
 2013-12-27 15:11:04 +05:00
Oleg Marshev
7b6d04d236 Merge pull request #1987 from edx/oleg/fix_mock_lti_protocols 
Fixes and improvement to LTI.
 2013-12-27 01:55:11 -08:00
Oleg Marshev
7c070f29a1 Add better messaging, turn off SSL verification when sending grade back. 2013-12-27 09:59:21 +02:00
zubair-arbi
e24ddaa329 Merge pull request #2026 from zubair-arbi/zub/bugfix/std988-gradingtypes 
Grading types should not allow empty field for "Total Number" and "Numbe...
 2013-12-26 01:19:01 -08:00
zubiar-arbi
4cb03f43a2 Grading types should not allow empty field for "Total Number" and "Number of Droppable" 
STUD-988
 2013-12-26 13:51:53 +05:00
Anton Stupak
23dc10d004 Merge pull request #1998 from edx/anton/fix-video-in-ipad 
Fix video controls on iPad.
 2013-12-24 22:40:25 -08:00
Jay Zoldak
a68f59292a Merge pull request #1963 from edx/zoldak/update-changelog 
Update changelog with studio marketing site feature
 2013-12-24 10:39:21 -08:00
spearce
6cfe7669e3 Update JS Input to reflect new template in Studio 
Update Advanced Problems file and Appendix F
 2013-12-24 13:24:45 -05:00
Don Mitchell
07ab23b1e5 Locator as prime repr 2013-12-24 11:18:29 -05:00
Will Daly
b992a0c33d Merge pull request #2037 from edx/will/npm-registry 
Set the registry for node in prereqs
 2013-12-24 06:40:50 -08:00