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

20176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
d8df97aa50 Use ddt to separate test cases into tests. 2014-01-07 09:43:46 -05: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
6d5e13e245 Use the same marker everywhere for translator comments. 2014-01-07 09:43:46 -05:00
Ned Batchelder
27b8c83b34 Mark XModule strings for i18n 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
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype 
Assign valid content_type to static resource (import_static_content)
 2014-01-06 23:35:44 -08:00
Mark Hoeber
249a61820f Merge pull request #2023 from edx/sylvia/documentation/BLD-619 
Add info about template for Checkbox problem type
 2014-01-06 12:25:54 -08:00
spearce
e60524912f Update index 
Remove javascript_input and create_lti; add tools
 2014-01-06 14:12:25 -05:00
Andy Armstrong
024c3f6511 Merge pull request #2085 from edx/andya/asset-pagination-fix 
Fix URI vendor module to be referenced via a relative URL.
 2014-01-06 09:08:23 -08:00
spearce
bdd6b73957 Update JSInput info with feedback from Jean-Michel 
Add more specific info about HTML+CSS+JS files, SOP
 2014-01-06 11:37:54 -05:00
Andy Armstrong
fa55ac1315 Fix URI vendor module to be referenced via a relative URL. 2014-01-06 11:31:58 -05:00
Usman Khalid
6108529ce1 Merge pull request #2001 from edx/waheed/openended-problems-commands-2 
Django command to post submissions to ora
 2014-01-06 08:04:33 -08:00
Ned Batchelder
7d98231eb8 Merge pull request #2082 from edx/ned/dont-catch-all-exceptions 
Don't catch all exceptions.
 2014-01-06 07:28:28 -08:00
Ned Batchelder
93682af4eb Don't catch all exceptions. 2014-01-06 10:24:00 -05:00
brianhw
9c81a07012 Merge pull request #2076 from edx/brian/server-track-null-request 
Modify server_track to handle being called without a request.
 2014-01-06 07:15:14 -08: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
Andy Armstrong
4ddc36dccc Merge pull request #1912 from edx/andy/asset-pagination 
Add pagination to Studio's Files and Uploads page.

These changes are for STUD-813.
 2014-01-06 06:12:25 -08:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content) 
STUD-878
 2014-01-06 14:05:09 +05:00
Andy Armstrong
c573db35d0 Add myself to list of authors 2014-01-05 23:37:21 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page 
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
 2014-01-05 23:35:12 -05:00
Brian Wilson
7e31c95c45 Modify server_track to handle being called without a request. 2014-01-05 22:58:10 -05:00
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
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
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
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