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

371 Commits

Author SHA1 Message Date
David Ormsbee
8ee9a96766 quick experiment to force student verification urls to be active 2013-08-23 01:02:23 -04:00
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
 2013-08-22 14:57:34 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
David Ormsbee
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
Jason Bau
9e56028091 added shopping cart list template, embedded form 2013-08-21 13:14:20 -04:00
Jason Bau
b7d73933b7 initial commit of shopping cart and cybersource integration 2013-08-21 13:14:20 -04:00
Jay Zoldak
e78edf8ef9 Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also. 2013-08-08 12:08:25 -04:00
Diana Huang
4005b3bd79 Merge pull request #554 from edx/diana/django-ratelimit 
Limit the rate of logins
 2013-08-02 11:02:04 -07:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
Miles Steele
0f09abe233 factor out urls to instructor.views.api_urls 2013-08-02 09:53:20 -04:00
Miles Steele
7392a888ce cleanup, fix permissions, rename functions, add more api tests 2013-08-02 09:53:20 -04:00
Miles Steele
63d07b7e47 rename enrolled_students_profiles -> enrolled_students_features 2013-08-02 09:52:17 -04:00
Miles Steele
94ac02e8b4 refactor enrollment action reporting 2013-08-02 09:52:17 -04:00
Miles Steele
0d6a12fda6 cleanup (fix typos, remove TODO, formatting) 2013-08-02 09:52:17 -04:00
Miles Steele
a727959d18 add feature switch for beta dashboard 2013-08-02 09:52:15 -04:00
Miles Steele
dd43d6635f add instructor tasks 2013-08-02 09:52:14 -04:00
Miles Steele
9bdff7485a cleanup 
- rename list copy
- add beta list
- fix forum and admin API's to be more similar
- add auto-enroll checkbox
- fix list reload
- remove extra js logging
- add course errors visibility toggle
- add underscore.js check
 2013-08-02 09:52:13 -04:00
Miles Steele
83ff497e42 add beta to endpoint, rename endpoint 2013-08-02 09:52:13 -04:00
Miles Steele
0a657befdb add forum list management 2013-08-02 09:52:13 -04:00
Miles Steele
5cdf3fb86a add staff management subsection, add student_admin subsection, refactor sections 2013-08-02 09:52:12 -04:00
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Miles Steele
2e1d729e57 move instructor views.py to views/legacy.py 2013-08-02 09:52:11 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages 
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
 2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Kevin Chugh
803b92fc9a add ajax endpoint for getting notifications status 2013-07-30 01:19:15 -04:00
ihoover
aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth 
Ihoover/feature flag auto auth
 2013-07-25 08:11:22 -07:00
ihoover
c6c3e4b9d3 working under cms too 2013-07-23 16:23:54 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Greg Price
47b51e9329 Add endpoints to set user notification preference 
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
 2013-07-22 11:50:26 -04:00
Greg Price
6a97ddf53c Add an API to interact with users and preferences 
The new API uses Django REST Framework. For now, it is designed specifically
to support the use cases required by the forum digest notifier (not yet built),
with a goal of making it more generally useful over time.
 2013-07-22 10:57:18 -04:00
ihoover
ceacc3b4b5 moved auto_auth view to students.view and fixed flag conflicts 2013-07-16 17:43:32 -04:00
ihoover
e5f44165f8 Made activation flag and ENV_TOKEN 2013-07-16 15:29:38 -04:00
ihoover
66eb47fb0d Disabled csrf and made auto_login page toggleable with setting 2013-07-16 11:54:50 -04:00
Carlos Andrés Rocha
06529054de Merge hotfix 2013-07093 into master 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py
 2013-07-03 18:55:21 -04:00
Ned Batchelder
1d5dfaa131 Add tests for image books, and more tests for the other kinds too. 2013-07-03 14:42:41 -04:00
Ned Batchelder
5fad9ccca4 Fix LMS-530, reflected XSS 
Limit the page and chapter numbers to digits, to keep malicious URL
components from being inserted onto the page.
 2013-07-02 13:29:59 -04:00
Ned Batchelder
25d0f4d500 Remove unused URL /book-shifted/ 2013-07-02 11:36:47 -04:00
Ned Batchelder
c160b39bbd Provide names for the other courseware book URLs. 2013-07-02 11:36:46 -04:00
Ned Batchelder
4e4c209ae3 Fix LMS-530, reflected XSS 
Limit the page and chapter numbers to digits, to keep malicious URL
components from being inserted onto the page.

Conflicts:
	lms/urls.py
 2013-07-02 10:11:40 -04:00
Felix Sun
bc2cab2fda Made the hint management instructor view off by default. 2013-07-01 18:03:36 -04:00
Felix Sun
0c0de20a2f 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 18:03:35 -04:00
Felix Sun
f219228e4a Made the hint management instructor view off by default. 2013-07-01 10:25:04 -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
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
 2013-06-27 13:53:47 -04: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
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Jean Manuel Nater
799b938d5b Merge branch 'master' into jnater/courseware_tests 2013-06-24 17:24:42 -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
Juho Kim
ae960ccf5a analytics service update 2013-06-21 17:40:54 -04:00