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

3469 Commits

Author SHA1 Message Date
cahrens
4e67783644 Don't show course about page link when we have the marketing site. 
STUD-733
 2013-09-05 14:26:08 -04:00
Chris Dodge
4a12cb60c9 due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio 2013-09-05 12:43:24 -04:00
Ned Batchelder
ac2b7a3ac1 Merge pull request #863 from edx/ned/fix-simple-things-because,-damn 
fix simple things because, damn
 2013-09-04 09:12:43 -07:00
Ned Batchelder
3a5f718a32 fix simple things because, damn 2013-09-04 11:10:05 -04:00
Adam
ef042c39aa Merge pull request #853 from edx/fix/adam/pylint-pep8 
fix pep8 and pylint errors
 2013-09-03 14:22:11 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Will Daly
e284ac682a Merge pull request #837 from edx/will/faster-acceptance-test-startup 
Skip migrations if running acceptance in fasttest mode
 2013-09-03 11:58:43 -07:00
Adam Palay
300f7f13a6 fix pep8 and pylint errors 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
 2013-09-03 14:55:11 -04:00
Will Daly
24d3d9492a Merge pull request #836 from edx/will/fix-video-caption-tests 
Updated acceptance tests to match new behavior in video captions.
 2013-09-02 10:31:45 -07:00
Will Daly
1f2f0bf348 Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance 2013-09-02 09:58:08 -04:00
Will Daly
2ed66ce7a5 Updated acceptance tests to match new behavior in video captions. 2013-08-30 16:17:01 -04:00
cahrens
a061c7ece7 Rewriting of links for Course Updates and Course Handouts. 
STUD-669.
 2013-08-29 14:35:16 -04:00
Kevin Luo
3ea2b24b98 Add HTML editor for authoring bulk email message (adopted from CMS) 2013-08-29 12:40:32 -04:00
Will Daly
23805ca52f Studio JS fixture files no longer need individual symlinks 2013-08-29 07:50:28 -04:00
Julian Arni
6cb2e0b206 Check extension rather than mimetype 2013-08-28 11:13:20 -04:00
ichuang
4a706641f2 add test for tab names importing correctly 2013-08-27 20:03:35 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
Calen Pennington
4b1fa6b316 Merge pull request #690 from cpennington/one-time-startup 
One time startup centralization
 2013-08-27 12:19:42 -07:00
Will Daly
e50a2414b2 Studio ModuleStoreTestCase subclasses now use randomized Mongo 
collection names
 2013-08-27 12:57:14 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release' 
Contains hotfix/2013-18-21
 2013-08-27 11:05:13 -04:00
Anton Stupak
dd9b16c2cf Replace the description in the studio editing module. 2013-08-27 15:22:47 +03:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04: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
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
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
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
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes 
fix some gaps which would allow the temporary xml attributes 'parent_seq...
 2013-08-22 11:00:55 -07:00
Chris Dodge
bd412182c7 verticals shouldn't have 'data' 2013-08-22 12:01:17 -04:00