Chris Dodge
|
a0f5a51135
|
wip to fix broken test
|
2013-04-08 15:34:12 -04:00 |
|
Chris Dodge
|
4cbb92533f
|
fix broken unit test
|
2013-04-08 15:08:05 -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
|
c12d265a21
|
calling update_item implicitly already puts the data in definition.data, so we want to make sure we don't end up nesting definition.data.data
|
2013-04-08 15:00:54 -04:00 |
|
Chris Dodge
|
0b26cc2635
|
fix line breaks per Cale
|
2013-04-08 14:48:16 -04:00 |
|
Chris Dodge
|
069f997595
|
import was putting the xml data into definition.data.data rather than definition.data
|
2013-04-08 14:33:46 -04:00 |
|
chrisndodge
|
9a405ff44c
|
Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
extend the list of container module names to our comuputation of inherit...
|
2013-04-08 11:11:14 -07:00 |
|
Don Mitchell
|
c14d046d2f
|
Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage
add a simple Studio walkthough to check page loads
|
2013-04-08 10:58:47 -07:00 |
|
Chris Dodge
|
5137119f2b
|
add a simple Studio walkthough to check page loads
|
2013-04-08 13:55:38 -04:00 |
|
Chris Dodge
|
7cd4310c32
|
extend the list of container module names to our comuputation of inherited metadata
|
2013-04-08 12:12:23 -04:00 |
|
Brian Talbot
|
c8cceb7140
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 11:40:53 -04:00 |
|
chrisndodge
|
a57e0fa2c5
|
Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl
make "edit" links work - fixes giturl (was broken by xblocks migration)
|
2013-04-08 08:17:31 -07: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 |
|
cahrens
|
c4befa136f
|
pep8
|
2013-04-08 09:15:07 -04:00 |
|
cahrens
|
f0d2ff7ba4
|
Change display_timezone to show_timezone.
|
2013-04-08 09:11:10 -04:00 |
|
Chris Dodge
|
93e27c5f0c
|
remove unsed import
|
2013-04-08 09:09:51 -04:00 |
|
Chris Dodge
|
9e2409743f
|
remove unsed import
|
2013-04-08 09:09:35 -04:00 |
|
Chris Dodge
|
052fc5ad11
|
revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work
|
2013-04-08 09:08:51 -04:00 |
|
cahrens
|
2631452b9c
|
Add display_timezone so course authors can choose not to display timezones in LMS.
|
2013-04-08 08:46:07 -04:00 |
|
cahrens
|
e4dac6e310
|
Add display_timezone so course authors can choose not to display timezones in LMS.
|
2013-04-08 08:38:52 -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 |
|
ichuang
|
f88b5794e4
|
fix default giturl link
|
2013-04-07 00:51:07 +00:00 |
|
ichuang
|
d2768c644e
|
not all modules have xml_attributes ; be careful about this in xmodule_modifier
|
2013-04-07 00:20:46 +00:00 |
|
ichuang
|
8cafadc03b
|
make "edit" links work - fixes giturl (was broken by xblocks migration)
Conflicts:
lms/templates/staff_problem_info.html
lms/xmodule_namespace.py
|
2013-04-07 00:03:36 +00: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 |
|
Kevin Chugh
|
24095679a6
|
add back comment response flagging
|
2013-04-05 19:04:18 -04:00 |
|
Kevin Chugh
|
de7c511328
|
flagging working again
|
2013-04-05 16:39:22 -04:00 |
|
Chris Dodge
|
0781f3e166
|
add new file
|
2013-04-05 15:28:19 -04:00 |
|
Chris Dodge
|
e717244611
|
remove discussion cache, which isn't used
|
2013-04-05 15:27:50 -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
|
7a334c6789
|
go back to exporting draft/private verticals, but also set additional xml attributes so that we can re-tie in the draft stuff into the sequence's children
|
2013-04-05 14:34:44 -04:00 |
|
Kevin Chugh
|
0e8ef28347
|
flagging almost done
|
2013-04-05 13:23:09 -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
|
dbf58c0d54
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-05 12:53:24 -04:00 |
|
Sarina
|
aca6cdbade
|
Merge pull request #1813 from MITx/fix/vik/pg-progress
Fix pg progress
|
2013-04-05 09:51:13 -07:00 |
|
vik
|
6aada791d8
|
Fix pg progress
|
2013-04-05 11:58:16 -04:00 |
|
chrisndodge
|
f467d93f97
|
Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course
Feature/cdodge/integrity check mongo course
|
2013-04-05 06:52:42 -07:00 |
|
Chris Dodge
|
8e36197cc2
|
tweeks per Cale's feedback
|
2013-04-05 09:30:49 -04:00 |
|
Brian Talbot
|
ceb4c719f7
|
changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes
|
2013-04-04 17:38:14 -04:00 |
|
cahrens
|
49e0753ef5
|
Show GMT time, 24-hour.
|
2013-04-04 16:56:10 -04:00 |
|
Brian Talbot
|
5f316b58ec
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-04 16:55:57 -04:00 |
|
Calen Pennington
|
9075e84430
|
Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg
add default message to conditional
|
2013-04-04 13:39:19 -07:00 |
|
Christina Roberts
|
de44813732
|
Merge pull request #1808 from MITx/bug/christina/studio
Show course end date on course about page
|
2013-04-04 13:34:00 -07:00 |
|
cahrens
|
bd055ddc22
|
On course about page, display course end date if no about page HTML blog (end_date.html) exists.
#224
|
2013-04-04 15:30:34 -04:00 |
|
cahrens
|
d02dc37d9f
|
On course about page, display course end date if no about page HTML blog (end_date.html) exists.
#224
|
2013-04-04 15:22:56 -04:00 |
|
Diana Huang
|
42614c69b4
|
Add space after comma.
|
2013-04-04 14:16:38 -04:00 |
|
Diana Huang
|
02b7ab4fa0
|
Tests to make sure that input_states have the correct keys
and are not cross-pollinating
|
2013-04-04 13:47:55 -04:00 |
|