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

20156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Wilson
1aefe2f5bf Define TrackedCommand for use as base class for tracking management commands. Use in create_user command. 2014-01-06 12:43:04 -05: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
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
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
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
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
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
Will Daly
ed04148c5b Set the registry for node in prereqs 2013-12-24 09:15:15 -05:00
polesye
934b5198c3 Address comments. 2013-12-24 14:59:21 +02:00
polesye
afec2dd4ad Add tests for Android. 2013-12-24 14:59:21 +02:00
polesye
b6808d3d13 BLD-541: Fix video controls on iPad. 2013-12-24 14:59:20 +02:00
Mark Hoeber
9dcc13a9fd Merge pull request #2035 from edx/markhoeber/documentation/remove_stray_file 
Removed extra file
 2013-12-23 14:22:03 -08:00
Adam Palay
517ca9329b removes references to specific edx email addresses (STUD-1069) 2013-12-23 16:28:08 -05:00
Mark Hoeber
71a5d81469 Removed extra file 
Removing long-file-name, stray file from earlier commit
 2013-12-23 16:26:27 -05:00