Commits · cee44501f5a19e0babe5575ad5785b892082fcf8 · edx / edx-platform · GitLab

27 Aug, 2013 4 commits
- Merge remote-tracking branch 'origin/release' · cee44501
```
   Contains hotfix/2013-18-21
```
  Julian Arni committed Aug 27, 2013
  cee44501 Browse Files
- Merge pull request #633 from edx/fix/vik/oe-state · 0e4b1142
```
Fix/vik/oe state
```
  Vik Paruchuri committed Aug 27, 2013
  0e4b1142 Browse Files
- Merge pull request #800 from edx/anton/replace_subtitles_with_timed_transcript · 7d9607f0
```
Video Player: replace the description in the studio editing module for "subtitles" with "timed transcript"
```
  polesye committed Aug 27, 2013
  7d9607f0 Browse Files
- Replace the description in the studio editing module. · dd9b16c2
  Anton Stupak committed Aug 27, 2013
  
  dd9b16c2 Browse Files
26 Aug, 2013 28 commits
- Merge pull request #786 from edx/adam/turn-off-password-autocomplete · 4cb78630
```
Adam/turn off password autocomplete
```
  Adam committed Aug 26, 2013
  4cb78630 Browse Files
- Address review comments · 3c55a44b
  Vik Paruchuri committed Aug 26, 2013
  
  3c55a44b Browse Files
- Merge pull request #791 from edx/sarina/rake_coverage_combined · a374fceb
```
Add combined coverage to `rake coverage`
```
  Sarina Canelake committed Aug 26, 2013
  a374fceb Browse Files
- Merge pull request #789 from edx/sarina/pep8_ignore_migrations · 26985701
```
Change `rake pep8` to ignore migrations files
```
  Sarina Canelake committed Aug 26, 2013
  26985701 Browse Files
- Merge pull request #759 from edx/fix/adam/unenroll-error-logging · 3d73ff45
```
fix error logging for unenrolling if enrollment not found
```
  Adam committed Aug 26, 2013
  3d73ff45 Browse Files
- Merge pull request #583 from edx/sarina/diffquality-python-path · 494ece75
```
Add a python prefix for `diff-quality` task
```
  Sarina Canelake committed Aug 26, 2013
  494ece75 Browse Files
- Add a python prefix for `diff-quality` task · ff9e01b4
  Sarina Canelake committed Aug 26, 2013
  
  ff9e01b4 Browse Files
- Change .pep8 to ignore migrations files · a4d1c52e
  Sarina Canelake committed Aug 26, 2013
  
  a4d1c52e Browse Files
- remove unused registration templates · 935ebc4e
  Adam Palay committed Aug 26, 2013
  
  935ebc4e Browse Files
- Add combined coverage to `rake coverage` · eee18c3d
  Sarina Canelake committed Aug 26, 2013
  
  eee18c3d Browse Files
- fix error logging for unenrolling if enrollment not found · d347390c
  Adam Palay committed Aug 26, 2013
  
  d347390c Browse Files
- Merge pull request #674 from edx/jkarni/feature/chunkedupload · 87500a47
```
Jkarni/feature/chunkedupload
```
  jkarni committed Aug 25, 2013
  87500a47 Browse Files
- Remove assert2xx · 1e44e016
  Julian Arni committed Aug 25, 2013
  
  1e44e016 Browse Files
- Review fixes · 03b140d5
  Julian Arni committed Aug 25, 2013
  
  03b140d5 Browse Files
- Clear contentstore · 509a8614
```
Signed-off-by: Julian Arni <julian@edx.org>
```
  Julian Arni committed Aug 25, 2013
  509a8614 Browse Files
- Pep8 and pylint fixes · a28b02ae
  Julian Arni committed Aug 25, 2013
  
  a28b02ae Browse Files
- Handle nginx 499s and double requests · fcd11d93
  Julian Arni committed Aug 25, 2013
  
  fcd11d93 Browse Files
- remove repeated warnings · 8a8bcf28
  Julian Arni committed Aug 25, 2013
  
  8a8bcf28 Browse Files
- Behave properly on non-tar-gz files · ef0828fc
  Julian Arni committed Aug 25, 2013
  
  ef0828fc Browse Files
- Pep8 and pylint fixes · eaa4b3ef
  Julian Arni committed Aug 25, 2013
  
  eaa4b3ef Browse Files
- Split import-export into new file · d991595e
  Julian Arni committed Aug 25, 2013
  
  d991595e Browse Files
- Add import tests · 993b92bc
  Julian Arni committed Aug 25, 2013
  
  993b92bc Browse Files
- Check download integrity · 7666aad0
  Julian Arni committed Aug 25, 2013
  
  7666aad0 Browse Files
- Small review fixes. · 513b6cab
```
  Comments, httpresponse -> jsonresponse; make sure errors get relayed.
```
  Julian Arni committed Aug 25, 2013
  513b6cab Browse Files
- Fix confusing message · 798d07a8
  Julian Arni committed Aug 25, 2013
  
  798d07a8 Browse Files
- Process uploaded chunks. · 3aaa2868
```
   Also adds lockfile for asynchronous status updates.
```
  Julian Arni committed Aug 25, 2013
  3aaa2868 Browse Files
- Make client-side use jquery-file-upload · 50934d4d
  Julian Arni committed Aug 25, 2013
  
  50934d4d Browse Files
- Add jquery-file-upload · b6795b4e
  Julian Arni committed Aug 25, 2013
  
  b6795b4e Browse Files
23 Aug, 2013 8 commits
- Merge pull request #720 from edx/akshay/order-commentables · a902201f
```
Bug fix -- subcategories in forums topic list should now be sorted alphabetically
```
  caesar2164 committed Aug 23, 2013
  a902201f Browse Files
- refatoring tests and added to changelog · 44f4e7b1
  Giulio Gratta committed Aug 23, 2013
  
  44f4e7b1 Browse Files
- added course level feature flag for forum alpha sorting as well as tests · 4e770988
  Giulio Gratta committed Aug 23, 2013
  
  4e770988 Browse Files
- removed sort in HTML and instead added conditional to use subcategory titles as sort_key · e0471007
  Giulio Gratta committed Aug 23, 2013
  
  e0471007 Browse Files
- Working on sorting dropdown commentables · 8cac4eba
  Akshay Jagadeesh committed Aug 23, 2013
  
  8cac4eba Browse Files
- Merge pull request #787 from edx/peter-fogg/static-page-delete · 5cb1b259
```
Add delete confirmation to static pages.
```
  Peter Fogg committed Aug 23, 2013
  5cb1b259 Browse Files
- Merge pull request #769 from edx/peter-fogg/studio-error-descriptor · 07d9106c
```
Allow Studio to display error modules.
```
  Peter Fogg committed Aug 23, 2013
  07d9106c Browse Files
- Fix max score calculation · dfb8e9f0
  Vik Paruchuri committed Aug 23, 2013
  
  dfb8e9f0 Browse Files