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

26821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
a2cc8d994a Enable cross-modulestore copying of course asset metadata. 
https://openedx.atlassian.net/browse/PLAT-38
 2014-11-13 11:15:45 -05:00
Don Mitchell
51927808f0 Merge pull request #5939 from edx/split/course_asset 
Paging and sorting for assets
 2014-11-13 10:17:59 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Don Mitchell
482113883a Paging and sorting for assets 
PLAT-75
 2014-11-12 16:05:59 -05:00
David Baumgold
a0a5746e21 Merge pull request #5935 from edx/db/upgrade-diff-cover 
Upgrade diff-cover
 2014-11-12 15:25:08 -05:00
Don Mitchell
978c2b240e Merge pull request #5933 from edx/dhm/bug_tnl-764 
Remove over optimization which didn't work correctly
 2014-11-12 15:20:15 -05:00
Greg Price
dec9e41d1b Merge pull request #5853 from edx/gprice/fix-complementary 
Fix spelling of complementary role
 2014-11-12 14:36:35 -05:00
David Baumgold
3676b4f72f Upgrade diff-cover 2014-11-12 14:17:27 -05:00
Don Mitchell
326a1221b9 Remove over optimization which didn't work correctly 
Added story PLAT-293 to do it correctly.
This fixes TNL-764
 2014-11-12 13:29:40 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression 
Changing event suppression to signal suppression.
 2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression. 
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
 2014-11-12 16:26:29 +00:00
David Baumgold
d981f98b9c Merge pull request #5814 from edx/disable-pylint-todo-comments 
Pylint: ignore TODO comments
 2014-11-12 10:51:40 -05:00
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
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
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
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
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
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
Diana Huang
bd87a9dd29 Record processor response on both successful and 
unsuccessful orders.
 2014-11-10 14:36:12 -05:00