Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4229 Commits

Author SHA1 Message Date
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04:00
Calen Pennington
1d2e0b6615 Merge pull request #930 from cpennington/rename-xblock-field-data 
Rename xblock_field_data to xmodule_field_data
 2013-09-18 11:33:25 -07:00
Jay Zoldak
35abac4770 Merge pull request #1036 from edx/zoldak/refactor-static-page-tests 
Simplify static page acceptance tests
 2013-09-18 11:14:01 -07:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
jkarni
0e2d833a2e Merge pull request #830 from edx/jkarni/fix/unicode-import 
Fix import errors with unicode filenames
 2013-09-18 07:23:43 -07:00
Jay Zoldak
2a0e2fd39d Simplify static page acceptance tests 2013-09-18 10:00:56 -04:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Jay Zoldak
fe71ace529 Improve retry logic for Stale Element Exceptions 
Better exception retry logic

Change methods to lambdas
 2013-09-17 12:49:46 -04:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
chrisndodge
b6761498a3 Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete 
define a unseeding forums permissions and call into it from delete_cours...
 2013-09-13 07:23:14 -07:00
Chris Dodge
955e54c2e6 refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method 2013-09-13 09:07:01 -04:00
Chris Dodge
2ac6d78a90 update comment 2013-09-12 16:01:51 -04:00
Chris Dodge
bf67c83340 update comment and verify seeding was done 2013-09-12 15:58:56 -04:00
Julian Arni
1813b22ab0 Fix import errors with unicode filenames 2013-09-12 15:47:59 -04:00
Chris Dodge
615341fb65 add one more test to verify that deleting one courses forum permissions does not accidentially delete another course's forum seeding 2013-09-12 15:03:00 -04:00
cahrens
2c9fc59d79 Unused import. 2013-09-12 14:30:00 -04:00
cahrens
ce4fb08bdf Style cleanup. 2013-09-12 14:30:00 -04:00
cahrens
95ad1826d4 Hide show_timezone from Advanced Settings and migrate courses with show_timezone=False to using due_date_display_format. 2013-09-12 14:30:00 -04:00
Chris Dodge
bd69db4410 switch to using get() rather than get_or_create(). Also add a test case with a different casing on the courseId 2013-09-12 14:27:57 -04:00
Chris Dodge
41be20a000 define a unseeding forums permissions and call into it from delete_course 
define a unseeding forums permissions and call into it from delete_course

define a unseeding forums permissions and call into it from delete_course
 2013-09-12 14:27:57 -04:00
Christina Roberts
784115ac79 Merge pull request #901 from edx/christina/dont_import_checklists 
Do not store expanded action URLs.
 2013-09-12 07:54:25 -07:00
Julian Arni
ca2049abd3 Fixes extra 'file' that was leftover locally after import 2013-09-12 10:29:41 -04:00
cahrens
ea26b19d0b pylint/pep8 cleanup. 2013-09-12 09:47:30 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
cahrens
ff2d952d39 Change course id limit to 65. 
STUD-726
 2013-09-11 16:15:16 -04:00
jkarni
df72f02898 Merge pull request #931 from edx/jkarni/fix/itemsavelogging 
Add logging to save item
 2013-09-11 09:33:19 -07:00
Julian Arni
c08a1b3e62 Fix element name conflict 2013-09-10 13:48:12 -04:00
jkarni
64b1f2b7e9 Merge pull request #904 from edx/jkarni/fix/textbook-upload 
Fix element name conflict
 2013-09-10 10:23:23 -07:00
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