Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

7389 Commits

Author SHA1 Message Date
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
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
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Diana Huang
8304e9031c Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message 
Matlab Unit Tests and Minor Bugfix
 2013-04-04 07:39:05 -07:00
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -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
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix 
fix psychometrics to be compatible with new xblocks
 2013-04-04 05:50:59 -07:00
cahrens
f77aaec392 Need to mock datetime.datetime.utcnow. 2013-04-03 15:33:51 -04:00
Diana Huang
2230fe3c23 Set the queue_len more consistently. 2013-04-03 15:08:33 -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
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
Chris Dodge
1a1635d402 Fix tests and extend export/import unit test with draft testing. 2013-04-03 11:28:25 -04:00
Diana Huang
8cd4220b5f Fix the conditions by which we show the queueing message 
for Matlab inputs
 2013-04-03 10:48:27 -04:00
Chris Dodge
b61d7b2c3c Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-03 10:39:06 -04:00
Diana Huang
c658c65149 Add new Matlab unit tests. 2013-04-03 10:17:28 -04:00
Vasyl Nakvasiuk
c66eabb308 fix caption_asset_path for videoalpha 2013-04-03 11:41:11 +03:00
Victor Shnayder
67fecd3e5e Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes 
Annotation styling fixes
 2013-04-02 18:36:19 -07:00
Chris Dodge
1d8f9c225b Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-02 16:12:05 -04:00
cahrens
f802ac2098 Remove string default value. 2013-04-02 15:21:09 -04:00
Chris Dodge
b8f1b744f2 fix up defaults per Victor's suggestions 2013-04-02 14:26:33 -04:00
Chris Dodge
61b4062689 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint 2013-04-02 14:20:33 -04:00
Chris Dodge
1789814ceb wip 2013-04-02 14:19:54 -04:00
cahrens
42fbc16006 Feedback from code review. 2013-04-02 14:10:56 -04:00
John Hess
17fa312b26 Merge pull request #1695 from MITx/jmclaus/genex-save-state 
Genex now saves its state
 2013-04-02 07:58:17 -07:00
cahrens
ceababbf6d Minor cleanup. 2013-04-02 09:35:26 -04:00
Chris Dodge
3727edabf2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/modulestore/draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/xml_module.py
 2013-04-02 09:09:45 -04:00