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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stephensanchez
3396b2bb2c Fix the DJFS dependency. 2014-11-13 22:07:39 +00:00
Stephen Sanchez
66ff4e67cb Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga 
Adding new Google Analytics eCommerce event to shoppingcart.
 2014-11-13 16:51:37 -05:00
John Eskew
872faddba8 Add created_on and created_by to asset metadata storage. 
https://openedx.atlassian.net/browse/PLAT-278
 2014-11-13 14:59:12 -05:00
Ben Patterson
a19b97c61f Don't use 'test' db for mysql since it's reserved. 
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
 2014-11-13 14:41:50 -05:00
AlasdairSwan
d0c06dda96 Merge pull request #5952 from edx/alasdair/logistration-accessibility-update-3 
After accessibility review removed required field aria-describedby
 2014-11-13 13:34:07 -05:00
John Eskew
a4fea91322 Merge pull request #5940 from edx/jeskew/mixed_copy_assets_between_modulestores 
One bok_choy video test is failing - but it passes locally and should be fine.
 2014-11-13 13:25:53 -05:00
stephensanchez
822f15546a Adding new Google Analytics eCommerce event to shoppingcart. 
Adding new event and test

pylint and comments
 2014-11-13 18:17:52 +00:00
AlasdairSwan
06cbe161a7 After accessibility review removed required field aria-describedby 2014-11-13 13:12:36 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
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
Ben Patterson
3f7d0f242b Merge pull request #5943 from edx/benp/db-cache-mysql56 
Improve compatibility with additional mysql installations.
 2014-11-13 10:51:38 -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
AlasdairSwan
dfa8167446 Merge pull request #5938 from edx/alasdair/logistration-setvalidity-fix 
ECOM-369 Reunited the missing line with the rest of the page elements an...
 2014-11-13 08:11:48 -05:00
Ben Patterson
8e2d794264 Improve compatibility with additional mysql installations. 
Some mysql debian packages do not grant mysql user as many permissions, and
we need to add them.
 2014-11-12 22:11:59 -05:00
David Baumgold
e00424a091 Moved Studio images from img/ directory to images/ directory 
OPEN-304
 2014-11-12 17:19:23 -05:00
Will Daly
1aa8f8e712 Merge pull request #5937 from edx/will/logistration-csrf 
Logistration: Add CSRF cookie to combined login/registration form
 2014-11-12 16:32:11 -05:00
Will Daly
c8751b5b4a Add CSRF cookie to combined login/registration form 
Add CSRF check for login/registration views.
 2014-11-12 16:15:20 -05:00
Don Mitchell
482113883a Paging and sorting for assets 
PLAT-75
 2014-11-12 16:05:59 -05:00
AlasdairSwan
ecb6a69fe7 ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override 2014-11-12 15:51:18 -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
Renzo Lucioni
2fc2207bd2 Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup 
Clean up pep8 and pylint violations
 2014-11-12 14:34:03 -05:00
AlasdairSwan
0963372bb1 Merge pull request #5934 from edx/alasdair/logistration-accessibility-updates 
ECOM-369 accessibility updates
 2014-11-12 14:18:25 -05:00
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -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
Renzo Lucioni
8d02efb021 Clean up pep8 and pylint violations 
Also fixes failing Python unit tests
 2014-11-12 12:55:56 -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
Will Daly
1537086a9b Merge pull request #5930 from edx/will/logistration-handle-redirects 
Logistration: Clean up redirect logic
 2014-11-12 11:23:48 -05:00
Will Daly
c4992b9525 Merge pull request #5931 from edx/will/logistration-remove-extra-viewport-meta 
Logistration: Remove extra viewport meta tag
 2014-11-12 11:06:49 -05:00
Will Daly
0a35af5530 Remove extra viewport meta tag 2014-11-12 11:01:32 -05: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
Will Daly
ce158cf54e Merge pull request #5929 from edx/will/logistration-fix-cancel-third-party-auth 
Logistration: Redirect to a valid URL when cancelling third party auth
 2014-11-12 10:49:20 -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
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