Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
13,667 Commits 1 Branch 0 Tags
90a9c386eb67d4201d769544628eff3e28362d2d
Commit Graph

13667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christina Roberts
52caae2fee Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome 
Adding in Studio Page headers and actions + help text
 2013-02-20 06:44:16 -08:00
Jay Zoldak
7dd1515f5d Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain 
Refactor lettuce tests to move common stuff out of lms and cms and into common
 2013-02-20 06:43:09 -08:00
Jay Zoldak
30edc380e1 Change coverage report config to reflect refactoring of terrain files 2013-02-20 09:31:50 -05:00
Brian Talbot
f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages 2013-02-20 09:15:27 -05:00
Victor Shnayder
2981f532c1 Integrate Brian T's front-page changes, add epfl and delft 
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
 2013-02-19 22:04:20 -05:00
Victor Shnayder
105cbd3bfc Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international 2013-02-19 21:52:06 -05:00
John Jarvis
2a6fde9db2 javascript to redirect to the course being accessed 2013-02-19 20:42:38 -05:00
ichuang
fb70525417 dummy change to re-trigger jenkins 2013-02-19 19:50:36 -05:00
John Jarvis
fd36c555a6 Renaming login url for modal-less login 2013-02-19 19:36:32 -05:00
John Jarvis
bfbd7de042 Adding baseFontColor to _variables.scss 2013-02-19 19:36:15 -05:00
Brian Wilson
c234f3625e add full version of pdf.js, and main files for jquery-pdfdoc 2013-02-19 18:05:36 -05:00
Brian Talbot
6f922570ff made flex-grid references consistent within different page element Sass files 2013-02-19 17:36:28 -05:00
Victor Shnayder
c1c050a6b6 WIP on an inputtype for heroesX annotation 
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
 2013-02-19 17:35:40 -05:00
Brian Talbot
d14c8e2585 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:32:25 -05:00
Brian Talbot
074f866b58 resolving some light footer display issues 2013-02-19 17:32:17 -05:00
John Jarvis
4596fa417f Changing login and signin view names 2013-02-19 17:31:22 -05:00
Brian Talbot
b2839514f2 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:22:57 -05:00
Brian Talbot
266e8951a4 made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 2013-02-19 17:18:09 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
Jay Zoldak
db6fa9a3aa Pep8fix lettuce test code 2013-02-19 16:46:32 -05:00
Jay Zoldak
040f840c9d Remove portal (fake) app, move tests to courseware. 
Comment out tests that don't run correctly without prerequisites.
 2013-02-19 16:46:32 -05:00
Jay Zoldak
9096914782 Move terrain module from lms to common. 2013-02-19 16:46:32 -05:00
Brian Talbot
1f247ceb0c edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets 2013-02-19 16:40:21 -05:00
Vik Paruchuri
2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 15:21:47 -05:00
Vik Paruchuri
72d069825d Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	lms/templates/instructor/staff_grading.html
 2013-02-19 15:21:09 -05:00
cahrens
d5903c0e60 Make HTML better formatted. 2013-02-19 15:14:05 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
Arthur Barrett
34cc112cfb Saving work in progress on annotations v2 with classification problems. 2013-02-19 14:18:56 -05:00
David Ormsbee
821e2d06e9 Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message 
Fix error message provided by Instructor dashboard datadump - make it more useful
 2013-02-19 11:08:21 -08:00
Victor Shnayder
45c80abecf Add initial images for ANU, McGill, Rice, Toronto. 
Still waiting on transparent logos.
 2013-02-19 14:04:17 -05:00
Jay Zoldak
8c423da6db Updated test to reflect new class name for course titles. 2013-02-19 13:50:40 -05:00
Jay Zoldak
301d58d648 Update lettuce test with new button name for add new section. 2013-02-19 13:31:11 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
 2013-02-19 13:27:35 -05:00
John Jarvis
dabcb51746 resolving merge conflicts 2013-02-19 12:43:06 -05:00
Brian Talbot
585dff521a Merge branch 'master' into feature/btalbot/studio-pagechrome 2013-02-19 12:27:49 -05:00
Brian Talbot
fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references 2013-02-19 12:13:08 -05:00
Christina Roberts
94a28f600b Merge pull request #1510 from MITx/bug/btalbot/html-strongspan 
xmodule scss - resolved studio bug #191
 2013-02-19 09:09:47 -08:00