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

2941 Commits

Author SHA1 Message Date
Jason Bau
4a98e2eda7 Moves user activation away from just clicking on reset password 
To following the link in the password reset email
 2013-06-23 22:33:54 -07:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib 
Shibboleth Auth
 2013-06-21 09:32:30 -07:00
Calen Pennington
d06a9a2043 Merge pull request #219 from edx/cale/remove-simplewiki 
Remove simplewiki from the codebase
 2013-06-20 13:43:38 -07:00
Peter Fogg
83d84e2b65 Actually fix merge conflicts. 2013-06-20 12:40:37 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
Peter Fogg
9c7be8b1dc Fix merge conflict in CHANGELOG.rst. 2013-06-20 09:58:22 -04:00
Calen Pennington
448ca26cdf Remove simplewiki from the codebase 2013-06-20 09:06:29 -04:00
Will Daly
b1c963ab5e Changed stubbing behavior in video templates to exclude 
only the sources (not the player)
 2013-06-20 07:40:12 -04:00
Will Daly
6ab5bb2f20 Changed videoalpha stub to exclude video sources, but include 
the rest of the player.
 2013-06-20 07:40:12 -04:00
Renzo Lucioni
0bf02cabff Fix for the failing acceptance tests 2013-06-19 16:48:25 -04:00
Jason Bau
ca649d3c33 Turn off Agreement to Terms of Service for Stanford shib 
As stipulated by Stanford's office of general counsel
 2013-06-19 00:48:18 -07: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
Peter Fogg
8159e86141 Many changes to finish up PR. To wit: 
-- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
 2013-06-17 13:46:20 -04:00
Peter Fogg
d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-14 15:33:51 -04:00
Peter Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04:00
Valera Rozuvan
72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. 2013-06-14 11:12:32 +03:00
Vik Paruchuri
c2e5c60713 Remove correct/incorrect message, and auto-add in needed markdown for studio 2013-06-13 15:34:00 -04:00
Renzo Lucioni
d136fdac9a added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional 2013-06-13 11:35:26 -04:00
Renzo Lucioni
8508e3f647 dummy object creation without conditionals 2013-06-13 11:35:26 -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
Peter Fogg
dbb127599f Merge peter-fogg/fix-video-captions-setting. 2013-06-11 15:11:14 -04:00
caesar2164
646e2bd486 Merge pull request #93 from edx/giulio/accessibility 
A number of important accessibility changes
 2013-06-11 08:38:53 -07: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
Brian Talbot
8e30981f6f revises the show/hide answer input to use an HTML button element for accessibility purposes 2013-06-10 16:22:14 -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
Giulio Gratta
2cad6fe261 user button and menu accessiblity hidden span addition 2013-06-10 16:22:13 -07:00
Greg Price
ca8927ed67 Tweak text in help modal per request from Mary 2013-06-10 18:01:44 -04:00
Greg Price
7be6880fd2 Add course id tagging to feedback submissions 2013-06-10 18:01:44 -04:00
Greg Price
17647abd5c Add datadog reporting to the feedback submission mechanism 2013-06-10 18:01:43 -04: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
2c29481611 Merge pull request #106 from edx/release 
Merge hotfix-2013-06-07
 2013-06-07 08:05:58 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Alexander Kryklia
d6c772c5aa adds missed } 2013-06-06 14:48:41 -04:00
Brian Talbot
d3965cb3ee removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view 2013-06-06 14:48:40 -04:00
Victor Shnayder
4ffe3c51b5 Adds segment-io integration into the LMS 
Tell segment IO whenever a page is loaded.  Once this works, we
can add more detailed instrumentation for events we care about.

Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
 2013-06-06 11:34:03 -04:00