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

645 Commits

Author SHA1 Message Date
Greg Price
f8539cc2d7 Redirect authenticated users from registration or login to dashboard 2013-05-08 17:10:54 -04:00
Diana Huang
2947ce246f Better error handling for when marketing urls are missing from the settings. 2013-05-07 13:17:30 -04:00
Diana Huang
a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links 
Fix links between marketing site and courseware.
 2013-05-06 14:14:29 -07:00
Diana Huang
6110b54ca8 Address code review feedback 
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
 2013-05-06 14:56:06 -04:00
Diana Huang
a8ea201b6a Move the link map to the settings. 2013-05-06 12:55:42 -04:00
Diana Huang
5b3f5a47de Add marketing_link to the Template context dictionary. 
Pep8 fixes
 2013-05-06 10:03:00 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation 
and use it for the new marketing site links.
 2013-05-03 15:06:24 -04:00
Diana Huang
3e217c8f85 Use new login page for marketing site when student is trying to 
access login_required page.
 2013-05-03 15:04:41 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages 
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
 2013-05-03 10:01:11 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Diana Huang
886e74342d Move the testcenter login to external_auth 
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
 2013-04-25 11:12:19 -04:00
Calen Pennington
4ba26a3a1a Only render a histogram for modules that have scores associated with them 2013-04-22 08:04:16 -04:00
Jay Zoldak
be76f73107 Consolidate and upgrade factories 2013-04-18 15:11:10 -04:00
Jay Zoldak
0426761bed Update lettuce and factory-boy versions. 2013-04-18 10:18:36 -04:00
Jay Zoldak
8a852f90cb Fix or skip lettuce tests to run under phantomjs and firefox 2013-04-18 10:18:35 -04:00
Jay Zoldak
8a2d08bbd6 Refactor choosing the browser for lettuce tests to settings.py 2013-04-18 10:18:35 -04:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38:58 -04:00
John Jarvis
0c1fd783cb Setting the edxloggedin cookie on registration 
Previously it was only set for login
 2013-04-11 10:44:22 -04:00
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