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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
4b850f4da9 studio - notifications: made icon/copy area more bulletproof for longer lines of text 2013-02-20 16:24:50 -05:00
Vik Paruchuri
2f29d85efc Finish function to get eta value 2013-02-20 16:22:22 -05:00
Chris Dodge
bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case 2013-02-20 16:20:39 -05:00
Vik Paruchuri
59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays 2013-02-20 16:19:17 -05:00
Brian Talbot
d0fca477a8 edx.org - university pages' main banner images are now centered when window resizes 2013-02-20 16:12:36 -05:00
VikParuchuri
fbce67a883 Merge pull request #1519 from MITx/diana/fix-self-assessment-test 
Fix test so we don't have to skip it anymore.
 2013-02-20 13:02:02 -08:00
cahrens
c572ba862a Delete unused method. 2013-02-20 15:47:07 -05:00
cahrens
d9fb067355 Test point for formatting of JSON entry. 2013-02-20 15:34:53 -05:00
Victor Shnayder
d2e97d2389 Merge pull request #1518 from MITx/press/international 
Press/international
 2013-02-20 12:07:16 -08:00
cahrens
dd959d1123 Longer warning got merged out. 2013-02-20 15:01:41 -05:00
Victor Shnayder
1ae06a45bb Add lower case urls for universities. 
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
  because the proper urls are prettier
 2013-02-20 14:59:28 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8 studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields 2013-02-20 14:58:19 -05:00
Brian Talbot
ef3492aa40 studio - resolving local merge 2013-02-20 14:48:21 -05:00
Brian Talbot
c7f5b74225 studio - manual policy editor: converting to new page layout and styling 2013-02-20 14:46:54 -05:00
Jay Zoldak
1ccf0d48a8 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged 2013-02-20 14:30:49 -05:00
Jay Zoldak
05f32f4bc9 Update tests for the advanced policy settings feature. 
Includes adding a method for css_click_at.
 2013-02-20 14:30:39 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
Chris Dodge
da223d9e11 remove raise statement which was just needed for debugging 2013-02-20 14:13:19 -05:00
Chris Dodge
756959812f add some comments regarding which code can be removed when the 'split mongo module store' work is completed 2013-02-20 14:11:57 -05:00
Diana Huang
ea13659249 Merge branch 'master' into diana/click-tracking 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 14:02:04 -05:00
Brian Talbot
453e249f16 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 13:54:19 -05:00
Diana Huang
a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test 2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b Clean up and fix some peer grading tests. 2013-02-20 13:36:09 -05:00
Vik Paruchuri
c3d485a609 Fix error message 2013-02-20 13:33:17 -05:00
Vik Paruchuri
3db3d7b740 Fix eta message slightly 2013-02-20 13:31:06 -05:00
Vik Paruchuri
59e3647692 Add in support for getting and displaying ETA 2013-02-20 13:28:37 -05:00
Diana Huang
789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check 
Feature/vik/disable spell check
 2013-02-20 09:45:32 -08:00
Vik Paruchuri
dbe93502f1 Fix tests 2013-02-20 12:44:12 -05:00
cahrens
8acbeec3ad Comment out validation, update warning message. 2013-02-20 12:23:19 -05:00
Vik Paruchuri
2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed 2013-02-20 12:01:42 -05:00
Vik Paruchuri
c48998b30a Fix SA tests 2013-02-20 11:57:29 -05:00
Vik Paruchuri
7be76fe124 Fix tests 2013-02-20 11:54:57 -05:00
VikParuchuri
4673c7392b Merge pull request #1458 from MITx/feature/diana/close-oe-problems 
Support due dates for Peer Grading XModule
 2013-02-20 08:54:50 -08:00
Diana Huang
13d4cfa4d4 Merge branch 'master' into diana/click-tracking 2013-02-20 11:40:14 -05:00
Vik Paruchuri
ee3c658f46 Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check 2013-02-20 11:39:39 -05:00
Arthur Barrett
610e210cc8 Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule 2013-02-20 11:32:46 -05:00
Arthur Barrett
33c12647cb Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-20 11:31:53 -05:00
Diana Huang
eefe87494d Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems 2013-02-20 11:23:28 -05:00
Diana Huang
d0bd7466b4 Fix import statement for TimeInfo 2013-02-20 11:22:58 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Diana Huang
03a4deb847 Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule 
Feature/vik/settings to xmodule
 2013-02-20 08:06:20 -08:00
Diana Huang
e467c057c9 Fix test so we don't have to skip it anymore. 2013-02-20 10:59:38 -05:00
cahrens
cbc0406df2 Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged 2013-02-20 10:57:35 -05:00
cahrens
305f0b2a54 Add number of spaces for formatting of JSON. 2013-02-20 10:56:49 -05:00
Jay Zoldak
2bde448fbb Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:53:12 -05:00
Jay Zoldak
67c2bac68f Pep8fix lettuce test code 2013-02-20 09:53:02 -05:00
Jay Zoldak
562fb67671 Remove portal (fake) app, move tests to courseware. 
Comment out tests that don't run correctly without prerequisites.
 2013-02-20 09:52:51 -05:00
Jay Zoldak
7495bd0ae4 Move terrain module from lms to common. 2013-02-20 09:52:32 -05:00