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

233 Commits

Author SHA1 Message Date
caesar2164
b3723b1a22 Merge pull request #288 from edx/giulio/accessibility-2 
Round 2 Accessibility Changes
 2013-07-02 13:41:50 -07:00
Renzo Lucioni
42efd33cfa Refactor Segment.io integration with sequentials and instructor dashboard pages 2013-07-02 13:49:33 -04:00
Giulio Gratta
86a1e4263d added alt tags to course cover images and find course page logo 2013-07-02 09:26:41 -07:00
Felix Sun
6890563d43 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 10:25:04 -04:00
Felix Sun
b64fe5c537 Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.) 2013-07-01 10:25:03 -04:00
Felix Sun
100f6bf11e Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 10:25:03 -04:00
dcadams
306ac48210 Email on enroll/un-enroll actions 
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
 2013-06-26 15:28:36 -07:00
Brian Wilson
332a440539 Enable per-student background tasks. 2013-06-24 18:47:50 -04:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Brian Wilson
fd206a4128 Make sure InstructorTask is committed. 2013-06-18 15:07:15 -04:00
Brian Wilson
77032067ac Refactor test_views from test_api. Pull out pending_tasks.js. 2013-06-18 11:19:25 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
6cd23875ea Remove delete button from instructor dash. (Also remove last-modified 
column from task-in-progress table).
 2013-06-18 11:11:34 -04:00
Brian Wilson
0d38789a1d Add additional background tasks: reset attempts, delete state. Update 
CourseTaskLog fully after task submission, so it works in Eager mode
(for testing).
 2013-06-18 11:05:33 -04:00
Brian Wilson
7711c00e2c Pull task_queue.py methods out from tasks.py, to represent API calls 
from client.  Tasks.py remains the task implementations running on the
celery worker.

In particular, move status message generation out of task thread to client side.
 2013-06-18 11:04:05 -04:00
Brian Wilson
d503e3313f Add task progress table to instructor dash. 
Add call to MakoMiddleware() to initialize templates in celery worker server.

Pass task_ids by POST properties (as a list) to collect task progress status.
 2013-06-18 11:04:05 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash. 
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
 2013-06-18 11:04:05 -04:00
Diana Huang
58d561ac8e Merge pull request #126 from edx/diana/fix-display-text 
Fix typo and an unclear description.
 2013-06-11 14:36:06 -07:00
Diana Huang
f79d1e215a Fix some typos and unclear descriptions. 2013-06-11 16:48:11 -04:00
Brian Talbot
443a50845a lms - adds back in missing/previously added .sr screen reader-focused styling and references in place of the .visuallyhidden application 2013-06-10 16:22:21 -07:00
Giulio Gratta
7390b517f0 required labels, active accordion item, move previous arrow to before unit sequence 2013-06-10 16:22:14 -07:00
Giulio Gratta
70332f897b courseware active location, suppress browser form validation, and progress graph accessibilit changes 2013-06-10 16:22:13 -07:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement 
Feature user-management autoenroll
 2013-06-10 10:10:57 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
Nate Hardison
f25fdebe67 Theme the authenticated index view 
Much like the work done on the default (unauthenticated) index view,
adjust the background image (actually, let the CSS handle it instead
of an embedded `style` attribute in the HTML). Other adjustments
(language, logo) are made for Stanford specifically and need to be
reworked for general theming.
 2013-06-05 10:27:23 -07:00
Nate Hardison
dc8bd32fb2 Theme the individual course about pages 
Use the theme's own Google Analytics template (should probably
update to just use parameters once the default GA template is kept
up-to-date). Don't link to the university profile page when a theme
is enabled, as that's an edX-specific feature. Adjust social links
for Stanford, but leave them alone for everyone else (this is just
a hack for the 6/11/13 launch).
 2013-06-05 10:27:23 -07:00
dcadams
56f81fb104 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-04 10:29:04 -07:00
Greg Price
5268d982ce Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration 
Disable marketing registration button for courses that user cannot enrol...
 2013-05-17 12:40:54 -07:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
Greg Price
e4509ae3ad Make "access courseware" buttons for marketing site break out of iframes 2013-05-17 13:31:22 -04:00
Greg Price
ff2ba68d79 Tweak behavior of registration button for marketing site 
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
 2013-05-16 15:06:48 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
dcadams
dcabac8edf Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement 2013-05-08 14:48:29 -07:00
Giulio Gratta
953af59b0d fixing some more LMS accessibility issues 2013-05-07 10:25:16 -07:00
Greg Price
ef27b8f787 Make register button for marketing site break out of iframe 
Use window.top.location.href instead of location.href for redirection.
 2013-05-07 12:41:33 -04:00
Greg Price
2c67352606 Fix new view containing only register button to properly enroll 2013-05-07 11:34:41 -04:00
Brian Talbot
9a01bb5e52 edx.org - adding back js-dependent register class to register button 2013-05-07 11:02:02 -04:00
Brian Talbot
3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment 2013-05-07 10:25:41 -04:00
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration 
Update course registration flow for non-modal registration and login
 2013-05-06 10:31:29 -07:00
John Jarvis
d69bbf272e using new template for "coming-soon" 2013-05-06 12:30:18 -04:00
John Jarvis
e852574a17 adding 404 handling for courses that do not exist 2013-05-06 11:54:09 -04:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe 
Jarv/drupal new/iframe
 2013-05-06 07:46:28 -07:00
John Jarvis
258537e3d2 adding csrf middleware token to form submission 2013-05-03 13:05:10 -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
Brian Talbot
d7d68a1e8c edx.org - resolved JQuery submit() method error on <iframe> register button actions 2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610 fixing old about view, iframe updates 2013-05-02 15:05:12 -04:00