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
Will Daly
ffee7517f0 Add Selenium tests for the combined login/registration form. 2014-11-14 13:57:26 -05:00
John Eskew
126747febc Merge pull request #5960 from edx/jeskew/default_asset_collection_name 
Always create an asset metadata collection in the Mongo modulestore.
 2014-11-14 13:54:52 -05:00
stephensanchez
2486901602 Adding disable logic for buttons. 
Update tests, clean up approach.

Updating jasmine tests.
 2014-11-14 18:35:55 +00:00
Sarina Canelake
810df8b7de Merge pull request #5885 from edx/sarina/name-branded-assets-in-lms 
Consistently name branded assets in lms
 2014-11-14 13:29:22 -05:00
Adam
3f5c824b74 Merge pull request #5957 from edx/adam/disable-purchase-button-on-click 
disable "go to payment button" on click (ECOM-643)
 2014-11-14 12:43:26 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
David Baumgold
559f1e194e Merge pull request #5941 from edx/studio-images 
Moved Studio images from img/ directory to images/ directory
 2014-11-14 10:33:26 -05:00
Sarina Canelake
ab54f9cf42 Translate "Powered by Open edX" string 2014-11-14 10:30:37 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
Stephen Sanchez
a84e4598dd Merge pull request #5955 from edx/sanchez/fix-djfs-dependency 
Fix the DJFS dependency.
 2014-11-14 10:15:41 -05:00
John Eskew
546d81a822 Always create an asset metadata collection in the Mongo modulestore. 
If no collection name is specified, use a default name.
https://openedx.atlassian.net/browse/PLAT-294
 2014-11-14 09:44:31 -05:00
John Eskew
600e7bf331 Merge pull request #5953 from edx/jeskew/created_by_on_addition 
Add created_on and created_by to asset metadata storage.
 2014-11-14 08:52:49 -05:00
Ben Patterson
3ae312caa6 Merge pull request #5954 from edx/benp/mysql56-test-updates 
Don't use 'test' db for mysql since it's reserved.
 2014-11-13 19:50:54 -05:00
Nimisha Asthagiri
07d50ba7a1 MA-90 Update Analytics Shim to match new mobile requirements. 2014-11-13 18:18:57 -05:00
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