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

3367 Commits

Author SHA1 Message Date
Diana Huang
ab7a616552 Add the ability to handle escaped HTML characters in trailing text 
Add tests for unicode and escaped HTML characters
 2013-04-12 10:59:03 -04:00
Diana Huang
d6e722a698 Remove unnecessary check and add better textline documentation 2013-04-12 10:59:03 -04:00
Diana Huang
fd35b2c7e3 Fix and create new test for trailing text 2013-04-12 10:59:03 -04:00
Diana Huang
c93b8076bf Add trailing text to textlines, most useful for units. 2013-04-12 10:59:03 -04:00
Chris Dodge
1a3c622bb6 actually the query parameter is '_id.revision' not just 'revision' 2013-04-11 22:32:35 -04:00
Chris Dodge
cf7d7bd2d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 2013-04-11 22:12:17 -04:00
Chris Dodge
8fd8574357 get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items. 2013-04-11 22:10:30 -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
Don Mitchell
f6434ed4fb Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules 
Fix/cdodge/export draft modules
 2013-04-10 13:12:09 -07:00
cahrens
40adfa950d Get the "Edit High Level Source" link back in. Broken with xblock work. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
 2013-04-10 14:53:26 -04:00
Chris Dodge
0a2937311d remove commented out code. Also fix up indents and other violations 2013-04-10 12:34:18 -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
5e3ca48c8d address some violations 2013-04-10 09:40:23 -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
Sarina
74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress 
Fix weighting and score generation
 2013-04-08 14:37:07 -07:00
Vik Paruchuri
7d09617ec9 Fix weighting and score generation 2013-04-08 16:52:18 -04:00
Chris Dodge
54afc5eb63 seems like we need to purge 'filename' from both _model_data as well as xml_attributes 2013-04-08 16:09:41 -04:00
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
Chris Dodge
7cd4310c32 extend the list of container module names to our comuputation of inherited metadata 2013-04-08 12:12:23 -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
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
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
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
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
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
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
cahrens
49e0753ef5 Show GMT time, 24-hour. 2013-04-04 16:56:10 -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
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