Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,355 Commits 1 Branch 0 Tags
20d87061d428fb554bfbd3e904b1dcd052d6f934
Commit Graph

19226 Commits

Author SHA1 Message Date
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
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
Brian Talbot
f06892e9f9 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-03 15:38:52 -04: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
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
Will Daly
8cd11f4f63 Merge pull request #1799 from MITx/fix/zoldak/terrain-pylint 
Fix some pylint errors in the lettuce terrain module
 2013-04-03 11:01:26 -07: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
Jay Zoldak
c9add70a75 Fix some pylint errors in the lettuce terrain module 2013-04-03 13:01:42 -04: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