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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dennis Jen
dd38f52358 Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments 
Feature flagged enrollment counts on instructor dashboard.
 2014-11-12 10:40:04 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
Renzo Lucioni
34dd4e59a1 Merge pull request #5914 from edx/renzo/final-text-review 
Final text review
 2014-11-12 09:55:48 -05:00
Will Daly
d50137bb64 Redirect to a valid URL when cancelling third party auth 2014-11-12 09:33:06 -05:00
David Ormsbee
1a4ad061b1 Merge pull request #5928 from edx/diana/fix-pylint-complaint 
Fix pylint violation.
 2014-11-12 09:26:34 -05:00
Nimisha Asthagiri
3651f2c0e9 Merge pull request #5921 from edx/gprice/fix-oauth-token-login 
Fix OAuth token login endpoint to set session user
 2014-11-12 09:19:35 -05:00
Diana Huang
da5bfd45aa Fix pylint violation. 2014-11-12 09:17:56 -05:00
AlasdairSwan
67da3b458a Merge pull request #5927 from edx/logistration-footnote 
ECOM-632 added asterix explanation footnote
 2014-11-12 09:12:09 -05:00
Christina Roberts
24039fb813 Merge pull request #5881 from edx/christina/notification-requirejs 
Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer
 2014-11-12 09:08:05 -05:00
Adam
4486ce35a7 Merge pull request #5913 from edx/adam/prevent-accidental-course-mode-downgrade 
Prevent instructors from accidentally downgrading enrollment modes throu...
 2014-11-12 09:05:01 -05:00
chrisndodge
257b22e228 Merge pull request #5922 from edx/cdodge/fix-import-error 
try importing the exact references we need rather than deferencing it fr...
 2014-11-12 09:04:19 -05:00
AlasdairSwan
1a5c3977af ECOM-632 added asterix explanation footnote 2014-11-12 08:52:51 -05:00
zubair-arbi
6dae34a34b Merge pull request #5923 from edx/zub/bugfix/wl-150-survey-form-error-on-info-page 
avoid annonymous user from redirecting to survey form
 2014-11-12 18:14:38 +05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
Sarina Canelake
7ada956975 Merge pull request #5918 from stvstnfrd/pep8/whitespace 
Fix whitespace-related PEP8 issues
 2014-11-11 09:01:43 -05:00
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form 
WL-150
 2014-11-11 14:22:26 +05:00
stv
bd4658e6a0 Lower PEP8 threshold to 150 violations 2014-11-10 19:31:09 -08:00
stv
1164624fbc Fix PEP8: W291 trailing whitespace 2014-11-10 19:31:09 -08:00
stv
cb894cf35e Fix PEP8: E261 at least two spaces before inline comment 2014-11-10 19:31:09 -08:00
stv
180adfed52 Fix PEP8: E251 unexpected spaces around keyword / parameter equals 2014-11-10 19:31:09 -08:00
stv
16afc89b9b Fix PEP8: E241 multiple spaces after ',' 2014-11-10 19:31:09 -08:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
b388ab9db0 Fix PEP8: E226 missing whitespace around arithmetic operator 2014-11-10 19:30:18 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08:00
stv
41390f0239 Fix PEP8: E222 multiple spaces after operator 2014-11-10 19:30:18 -08:00
stv
1a9f8b61f9 Fix PEP8: E221 multiple spaces before operator 2014-11-10 19:30:17 -08:00
stv
96ce219d80 Fix PEP8: E211 whitespace before '(' 2014-11-10 19:30:17 -08:00
stv
02e224df1f Fix PEP8: E203 whitespace before ':' 2014-11-10 19:30:13 -08:00
stv
0196048359 Fix PEP8: E202 whitespace before '}' 2014-11-10 17:07:41 -08:00
stv
0fdf8fb222 Fix PEP8: E201 whitespace after '{' 2014-11-10 17:07:40 -08:00
Greg Price
db8dd8de64 Fix OAuth token login endpoint to set session user 2014-11-10 18:06:25 -05:00
Adam Palay
1d85659b13 Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804 2014-11-10 18:04:22 -05:00
AlasdairSwan
790ac3f3ef Merge pull request #5915 from edx/alasdair/rwd-trackselection 
ECOM-574 Updated track selection page to be responsive
 2014-11-10 16:41:50 -05:00
Carson Gee
d02747ff60 Merge pull request #5910 from mitocw/cg/git_export_error_output 
Correct unresolved ugettext_lazy error strings in git_export command
 2014-11-10 16:33:51 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05:00
Greg Price
96b5637bef Merge pull request #5911 from edx/gprice/login-oauth-csrf-exempt 
Make OAuth token login endpoint CSRF exempt
 2014-11-10 16:28:11 -05:00
chrisndodge
81c1ae35d8 Merge pull request #5903 from edx/cdodge/shoppingcart-isolation 
harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTR...
 2014-11-10 16:03:38 -05:00
AlasdairSwan
23081f076b ECOM-574 Updated track selection page to be responsive 2014-11-10 15:39:17 -05:00
Sarina Canelake
0bf0d11a20 Merge pull request #5906 from stvstnfrd/pep8/newline 
Fix newline-related PEP8 issues
 2014-11-10 15:29:06 -05:00
Carson Gee
3816ac2ab0 Correct unresolved ugettext_lazy error strings in git_export command 2014-11-10 15:23:08 -05:00
Greg Price
9270c7c77d Make OAuth token login endpoint CSRF exempt 2014-11-10 15:20:35 -05:00
Will Daly
be0a4ee74e Merge pull request #5909 from edx/will/logistration-ab-test-css-classes 
Logistration: Add CSS classes so we can compare clicks between the old and new login/registration pages
 2014-11-10 15:12:38 -05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -05:00
David Baumgold
6774d1c047 Merge pull request #5856 from edx/django-require-post 
The Django @require_POST decorator is cool.
 2014-11-10 15:08:11 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Diana Huang
bd87a9dd29 Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:36:12 -05:00
Will Daly
ed652bbc98 Add CSS classes so we can compare clicks between the old and new login/registration pages 2014-11-10 14:32:56 -05:00
Diana Huang
b0b1744e18 Merge pull request #5902 from edx/diana/record-processor-response 
Record processor response on both successful and
 2014-11-10 14:19:42 -05:00
Will Daly
8f1cbada35 Merge pull request #5907 from edx/will/logistration-zoom-fixup 
Include zoom only if the page is marked as responsive
 2014-11-10 14:13:33 -05:00
Diana Huang
b1c44ac74f Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:09:42 -05:00