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

3247 Commits

Author SHA1 Message Date
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-10 12:30:42 +03:00
Julian Arni
0acaaa8859 Fix element name conflict 2013-09-09 18:32:01 -04:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module" 
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
 2013-09-09 22:51:57 +03: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
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
12bd7309d2 add content assertions 2013-09-06 16:03:09 -04: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
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
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
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 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
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
Julian Arni
e0ab75fb84 Add support for multiple file uploads 2013-08-29 09:55:40 -04:00
ichuang
4a706641f2 add test for tab names importing correctly 2013-08-27 20:03:35 -04: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
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
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
3aaa2868c0 Process uploaded chunks. 
Also adds lockfile for asynchronous status updates.
 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