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

17121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
db6d76d643 Patched textbook TOC request during course import. 
Patched Snuggletex server calls
 2013-08-27 08:28:15 -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
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
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
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
chrisndodge
9899b1a484 Merge pull request #783 from edx/fix/cdodge/add-contentstore-teardown 
teardown the content database after tests
 2013-08-22 15:10:35 -07:00
Chris Dodge
7edfd185b7 teardown the content database after tests 2013-08-22 17:35:38 -04:00
Peter Fogg
75b76b37ef Add delete confirmation to static pages. 
We used to use a regular JS `confirm`; this makes the UI consistent
with the rest of Studio.
 2013-08-22 16:41:07 -04:00
Diana Huang
7cd385bb67 Merge pull request #736 from edx/diana/verified-certs-payment 
Payment/Shopping Cart Backend
 2013-08-22 13:11:12 -07:00
Will Daly
1cb52df16b Removed unnecessary TestCase 2013-08-22 16:10:24 -04:00
Diana Huang
b761976167 Remove unnecessary verified certificate view. 2013-08-22 15:58:13 -04:00
Diana Huang
569727e608 Pep8 fixes 2013-08-22 15:58:07 -04:00
Peter Fogg
2466a5f557 Allow Studio to display error modules. 2013-08-22 15:48:49 -04:00
Jason Bau
d7e311f5d2 remove DEBUG flag from cart addition urls--causing test failure 2013-08-22 15:39:57 -04:00
Jason Bau
1202b77d7d shopping cart view tests. coverage full except for debug line 2013-08-22 15:39:57 -04:00
Jason Bau
2c4b1e17b4 started view tests 2013-08-22 15:39:57 -04:00
Diana Huang
e8db9e8f2a Make each item purchase transaction atomic 
and add the ability to record the fulfillment time
 2013-08-22 15:39:57 -04:00