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

2257 Commits

Author SHA1 Message Date
Miki Goyal
ae45f5461c Fixed a spelling mistake. LMS-605 2013-07-12 12:19:15 -04:00
Miki Goyal
5fd84465e2 Fix alt text for the login page: LMS-600 2013-07-12 10:05:13 -04:00
David Baumgold
caa2cf0d76 Removed all press releases from repo 
They are on the Drupal site now
 2013-07-09 11:38:15 -04:00
ichuang
ec20f568ea remove extra bracket which had crept into instructor dashboard 2013-07-08 08:17:38 -04:00
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
Giulio Gratta
7452381f1c making sequence titles available to non-sighted users 2013-07-02 09:26:40 -07:00
Giulio Gratta
7af6409dc5 use jquery to focus on alert messages 2013-07-02 09:26:40 -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
6831e84834 Merge pull request #214 from edx/dcadams/email-on-invite 
Dcadams/email on invite
 2013-06-26 15:53:15 -07: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
Giulio Gratta
50f837d9d8 move marketing iframe breakout script to inside existing conditional 2013-06-26 10:22:59 -07:00
Jason Bau
4a3165414d Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm 
Moves user activation from just clicking on reset password to following the link in the password reset email
 2013-06-25 20:34:19 -07:00
Brian Wilson
332a440539 Enable per-student background tasks. 2013-06-24 18:47:50 -04:00
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
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