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

7051 Commits

Author SHA1 Message Date
Brian Talbot
fe59ca5b89 edx.org - replacing visual banners with updated marketing ones 2013-03-19 17:14:57 -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
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
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
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -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
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
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
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
Calen Pennington
a4f10bfdaf Small pylint cleanup 2013-03-18 12:45:46 -04:00
Chris Dodge
9a18685c1c add a discussion module write through cache to speed up Forum rendering 2013-03-18 09:01:54 -04:00
Calen Pennington
9dda977ece Handle days_early_for_beta possibly being a string 2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
a4451bdcd2 XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-16 14:26:14 -07:00
Will Daly
e41bb8462c Added lettuce tests for script (customresponse) problems. 
Increased wait time for login screen to reduce false positives.
 2013-03-15 14:04:22 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo 
using terrain.factories.py and capa.tests.response_xml_factory
 2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb Refactored lettuce problem test assertion that a problem is 
correct/incorrect/unanswered
 2013-03-15 14:02:21 -04:00
Will Daly
3d8625da9c Refactored problem lettuce test implementation 2013-03-15 14:02:21 -04:00
Will Daly
5a2a4055f8 Added lettuce test for formula problem 2013-03-15 14:02:21 -04:00
Will Daly
4d5a8e757c Added lettuce tests for numerical problem 2013-03-15 14:02:20 -04:00
Will Daly
b3946828c0 Added lettuce tests for string problems 2013-03-15 14:02:20 -04:00
Will Daly
56a6363d7a CSS selectors in lettuce tests for problems now include the element tag. 2013-03-15 14:02:20 -04:00
Will Daly
90213d483c Wrote lettuce tests for drop-down, multiple choice, and checkbox 
problems.
 2013-03-15 14:02:20 -04:00
Carlos Andrés Rocha
93a59f244d XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-15 10:43:56 -07:00
Your Name
68cb63daa8 accidentally deleted models file 2013-03-15 12:42:59 -04:00
Arthur Barrett
20767d5cc7 create notes djangoapp for annotator.js 2013-03-15 12:41:52 -04:00
Your Name
a761e2e829 make pinning backward compatible 2013-03-15 12:38:28 -04:00
Carlos Andrés Rocha
7697a43cf4 Fix typo in signup forms 
LMS Lighthouse [#263]
 2013-03-15 09:38:06 -07:00
Calen Pennington
3b0aed5d42 Merge pull request #1572 from MITx/feature/alex/poll-merged 
Feature/alex/poll merged
 2013-03-15 09:04:42 -07:00
Calen Pennington
0f5a05c8a2 Merge pull request #1673 from MITx/jmpm-analytics 
Addressing some pep8/pylint concerns
 2013-03-15 09:04:15 -07:00
Your Name
0a53ec3ee6 updates 2013-03-15 11:37:58 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
David Ormsbee
67a0cccba9 Addressing some pep8/pylint concerns 2013-03-15 11:08:09 -04:00
Your Name
470e402723 patch for backward compatibility 2013-03-15 10:51:34 -04:00
Calen Pennington
fb8352e2cc Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 2013-03-15 10:33:54 -04:00
Calen Pennington
8531d56268 Merge pull request #1665 from MITx/jmpm-analytics 
Enables basic analytics tab in instructor dashboard
 2013-03-15 07:06:02 -07:00
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
 2013-03-15 09:46:47 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
David Ormsbee
e818efb098 Removed reverse() call that was breaking in RSS feed. 2013-03-14 11:19:07 -04:00
Carlos Andrés Rocha
80d809a86a Add location note to jobs page 
LMS Lighthouse [#190]
 2013-03-14 06:52:28 -07:00
Carlos Andrés Rocha
b4d83a5f44 Add 2.01x announcement to news feed 
LMS Lighthouse [#259]
 2013-03-14 06:49:07 -07:00
Carlos Andrés Rocha
15d8727fce Fix ids in feed.rss 2013-03-14 06:38:55 -07:00
Peter Baratta
bac9f1f571 Merge branch 'master' into peter/symbolic 2013-03-14 06:31:17 -06:00
Peter Baratta
75b561267c Script feature fix 2013-03-14 06:29:51 -06:00