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

4005 Commits

Author SHA1 Message Date
Alexander Kryklia
2894b21c32 Merge pull request #804 from edx/valera/lti_module 
LTI module with tests
 2013-09-09 12:38:01 -07:00
Alexander Kryklia
7b637d49d6 Add comma in last item of list. 2013-09-09 19:16:15 +03:00
Alexander Kryklia
e10577d6ad Pass user_id and course_id to runtime in cms (dev) and tests. 2013-09-09 19:16:14 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
jkarni
b53d55543d Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload 
Add support for multiple file uploads
 2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010 Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting 
also even when we have a marketing site, we still need a course image fo...
 2013-09-06 16:58:54 -07:00
Adam
3184939138 Merge pull request #885 from edx/release 
Release
 2013-09-06 13:51:03 -07:00
Chris Dodge
10b7c13652 add comment 2013-09-06 16:05:41 -04:00
Chris Dodge
12bd7309d2 add content assertions 2013-09-06 16:03:09 -04:00
David Baumgold
3b627e8c80 Merge pull request #879 from edx/db/remove-template-loader 
Remove Studio JS template loader
 2013-09-06 12:26:50 -07:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
Chris Dodge
c7f2f27708 fix bug and add unit test 2013-09-06 14:47:59 -04:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Will Daly
99b47da2f4 Merge pull request #878 from edx/will/static-page-test-fix 
Updated static-pages test to add retry logic
 2013-09-06 09:22:46 -07:00
Will Daly
e20f2109d2 Updated static-pages test to add retry logic 2013-09-06 12:21:02 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Don Mitchell
fc131fa841 Add InheritanceKVS and standardize inherited attr patterns 2013-09-06 12:19:50 -04:00
David Baumgold
bcef1994dd remove load_templates.html template 2013-09-06 10:24:27 -04:00
David Baumgold
d984311b2e Remove references to template loader JS library 2013-09-06 09:59:56 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Julian Arni
d0f7206099 Review fixes 2013-09-06 09:25:45 -04:00
David Baumgold
2c2668ca02 Removed template loader JS library 2013-09-06 09:21:55 -04:00
David Baumgold
fd8b375f3a Translated … 2013-09-06 09:17:19 -04:00
David Baumgold
79b3af8749 tabs to spaces 2013-09-06 09:16:26 -04:00
Chris Dodge
0a6565b882 also even when we have a marketing site, we still need a course image for the dashboard 2013-09-05 21:07:22 -04:00
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
Julian Arni
07014e8eb2 Reset modal when closed by clicking outside of it 2013-09-04 16:25:23 -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
David Ormsbee
e7c07d4e43 Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 2013-09-04 10:59:18 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Jay Zoldak
41e3ffc216 Enable developer local overrides to acceptance settings 2013-09-04 09:36:54 -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
Julian Arni
035c4c02b0 Add acceptance tests for multiple files 2013-09-02 22:47:06 -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
Julian Arni
b797118811 review fixes 2013-08-29 17:22:07 -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
Julian Arni
e0ab75fb84 Add support for multiple file uploads 2013-08-29 09:55:40 -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