Commits · 9c81a070120726e1f96544efc0d3ced0e68745af · edx / edx-platform

06 Jan, 2014 5 commits

Merge pull request #2076 from edx/brian/server-track-null-request · 9c81a070
```
Modify server_track to handle being called without a request.
```
brianhw committed Jan 06, 2014
9c81a070 Browse Files
Merge pull request #1912 from edx/andy/asset-pagination · 4ddc36dc
```
Add pagination to Studio's Files and Uploads page.

These changes are for STUD-813.
```
Andy Armstrong committed Jan 06, 2014
4ddc36dc Browse Files
Add myself to list of authors · c573db35
Andy Armstrong committed Jan 05, 2014

c573db35 Browse Files

Add pagination to Studio's Files and Uploads page · f9c45586

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

committed Jan 05, 2014

f9c45586 Browse Files

Modify server_track to handle being called without a request. · 7e31c95c
Brian Wilson committed Jan 05, 2014

7e31c95c Browse Files

03 Jan, 2014 10 commits
- Merge pull request #2008 from edx/brian/dump-inherited-metadata · 5dccff51
```
Add options to dump_course_structure to output inherited metadata.
```
  brianhw committed Jan 03, 2014
  5dccff51 Browse Files
- Merge pull request #2046 from edx/talbs/lms-devscss · dd591a4c
```
LMS: Developer-centric Sass Area
```
  Brian Talbot committed Jan 03, 2014
  dd591a4c Browse Files
- Merge pull request #2047 from edx/talbs/studio-devscss · 092cc4d6
```
Studio: Developer-centric Sass Area
```
  Brian Talbot committed Jan 03, 2014
  092cc4d6 Browse Files
- LMS: adds in developer-centric Sass file · fcda9136
```
* 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
```
  Brian Talbot committed Jan 03, 2014
  fcda9136 Browse Files
- Studio: adds in developer-centric Sass file · 5e3e2ae6
```
* 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
```
  Brian Talbot committed Jan 03, 2014
  5e3e2ae6 Browse Files
- Merge pull request #1682 from mulby/gabe/fix-get-items-without-data · 34a340a0
```
prevent failure when module does not have a data field
```
  Gabe Mulley committed Jan 03, 2014
  34a340a0 Browse Files
- prevent failure when module does not have a data field · b9096b1b
  Gabe Mulley committed Jan 03, 2014
  
  b9096b1b Browse Files
- Add tests for inherited metadata to test_dump_course, and move to commands/tests dir. · d0fea429
  Brian Wilson committed Jan 03, 2014
  
  d0fea429 Browse Files
- Add options to dump_course_structure to output inherited metadata. · 4569ee9d
  Brian Wilson committed Jan 03, 2014
  
  4569ee9d Browse Files
- Merge pull request #2069 from edx/ned/minor-startup-fixes · 0d3c18df
```
Very Minor tweaks to the LMS and CMS startup.
```
  Ned Batchelder committed Jan 03, 2014
  0d3c18df Browse Files
02 Jan, 2014 1 commit

Very Minor tweaks to the LMS and CMS startup. · 39380f2d

I was going to do something in the startup code, then changed my mind,
but didn't want to just discard these changes.

committed Jan 02, 2014

39380f2d Browse Files

31 Dec, 2013 9 commits
- Merge pull request #2060 from edx/louyihua/tzAbbr · 1c979090
```
Fix tzAbbr() in non-English browsers #os
```
  David Baumgold committed Dec 31, 2013
  1c979090 Browse Files
- Add 'Yihua Lou <supermouselyh@hotmail.com>' to the AUTHORS file. · fefb7757
  louyihua committed Dec 31, 2013
  
  fefb7757 Browse Files
- The function tzAbbr() causes null-reference exception when the browse returns a… · 31cb9bab
```
The function tzAbbr() causes null-reference exception when the browse returns a non-English timezone string.
```
  louyihua committed Dec 31, 2013
  31cb9bab Browse Files
- Merge pull request #2052 from zubair-arbi/zub/bugfix/std988-integergradingtypes · 96a3d586
```
add validation for grading types (allow only integers)
```
  zubair-arbi committed Dec 31, 2013
  96a3d586 Browse Files
