Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,422 Commits 1 Branch 0 Tags
54e5e3d31fecfb4ffda1e4b2b3e5ec9e8d6ead00
Commit Graph

626 Commits

Author SHA1 Message Date
John Jarvis
2b309adf9c Fixing cookie handling for edx-mktg-loggedin 2013-04-09 13:26:57 -04:00
Brian Talbot
78079d1ca7 Merge branch 'master' into drupal-new 2013-04-08 22:35:29 -04:00
ichuang
f88b5794e4 fix default giturl link 2013-04-07 00:51:07 +00:00
ichuang
d2768c644e not all modules have xml_attributes ; be careful about this in xmodule_modifier 2013-04-07 00:20:46 +00:00
ichuang
8cafadc03b make "edit" links work - fixes giturl (was broken by xblocks migration) 
Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py
 2013-04-07 00:03:36 +00:00
Jay Zoldak
c9add70a75 Fix some pylint errors in the lettuce terrain module 2013-04-03 13:01:42 -04:00
Jay Zoldak
c9a7be6b9b Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers 
Feature/will/lettuce test helpers
 2013-03-28 07:26:14 -07:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Chris Dodge
03f9bb5d38 use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down 2013-03-27 22:37:07 -04:00
Don Mitchell
6d63d13fa8 Merge pull request #1753 from MITx/bug/christina/studio 
Converter cleanup.
 2013-03-27 12:46:01 -07:00
David Ormsbee
6e3d9608b4 Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error 
An integrity error while creating an enrollment just means that our work...
 2013-03-27 12:03:26 -07:00
Calen Pennington
122c8567c5 An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947 2013-03-27 15:00:08 -04:00
Will Daly
cddc868656 Login URL resolves differently in LMS and CMS, which breaks login_test 
when loaded by rake test_cms

I moved the test into lms/courseware/tests so they run correctly.
 2013-03-27 13:01:10 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
Will Daly
15ea32b095 Fixed bug 294, caused by unicode encoding error when creating logging 
strings.

Added unit tests that verify the fix.
 2013-03-27 12:53:58 -04:00
Chris Dodge
b0e2c82ad3 actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test. 2013-03-26 20:02:29 -04:00
Chris Dodge
a44ecdfcd6 if we parse an invalid location in the content store middleware, then return a 404, not a 500 2013-03-26 16:45:47 -04:00
Will Daly
0500ba4dd5 Disabled pylint warnings for lettuce steps: 
* Missing docstring
* Redefining name from outer scope
 2013-03-26 11:46:31 -04:00
Will Daly
27d5ebf027 pep8 fixes 2013-03-26 11:44:57 -04:00
Will Daly
00d25b684c Moved modulestore flush code into terrain/course_helpers 2013-03-26 11:44:57 -04:00
Will Daly
e69931ec5a Refactored studio lettuce tests to use terrain/ui_helpers for ui 
manipulation
 2013-03-26 11:44:56 -04:00
Will Daly
dde0d1676b Refactored terrain/steps.py to use ui_helpers 
Added a wait time before checking the page HTML,
and changed it to check just in the HTML body
 2013-03-26 11:44:56 -04:00
Will Daly
4528490fac Refactored lms/coureware lettuce tests to use terrain helpers 
for common ui manipulations
 2013-03-26 11:44:56 -04:00
Will Daly
6dd86f7a97 Refactored courseware_common and open_ended to use ui helpers 2013-03-26 11:44:56 -04:00
Will Daly
c12e1fb1ce Added missing import statement 2013-03-26 11:44:56 -04:00
Will Daly
b0eb73302b Moved some courseware/features/common.py steps into 
terrain/steps.py
 2013-03-26 11:44:56 -04:00
Will Daly
0562f11c56 Fixed import issue with WebDriverException 2013-03-26 11:44:56 -04:00
Will Daly
e494d529fc Split terrain/helpers.py into ui_helpers.py and course_helpers.py 2013-03-26 11:44:56 -04:00
Will Daly
315b360e4c Fixed an import error in terrain/helpers.py 2013-03-26 11:44:55 -04:00
Will Daly
24301d2a07 Moved helper functions from terrain/steps.py to terrain/helpers.py 2013-03-26 11:44:55 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists 
Add course checklists to Studio
 2013-03-22 12:49:30 -07:00
cahrens
a2a1478d92 Fix caching bug on back button. 2013-03-22 09:51:45 -04:00
John Jarvis
ae81009a43 Changing edx marketing site cookie value to 'true' 2013-03-21 17:56:56 -04:00
Carlos Andrés Rocha
4d266fa3ca Merge pull request #1718 from MITx/victor/fewer-phds-more-associates 
In sign up form, merge PhD-science and PhD-other, add Associate's degree
 2013-03-21 14:35:16 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
John Jarvis
57dd2e728c Adding a new cookie to determine logged in status for the edx mktg site 
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
 2013-03-21 17:17:35 -04:00
Chris Dodge
63fc2eecaf drive by fix to get proper error handling 2013-03-21 16:32:58 -04:00
Will Daly
6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests 
Conflicts:
	lms/djangoapps/courseware/features/problems.py
 2013-03-21 10:49:04 -04:00
Will Daly
7a282a9c54 Edited comments, ran pep8 2013-03-20 17:08:19 -04:00
Will Daly
f69778b367 Changed lettuce test log_in step to log in programatically 
rather than using the login dialog.
 2013-03-20 17:08:19 -04:00
Jay Zoldak
23364d8b0f Merge branch 'master' into feature/zoldak/refactor-factories 2013-03-20 13:36:01 -04:00
Jay Zoldak
8428119856 Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests 
Feature/will/coderesponse lettuce tests
 2013-03-20 10:20:11 -07:00
Jay Zoldak
5eba299dca Move course and item factories to xmodule.modulestore.tests 2013-03-20 12:10:18 -04:00
Jay Zoldak
192b991334 Pylint for lettuce factory refactor. 2013-03-20 11:52:15 -04:00
Jay Zoldak
6048bc2832 Pep8 fixes for factory refactor 2013-03-20 11:31:12 -04:00
Will Daly
5411fc765e Refactored lettuce test of capa problems to use 
world.css_click() helper instead of directly
calling splinter.
 2013-03-20 11:27:28 -04:00
Jay Zoldak
e45ccbf389 Leave CourseEnrollment factor refactoring as a TODO. 2013-03-20 11:12:54 -04:00