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

9860 Commits

Author SHA1 Message Date
stv
29d3e69401 Fix PEP8: W602 deprecated form of raising exception 2014-11-25 14:42:04 -05:00
stv
829be1e9cb Fix PEP8: E502 the backslash is redundant 
between brackets
 2014-11-25 10:16:04 -05:00
Sarina Canelake
a883a9cdda Merge pull request #5925 from stvstnfrd/pep8/continuation 
Fix continuation-related PEP8 issues
 2014-11-25 09:03:40 -05:00
Waheed Ahmed
86f72942f5 Fixed HD button in firefox. 
TNL-536
 2014-11-25 14:39:56 +05:00
stv
b4c4d18e9f Fix Pylint: W0110: (deprecated-lambda) 
divide_chemical_expression: map/filter on lambda could be replaced by
comprehension
 2014-11-24 20:48:05 -05:00
stv
11020cf115 Fix Pylint: C0103: (invalid-name) 
Command.handle: Invalid name "d" for type variable
(should match [a-z_][a-z0-9_]{2,30}$)
 2014-11-24 20:48:05 -05:00
stv
0d2754d8d1 Fix PEP8: E502 the backslash is redundant 
between brackets
 2014-11-24 20:48:05 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
4d30aedf4e Fix PEP8: E127 continuation line over-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
6763c5dd74 Fix PEP8: E126 continuation line over-indented 
for hanging indent
 2014-11-24 20:46:44 -05:00
stv
2ce5a6ceed Fix PEP8: E125 continuation line 
does not distinguish itself from next logical line
 2014-11-24 20:46:44 -05:00
stv
aba9b3b96e Fix PEP8: E124 closing bracket does not match 
visual indentation
 2014-11-24 20:46:44 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match 
indentation of opening bracket's line
 2014-11-24 20:46:44 -05:00
stv
55de42d19c Fix PEP8: E122 continuation line missing 
indentation or outdented
 2014-11-24 20:46:35 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation 
is not a multiple of four
 2014-11-24 20:44:43 -05:00
Adam
cb7d6b3970 Merge pull request #6040 from edx/release 
Release
 2014-11-24 14:15:02 -06:00
Don Mitchell
f30ad29b21 Imports must replace drafts w/ published in split 
PLAT-299
 2014-11-24 09:38:00 -05:00
Renzo Lucioni
03f38dd8b4 Use analytics.identify instead of the old utility function 2014-11-21 12:53:59 -05:00
Renzo Lucioni
73dd6fe2c7 hotfix-2014-11-21 2014-11-21 12:11:44 -05:00
Don Mitchell
21608f340c Error on import into split 
if import restores a deleted draft element which was never published
PLAT_297
 2014-11-20 12:03:17 -05:00
Renzo Lucioni
55922f896d hotfix-2014-11-20 2014-11-20 12:00:19 -05:00
stephensanchez
7d36d11b35 Remove enrollment updates from the Enrollment API. 2014-11-20 09:36:30 -05:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
Waheed Ahmed
430aa4f834 Added alt attribute in image map input problem. 
TNL-822
TNL-825
 2014-11-20 16:58:26 +05:00
chrisndodge
4a3700c151 Merge pull request #5969 from edx/muhhshoaib/WL-124-front-end-tests-for-auto-enrollment 
muhhshoaib/wl 124 add front end tests for autoenrollment
 2014-11-19 10:14:22 -05:00
Nimisha Asthagiri
ec552cf154 Merge pull request #5981 from edx/mobile/MA-141 
MA-141 Support webm encoding for VAL-enabled videos
 2014-11-18 10:03:21 -05:00
Muhammad Shoaib
97b45cc2a7 WL-124 added the jasmine tests for the autoenrollment csv 
Added bokchoy tests and assets (csv files) for CSV auto reg and enrollment.
Set the env flag "ALLOW_AUTOMATED_SIGNUPS": true in bok_choy.env.json

Resolved quality issues.

resolved cherry pick conflicts

Improved bokchoy tests as per code review suggestions.

added the BDD in the docstrings for all the test scenarios

changed the bok choy test string

Improved bokchoy tests as per further code review suggestions.

Made a MembershipPageAutoEnrollSection a separate PageObject.
 2014-11-18 18:35:31 +05:00
Waheed Ahmed
2d46a79345 Updated open sans webfonts with latest. 
TNL-395
 2014-11-18 12:18:12 +05:00
Nimisha Asthagiri
caf5d5393b MA-141 Support webm encoding for VAL-enabled videos 2014-11-17 23:34:39 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
Stephen Sanchez
ffa08453f2 Merge pull request #5975 from edx/sanchez/change_api_student_id 
Update the API and Data Layer to get the student from the models.
 2014-11-17 11:42:42 -05:00
stephensanchez
75e45bc2ee Update the API and Data Layer to get the student from the models. 2014-11-17 15:09:33 +00:00
Nimisha Asthagiri
12a22ac886 MA-135, MA-122 Support CDN and alternative sources with VAL-enabled-videos. 2014-11-17 09:56:54 -05:00
Renzo Lucioni
5d15691762 Merge pull request #5964 from edx/renzo/password-reset-selenium 
Renzo/password reset selenium
 2014-11-17 09:40:50 -05:00
Will Daly
92d10ebd17 Respond to code review feedback 2014-11-17 08:58:56 -05:00
Renzo Lucioni
96dcdb436d Selenium tests of logistration password reset 2014-11-14 22:39:50 -05:00
Nimisha Asthagiri
ec74398d74 Merge pull request #5956 from edx/mobile/analytics-shim-update 
MA-90 Update Analytics Shim to match new mobile requirements.
 2014-11-14 19:59:12 -05:00
Will Daly
ffee7517f0 Add Selenium tests for the combined login/registration form. 2014-11-14 13:57:26 -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
Nimisha Asthagiri
07d50ba7a1 MA-90 Update Analytics Shim to match new mobile requirements. 2014-11-13 18:18:57 -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
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
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
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
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