- Merge pull request #2048 from zubair-arbi/zub/bugfix/std1071-staticpagespreview · 236c50d7
```
Hide staticpages preview on render
```
  zubair-arbi committed Dec 31, 2013
  236c50d7 Browse Files
- Merge pull request #2044 from zubair-arbi/zub/bugfix/std674-inserteditlink · 172e0de7
```
update rewriteStaticLinks utility function(modifiy only relative urls) +...
```
  zubair-arbi committed Dec 31, 2013
  172e0de7 Browse Files
- add validation for grading types (allow only integers) · 2f1e6966
```
STUD-988
```
  zubiar-arbi committed Dec 31, 2013
  2f1e6966 Browse Files
- fix tinymce popup size too small · 5ad73f08
```
STUD-674
```
  zubiar-arbi committed Dec 31, 2013
  5ad73f08 Browse Files
- update rewriteStaticLinks utility function(modifiy only relative urls) · 0d1a1065
```
STUD-674
```
  zubiar-arbi committed Dec 31, 2013
  0d1a1065 Browse Files
30 Dec, 2013 5 commits
- Merge pull request #1863 from edx/adam/ie-modal-fix · 3fc461f4
```
a11y: manage focus appropriately for modals with iframes in IE (LMS-1539...
```
  Adam committed Dec 30, 2013
  3fc461f4 Browse Files
- a11y: manage focus appropriately for modals with iframes in IE (LMS-1539) · e7f029f6
  Adam Palay committed Dec 30, 2013
  
  e7f029f6 Browse Files
- Merge pull request #2054 from edx/anton/disable-js-unit-test · 2852a4f9
```
Disable js unit test due to flakiness.
```
  Anton Stupak committed Dec 30, 2013
  2852a4f9 Browse Files
- Merge pull request #2036 from edx/adam/remove-@edx-emails · 9f2c31d9
```
removes references to specific edx email addresses (STUD-1069)
```
  Adam committed Dec 30, 2013
  9f2c31d9 Browse Files
- Disable tests due to flakiness. · 65f903a3
  polesye committed Dec 30, 2013
  
  65f903a3 Browse Files
27 Dec, 2013 5 commits
- Merge pull request #2020 from edx/christina/export-bug2 · ad6e4f2c
```
Support non-ascii chars as arguments to format.
```
  Christina Roberts committed Dec 27, 2013
  ad6e4f2c Browse Files
- Merge pull request #2018 from edx/christina/export-bug · 719a898e
```
Bug fixes related to unicode support in export workflow.
```
  Christina Roberts committed Dec 27, 2013
  719a898e Browse Files
- Hide staticpages preview on render · 288a699f
```
STUD-1071
```
  zubiar-arbi committed Dec 27, 2013
  288a699f Browse Files
- Merge pull request #1987 from edx/oleg/fix_mock_lti_protocols · 7b6d04d2
```
Fixes and improvement to LTI.
```
  Oleg Marshev committed Dec 27, 2013
  7b6d04d2 Browse Files
- Add better messaging, turn off SSL verification when sending grade back. · 7c070f29
  Oleg Marshev committed Dec 27, 2013
  
  7c070f29 Browse Files
26 Dec, 2013 2 commits
- Merge pull request #2026 from zubair-arbi/zub/bugfix/std988-gradingtypes · e24ddaa3
```
Grading types should not allow empty field for "Total Number" and "Numbe...
```
  zubair-arbi committed Dec 26, 2013
  e24ddaa3 Browse Files
- Grading types should not allow empty field for "Total Number" and "Number of Droppable" · 4cb03f43
```
STUD-988
```
  zubiar-arbi committed Dec 26, 2013
  4cb03f43 Browse Files
25 Dec, 2013 1 commit
- Merge pull request #1998 from edx/anton/fix-video-in-ipad · 23dc10d0
```
Fix video controls on iPad.
```
  Anton Stupak committed Dec 24, 2013
  23dc10d0 Browse Files
24 Dec, 2013 2 commits
- Merge pull request #1963 from edx/zoldak/update-changelog · a68f5929
```
Update changelog with studio marketing site feature
```
  Jay Zoldak committed Dec 24, 2013
  a68f5929 Browse Files
- Merge pull request #2037 from edx/will/npm-registry · b992a0c3
```
Set the registry for node in prereqs
```
  Will Daly committed Dec 24, 2013
  b992a0c3 Browse Files