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 |
|
Brian Talbot
|
3f2e21f9dc
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 16:29:18 -04:00 |
|
Chris Dodge
|
d7b148d0d9
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
common/lib/xmodule/xmodule/modulestore/draft.py
|
2013-04-08 15:02:47 -04:00 |
|
Chris Dodge
|
5137119f2b
|
add a simple Studio walkthough to check page loads
|
2013-04-08 13:55:38 -04:00 |
|
cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Don Mitchell
|
c6bec6bcad
|
Merge pull request #1812 from MITx/feature/christina/gmt
Display UTC on the end of dates (that are in UTC).
|
2013-04-08 07:00:08 -07:00 |
|
Brian Talbot
|
c0bb3c962d
|
studio - adding in ux-alerts view comment
|
2013-04-08 09:41:50 -04:00 |
|
Brian Talbot
|
a6c35fb2ce
|
studio - addressing pull request to merge to master feedback
|
2013-04-08 09:30:09 -04:00 |
|
Chris Dodge
|
288620592a
|
get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish
|
2013-04-07 19:33:04 -04:00 |
|
Chris Dodge
|
5b7d882e3e
|
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
|
2013-04-06 11:02:21 -04:00 |
|
Chris Dodge
|
7c48f9a5ed
|
add unit test to verify that the store updated signal actually fired. Also fix bug where cloning item doesn't update the inherited metadata caches
|
2013-04-06 10:43:40 -04:00 |
|
Chris Dodge
|
a3de4ff625
|
add unit test to confirm 'id' generation
|
2013-04-05 15:59:01 -04:00 |
|
Brian Talbot
|
1a68d516fb
|
resolving local merge with master
|
2013-04-05 15:27:08 -04:00 |
|
Brian Talbot
|
512e4fe3bd
|
resolving local merge with master and sprucing style and templates for merge with master
|
2013-04-05 15:13:21 -04:00 |
|
Chris Dodge
|
f84eaf01b8
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-05 13:20:02 -04:00 |
|
Chris Dodge
|
3d7f893259
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
|
2013-04-05 13:19:10 -04:00 |
|
Chris Dodge
|
5bbfe87005
|
fix various pop8/pylint violations. switch hasattr() to getattr()
|
2013-04-05 13:18:48 -04:00 |
|
Chris Dodge
|
dbf58c0d54
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-05 12:53:24 -04:00 |
|
Chris Dodge
|
02dfa09c70
|
pylint/pep8 fixes
|
2013-04-05 10:53:18 -04:00 |
|
cahrens
|
fa31953924
|
Update tests for GMT, get Advanced Settings test to pass reliably.
|
2013-04-05 10:47:58 -04:00 |
|
Chris Dodge
|
8e36197cc2
|
tweeks per Cale's feedback
|
2013-04-05 09:30:49 -04:00 |
|
Chris Dodge
|
73113eddc7
|
fix xml_attributes inspection
|
2013-04-04 13:38:30 -04:00 |
|
Chris Dodge
|
c0fc029b03
|
switch over the variable 'ms' to be 'store'
|
2013-04-04 10:33:30 -04:00 |
|
Chris Dodge
|
c7061a0262
|
add a command line utility to walk through the course and find common errors
|
2013-04-04 10:20:31 -04:00 |
|
Chris Dodge
|
ac01079502
|
add a command line utility to walk through the course and find common errors
|
2013-04-04 09:35:35 -04:00 |
|
Brian Talbot
|
d87c4e3866
|
resolving local merge with master
|
2013-04-03 15:01:55 -04:00 |
|
Chris Dodge
|
5f9d7db94d
|
actually we need to start the draft content export from the sequentials. This is because we need the child pointers to the draft verticals. For private items, if we don't do this, then we'll loose those pointers
|
2013-04-03 14:43:01 -04:00 |
|
Chris Dodge
|
a023cfa8d9
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-03 14:14:13 -04:00 |
|
Chris Dodge
|
b640866748
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
common/lib/xmodule/xmodule/x_module.py
|
2013-04-03 14:05:59 -04:00 |
|