Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

894 Commits

Author SHA1 Message Date
Arthur Barrett
beabdf1434 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-11 14:52:39 -04:00
Steve Strassmann
c071ee448f pep8 compliance 2013-05-10 16:51:26 -04:00
Steve Strassmann
571a9af0c0 declared exports 2013-05-10 16:37:28 -04:00
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Steve Strassmann
70cca0540d reorder imports for pep8 2013-05-10 15:23:28 -04:00
Steve Strassmann
01d4fbeb7c reorder imports 2013-05-10 14:14:36 -04:00
Steve Strassmann
8c8377f1df Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull master
 2013-05-10 13:59:07 -04:00
Steve Strassmann
9350a2c067 refactoring views 2013-05-10 13:56:30 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Steve Strassmann
0bea50ede1 start refactoring views.py 2013-05-09 16:24:21 -04:00
Calen Pennington
ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function 2013-05-09 16:22:23 -04:00
Chris Dodge
d8d4111a99 Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-08 12:15:26 -04:00
Arthur Barrett
eca155f99a Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-07 17:27:40 -04:00
Arthur Barrett
0ed07779c8 kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules." 2013-05-07 17:27:06 -04:00
Chris Dodge
81ecf0c5df add unit test to verify forum seeding occurs when creating new courses 2013-05-07 11:18:15 -04:00
Chris Dodge
30d266b430 seed forum permissions when creating new courses 2013-05-06 16:01:14 -04:00
cahrens
e0ebe6dacb Remove TODO. 2013-05-02 13:53:17 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
cahrens
13fe9c11cb Merged with master. 2013-05-01 09:33:35 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
cahrens
8705ff8805 Remove system_metadata_fields. 2013-04-29 16:41:07 -04:00
Chris Dodge
d7693d96b7 unit test should just use direct store. Also remove unused import and logging. 2013-04-29 09:18:49 -04:00
Chris Dodge
7d206e020d remove comment which is no longer valid as well as debug log messages 2013-04-26 16:13:26 -04:00
Chris Dodge
55266f6e96 add a overview.yaml template and also clone that template into a newly created course 2013-04-26 13:39:22 -04:00
Chris Dodge
2e64bc33ff make sure delete_item always uses the draft store 2013-04-26 12:37:37 -04:00
Chris Dodge
ead18f9fbb undo the unit test, as per Jeh, the tests really aren't supposed to run the CMS with 'draft 
awareness'
 2013-04-26 10:30:39 -04:00
Chris Dodge
f6417b4f71 add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip 2013-04-25 15:24:31 -04:00
Steve Strassmann
dd71ae818a ModuleStoreTestCase moved to new location 2013-04-24 11:33:47 -04:00
Steve Strassmann
111ec62bb6 merged from master 2013-04-24 10:42:35 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836 addressed comments from pull request 2013-04-23 10:07:51 -04:00
Chris Dodge
506a9a20aa when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad 2013-04-22 10:13:33 -04:00
Jay Zoldak
29ce700de6 Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now. 2013-04-18 10:23:03 -04:00
Jay Zoldak
8a852f90cb Fix or skip lettuce tests to run under phantomjs and firefox 2013-04-18 10:18:35 -04:00
Steve Strassmann
2f84b23047 disable i18n unit test - it wont run without creating dummy strings first 2013-04-17 13:20:20 -04:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook 
Fix/cale/gradebook
 2013-04-17 07:37:02 -07:00
cahrens
8c336ef998 Don't try to export orphaned draft items. 
#278
 2013-04-16 17:05:11 -04:00
Calen Pennington
bf6b886ccd Fix pylint and pep8 errors 2013-04-16 11:45:21 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38:58 -04:00
Chris Dodge
00674ee66b need timedelta import 2013-04-13 21:21:15 -04:00
Chris Dodge
b4fe23f3a2 more cleanups in CMS project 2013-04-13 21:13:34 -04:00
Chris Dodge
3ca2bf4627 move lines together 2013-04-12 15:51:47 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Chris Dodge
4345c8e09c add unit test to assert that get_items() is not using revision=None as a wildcard 2013-04-12 09:48:11 -04:00
Christina Roberts
c455710cca Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements 
Fix/cdodge/studio forum improvements
 2013-04-11 10:37:49 -07:00
Chris Dodge
e0bc823365 remove auto-provisioning because of a dependency problem between cms and lms 2013-04-11 10:42:03 -04:00
Chris Dodge
d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2013-04-10 12:02:16 -04:00
Chris Dodge
07b9d6353e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-10 09:26:51 -04:00