Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,147 Commits 1 Branch 0 Tags
8bd686d63cbd46775f35faddddcf0baaffcba310
Commit Graph

5567 Commits

Author SHA1 Message Date
Will Daly
cadb81355e Merge pull request #548 from edx/will/fix-auto-auth-csrf-2 
Ensure auto-auth feature flag actually disables CSRF
 2013-08-01 08:20:32 -07:00
Adam
933935a887 Merge pull request #433 from edx/tsinghuax/lms-i18n 
Tsinghuax/lms i18n
 2013-08-01 07:00:00 -07:00
Will Daly
b78f6f7a3d Added pylint exceptions to load test settings. 2013-08-01 09:42:31 -04:00
Will Daly
9e5d64b8df Removed check for AUTOMATIC_AUTH_FOR_LOAD_TESTING because 
it's already implied that you're using load testing settings.
 2013-08-01 09:29:58 -04:00
Will Daly
ab1461542d Moved CSRF override into its own settings file 2013-08-01 09:27:46 -04:00
Will Daly
39030c6683 Remove CSRF middleware/processor in aws and dev settings, 
not common.  This ensures that we load the MITX_FEATURES
token BEFORE deciding to disable CSRF.
 2013-07-31 23:59:25 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution 
fixes template errors

keep tos untranslated

formatting fixes
 2013-07-31 19:39:15 -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
e0d
8abd7bb6fe these values are set implicitly at :147, setting them here clobbers them 2013-07-31 16:40:54 -04:00
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -07:00
Jonah Stanley
8d11c246e1 Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version 
Jonahstanley/upgrade chrome version
 2013-07-31 08:17:46 -07:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04:00
jsa
fc5d4aa745 make user_api compatible with HTTP basic auth 2013-07-30 17:13:48 -04:00
e0d
b9d762a0b8 changing the default in common.py 2013-07-30 16:20:35 -04:00
e0d
f1962a7bd7 removing an unneeded line that does damage 2013-07-30 16:20:18 -04:00
Your Name
21f1e58ce7 fix for underscore template issue for xmodules 2013-07-30 12:12:17 -04:00
Carlos Andrés Rocha
5b30c06b75 Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics 
Show dates when the data was collected in the instructor dashboard panel
 2013-07-30 09:11:58 -07:00
Calen Pennington
487c9a4f10 Merge pull request #524 from edx/cale/external_discussion_tab 
Cale/external discussion tab
 2013-07-30 08:59:09 -07:00
Calen Pennington
5e4cf50086 Make sure that all tab types used by the default for the course.tabs field work correctly 2013-07-30 11:32:31 -04:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Your Name
56c8057ed0 fix for underscore template issue for xmodules 2013-07-30 10:34:36 -04:00
David Ormsbee
b65200c2a8 Merge branch 'master' into rc/2013-07-30 2013-07-30 08:34:21 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel 
Feature/kevin/email notifications panel
 2013-07-30 05:30:56 -07:00
Diana Huang
0d10a872c8 Merge pull request #499 from edx/diana/login-redirect 
Only redirect when redirect url is an internal page.
 2013-07-30 05:29:39 -07:00
Jim Abramson
98fe2d495a Merge pull request #517 from edx/bug/jsa/edx_api_key 
add EDX_API_KEY to aws.py
 2013-07-30 04:05:39 -07:00
jsa
05f31f8bf1 Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel 2013-07-30 02:31:05 -04:00
jsa
7a7c070999 notification_prefs/views: correct docstring 2013-07-30 02:30:45 -04:00
Kevin Chugh
e1e591f8bf address code review comments 2013-07-30 01:55:20 -04:00
Kevin Chugh
c3e609fe40 fix merge conflict 2013-07-30 01:44:40 -04:00
Kevin Chugh
5c91edd4a5 update coffeescript to use new status url 2013-07-30 01:43:49 -04:00
jsa
908fd46f4d notification_prefs: add ajax endpoint to get preference status 2013-07-30 01:43:01 -04:00
Kevin Chugh
986a2cdec2 Merge branch 'feature/kevin/email_notifications_panel' of github.com:edx/edx-platform into feature/kevin/email_notifications_panel 2013-07-30 01:19:31 -04:00
Kevin Chugh
803b92fc9a add ajax endpoint for getting notifications status 2013-07-30 01:19:15 -04:00
jsa
0207255e1f fix strange comment typo 2013-07-30 00:14:10 -04:00
Kevin Chugh
62f6e2d52b home button working, default to home when no thread selected 2013-07-29 23:33:50 -04:00
Your Name
47dbf2e6cb updates but getting status and setting status not working 2013-07-29 18:33:19 -04:00
jsa
06eb5cdd93 Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel 2013-07-29 18:13:46 -04:00
jsa
33d4ae69dd add feature flag to enable/disable discussion home panel 2013-07-29 18:13:12 -04:00
marco
b7d6d77464 visual cleanup for email icon and discussion context label post branch merge 2013-07-29 17:49:34 -04:00
David Ormsbee
3d8b32bb69 Reverting 89c48f4a30 to unbreak codejail for this release. 2013-07-29 17:18:52 -04:00
Your Name
4afa5481dd set and get settings and fix discussion.css post-variable-apocalypse 2013-07-29 16:11:59 -04:00
jsa
6463bcae6c user_api: get username into user object 
so it can be used to generate unsubscribe tokens
 2013-07-29 15:20:08 -04:00
Jim Abramson
8ccaf623f1 add EDX_API_KEY to aws.py 2013-07-29 15:16:37 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
Your Name
7507921929 merge with Marcos new design 2013-07-29 13:58:08 -04:00
JonahStanley
20ce33dcdb Fixed broken tests from chrome versioning 2013-07-29 13:38:27 -04:00
Your Name
13ca61ba7f fix merge conflict with _variables.scss 2013-07-29 13:32:54 -04:00