Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
b5a587d8d0 Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False. 2013-03-19 16:57:19 -04:00
John Jarvis
01d95b7ebe fixing merge issues 2013-03-19 16:24:23 -04:00
John Jarvis
63d85a52dc fixing merge issues 2013-03-19 16:22:36 -04:00
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
Will Daly
e7f8c7c676 pep8 fixes 2013-03-19 16:00:43 -04:00
Will Daly
39aa25c2d6 Removed file that was added accidentally. 2013-03-19 15:57:24 -04:00
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
Will Daly
2087b81573 Created MockXQueueServer which listens on a local port 
and simulates an XQueue.
 2013-03-19 15:53:06 -04:00
cahrens
a03f6c3bf1 More Selenium test, code cleanup. 2013-03-19 14:02:07 -04:00
Brian Talbot
a455c6b1e4 edx.org - added in error state revisions and modal window tweaks 2013-03-19 13:57:14 -04:00
Arthur Barrett
0710bbd70c Merge branch 'master' into feature/abarrett/lms-notes-app 2013-03-19 13:43:45 -04:00
Valera Rozuvan
0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. 2013-03-19 19:29:09 +02:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07:00
jmclaus
57b43d7a6c Genex now saves its state 2013-03-19 16:36:55 +01:00
Vasyl Nakvasiuk
3c645de43f extend xmodule.ConditionalModule docstrings 2013-03-19 17:29:28 +02:00
chrisndodge
a245cae4ef Merge pull request #1691 from MITx/feature/cale/fix-metadata-inheritance 
Feature/cale/fix metadata inheritance
 2013-03-19 07:56:21 -07:00
Calen Pennington
8fda5af4e4 Comment cleanup 2013-03-19 10:54:46 -04:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Calen Pennington
94d3ccf674 Always compute the metadata inheritance tree, even on a course module, so that when walking down the tree, we always get the right data 2013-03-19 10:41:12 -04:00
Brian Talbot
dc60d107e9 edx.org - added in new login and registration visual banners per marketing request 2013-03-19 09:53:52 -04:00
Vasyl Nakvasiuk
07b3db97a2 remove test rake task 2013-03-19 14:15:52 +02:00
Vasyl Nakvasiuk
9e7258d887 fix rakefile, fix docs 2013-03-19 12:38:08 +02:00
cahrens
dc89a4b3d5 Beginning of Selenium test, updates to work with master. 2013-03-18 21:25:44 -04:00
Brian Talbot
c901cecdea studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh. 2013-03-18 16:23:30 -04:00
Arthur Barrett
1b08071fdc merged from master and resolved conflict with annotatable module. 2013-03-18 15:51:27 -04:00
Arthur Barrett
7507f91d22 Added TODO and explanation for the top-level scss variables. 2013-03-18 15:43:43 -04:00
cahrens
49ee903eda Merge branch 'master' into feature/btalbot/studio-checklists 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/template_loader.js
 2013-03-18 15:30:19 -04:00
Jay Zoldak
a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests 
Feature/will/courseware lettuce tests
 2013-03-18 12:24:19 -07:00
Don Mitchell
c50bf5678e Merge pull request #1688 from MITx/fix/cdodge/add-500-404-templates-to-Studio 
Fix/cdodge/add 500 404 templates to studio
 2013-03-18 12:11:39 -07:00
Chris Dodge
3e28ffa4f7 remove import and shortened line length 2013-03-18 15:10:17 -04:00
Chris Dodge
dc78a08ce5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 15:05:37 -04:00
cahrens
f6fb64f130 Saving checkbox state, client template for individual checklist. 2013-03-18 15:03:54 -04:00
Chris Dodge
e59b650fab add an array of courses to not refresh the metadata cache on writes. This is needed for imports where we are doing bulk updates otherwise, the DB gets thrashed and the import takes too long, timing out the browser 2013-03-18 15:02:49 -04:00
VikParuchuri
9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite 
Fix version handling for combined open ended
 2013-03-18 11:58:38 -07:00
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00
chrisndodge
eff6f1d182 Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash 
Skip over fields that are scoped to students when looping through the Co...
 2013-03-18 10:21:37 -07:00
Brian Talbot
16f9f6ef4f studio - tender widget: added initial reference and behavior 2013-03-18 13:15:01 -04:00
Jay Zoldak
2b14960519 Merge pull request #1689 from MITx/fix/cale/pylint-cleanup 
Small pylint cleanup
 2013-03-18 10:14:49 -07:00
Calen Pennington
3fbde821dd Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard 2013-03-18 13:09:10 -04:00
Chris Dodge
651465f1ad add HTML templates for 404/500 errors 2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf Small pylint cleanup 2013-03-18 12:45:46 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Vasyl Nakvasiuk
be27dfd500 poll_module.rst done 2013-03-18 16:30:29 +02:00
Vasyl Nakvasiuk
63ecc64d82 conditional_module.rst done 2013-03-18 16:13:44 +02:00
Brian Talbot
8580e9825e Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-18 09:57:53 -04:00
Vasyl Nakvasiuk
911c384527 remove old xml docs, add rake buildpubdocs, showpubdocs, pubdoc 2013-03-18 15:53:07 +02:00
Chris Dodge
2b677544a5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 09:39:47 -04:00
Vasyl Nakvasiuk
f172405c9a remove xml documentation from docs/source/ 2013-03-18 15:37:29 +02:00