Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,141 Commits 1 Branch 0 Tags
02cb0b487db954522ee052d25beb603f0c23721b
Commit Graph

17141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
02cb0b487d Merge pull request #795 from edx/will/silence-doc-warnings 
Silence doc test errors/warnings
 2013-08-27 09:47:20 -07:00
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release' 
Contains hotfix/2013-18-21
 2013-08-27 11:05:13 -04:00
Vik Paruchuri
0e4b114278 Merge pull request #633 from edx/fix/vik/oe-state 
Fix/vik/oe state
 2013-08-27 07:01:32 -07:00
polesye
7d9607f0bd Merge pull request #800 from edx/anton/replace_subtitles_with_timed_transcript 
Video Player: replace the description in the studio editing module for "subtitles" with "timed transcript"
 2013-08-27 05:42:22 -07:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
Adam
4cb7863074 Merge pull request #786 from edx/adam/turn-off-password-autocomplete 
Adam/turn off password autocomplete
 2013-08-26 14:42:05 -07:00
Will Daly
12cf060ba7 Silence doc test errors/warnings 2013-08-26 15:57:58 -04:00
Vik Paruchuri
3c55a44b6b Address review comments 2013-08-26 10:36:24 -04:00
Sarina Canelake
a374fceb77 Merge pull request #791 from edx/sarina/rake_coverage_combined 
Add combined coverage to `rake coverage`
 2013-08-26 07:24:46 -07:00
Sarina Canelake
269857010c Merge pull request #789 from edx/sarina/pep8_ignore_migrations 
Change `rake pep8` to ignore migrations files
 2013-08-26 07:17:52 -07:00
Adam
3d73ff45c7 Merge pull request #759 from edx/fix/adam/unenroll-error-logging 
fix error logging for unenrolling if enrollment not found
 2013-08-26 07:11:17 -07:00
Sarina Canelake
494ece759a Merge pull request #583 from edx/sarina/diffquality-python-path 
Add a python prefix for `diff-quality` task
 2013-08-26 07:06:49 -07:00
Sarina Canelake
ff9e01b403 Add a python prefix for diff-quality task 2013-08-26 10:05:59 -04:00
Sarina Canelake
a4d1c52ec8 Change .pep8 to ignore migrations files 2013-08-26 10:02:24 -04:00
Adam Palay
935ebc4e7a remove unused registration templates 2013-08-26 10:01:03 -04:00
Sarina Canelake
eee18c3db3 Add combined coverage to rake coverage 2013-08-26 09:42:26 -04:00
Adam Palay
d347390c24 fix error logging for unenrolling if enrollment not found 2013-08-26 09:39:16 -04:00
jkarni
87500a47fb Merge pull request #674 from edx/jkarni/feature/chunkedupload 
Jkarni/feature/chunkedupload
 2013-08-25 20:06:17 -07:00
Julian Arni
1e44e01629 Remove assert2xx 2013-08-25 22:50:26 -04:00
Julian Arni
03b140d538 Review fixes 2013-08-25 22:40:11 -04:00
Julian Arni
509a861459 Clear contentstore 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-08-25 22:40:11 -04:00
Julian Arni
a28b02ae2c Pep8 and pylint fixes 2013-08-25 22:40:11 -04:00
Julian Arni
fcd11d93d5 Handle nginx 499s and double requests 2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f remove repeated warnings 2013-08-25 22:40:10 -04:00
Julian Arni
ef0828fc66 Behave properly on non-tar-gz files 2013-08-25 22:40:10 -04:00
Julian Arni
eaa4b3ef99 Pep8 and pylint fixes 2013-08-25 22:40:10 -04:00
Julian Arni
d991595ecb Split import-export into new file 2013-08-25 22:40:10 -04:00
Julian Arni
993b92bc47 Add import tests 2013-08-25 22:40:10 -04:00
Julian Arni
7666aad042 Check download integrity 2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e Small review fixes. 
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
 2013-08-25 22:40:09 -04:00
Julian Arni
798d07a8d9 Fix confusing message 2013-08-25 22:40:09 -04:00
Julian Arni
3aaa2868c0 Process uploaded chunks. 
Also adds lockfile for asynchronous status updates.
 2013-08-25 22:40:09 -04:00
Julian Arni
50934d4d45 Make client-side use jquery-file-upload 2013-08-25 22:40:09 -04:00
Julian Arni
b6795b4e88 Add jquery-file-upload 2013-08-25 22:40:09 -04:00
caesar2164
a902201f06 Merge pull request #720 from edx/akshay/order-commentables 
Bug fix -- subcategories in forums topic list should now be sorted alphabetically
 2013-08-23 13:01:06 -07:00
Giulio Gratta
44f4e7b10a refatoring tests and added to changelog 2013-08-23 12:59:14 -07:00
Giulio Gratta
4e77098859 added course level feature flag for forum alpha sorting as well as tests 2013-08-23 12:59:13 -07:00
Giulio Gratta
e0471007d8 removed sort in HTML and instead added conditional to use subcategory titles as sort_key 2013-08-23 12:59:13 -07:00
Akshay Jagadeesh
8cac4ebae2 Working on sorting dropdown commentables 2013-08-23 12:59:13 -07:00
Peter Fogg
5cb1b2594f Merge pull request #787 from edx/peter-fogg/static-page-delete 
Add delete confirmation to static pages.
 2013-08-23 11:52:37 -07:00
Peter Fogg
07d9106c09 Merge pull request #769 from edx/peter-fogg/studio-error-descriptor 
Allow Studio to display error modules.
 2013-08-23 11:51:57 -07:00
Vik Paruchuri
dfb8e9f0e3 Fix max score calculation 2013-08-23 13:48:59 -04:00
Vik Paruchuri
7ff03124d2 pep8, pylint, and more tests 2013-08-23 12:30:18 -04:00
Will Daly
d89279f6b3 Merge pull request #773 from edx/lapentab/fix_network_tests 
Remove network calls in tests
 2013-08-23 09:07:31 -07:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
 2013-08-23 11:48:38 -04:00
Jonah Stanley
bda814fb8c Merge pull request #785 from edx/jonahstanley/fix-image-upload 
Changed error message on failure and made test more robust
 2013-08-23 08:48:00 -07:00
Vik Paruchuri
734843c377 Confirm changed to alert 2013-08-23 11:42:30 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
JonahStanley
473cc3624b Changed error message on failure and made test more robust 
Better error message
 2013-08-23 11:33:52 -04:00
Vik Paruchuri
e142023eed Add in Studio confirmation box before editing OE problems 2013-08-23 11:32:38 -04:00