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

28317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Sadecki
74c46d364b adds Mark Sadecki to AUTHORS 2015-01-30 15:08:26 -05:00
Sarina Canelake
ef8b95b98e Merge pull request #6805 from edx/sarina/legal-update-footer-text 
Update Footer Copyright Notice as per Legal OPEN-444
 2015-01-30 14:09:38 -05:00
Chris
0a0d306b6a Merge pull request #6750 from edx/clrux/lms-navigation-content-focus-update 
Accessibility issues addressing UX-1573
 2015-01-30 12:26:23 -05:00
Will Daly
edc37a0418 Merge pull request #6816 from edx/aamir-khan/ECOM-763-invalidkeyerror 
Aamir khan/ecom 763 invalidkeyerror
 2015-01-30 11:40:43 -05:00
Sarina Canelake
2fd7657e0f Update text in LMS footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Sarina Canelake
af763c287e Update text in Studio footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -05:00
Adam
704fd1125f Merge pull request #6830 from edx/merge-release-into-master 
Merge release into master
 2015-01-30 10:48:14 -05:00
Adam Palay
bfcfbfab2f Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/github.txt
 2015-01-30 09:44:42 -05:00
Stephen Sanchez
869b407e1f Merge pull request #6818 from edx/sanchez/allow_redeem_code_upgrades 
ECOM-990: Fix the redemption codes to allow upgrading course modes.
 2015-01-30 09:36:43 -05:00
David Baumgold
0bf348cb28 Merge pull request #6791 from open-craft/bump-xblock-for-unique-id 
Bump XBlock version to include unique default field values
 2015-01-30 09:36:10 -05:00
Muzaffar yousaf
ae102de3be Merge pull request #6777 from edx/muzaffar/student-info-tnl836 
Get user anonymous id via xblock user service.
 2015-01-30 19:35:26 +05:00
Sarina Canelake
011a5f9410 Merge pull request #6754 from OmarIthawi/edraak/omarithawi/bulk-mail-rtl 
TinyMCE RTL in course bulk email
 2015-01-30 09:12:56 -05:00
AlasdairSwan
a001737d8c Merge pull request #6827 from edx/alasdair/logistration-field-focus-fix 
ECOM-1002 fixed issue of grey background for logistration page. Also fix...
 2015-01-30 08:52:53 -05:00
Xavier Antoviaque
f07cd749e4 Merge pull request #6740 from open-craft/kelketek/better-contentlib-modulestore-warning 
Better Content Library Block Incompatible Modulestore Warning (SOL-225)
 2015-01-30 13:04:29 +01:00
Awais
f3bf66c1c0 ECOM-763 handling InvalidKeyError exception. 2015-01-30 11:41:30 +05:00
Braden MacDonald
da3a3c038c Bump XBlock version 2015-01-29 17:31:07 -08:00
Adam
13c36c9097 Merge pull request #6821 from edx/hotfix/2015-01-29 
Hotfix/2015 01 29
 2015-01-29 17:43:34 -05:00
stephensanchez
b4c66f57d2 Fix the redemption codes to allow upgrading course modes. 2015-01-29 22:05:26 +00:00
Renzo Lucioni
e24d4d96ad Merge pull request #6720 from edx/renzo/remove-split-verification-session-flag 
Remove old payment and verification flow
 2015-01-29 16:57:40 -05:00
Chris Rodriguez
370eb970b1 Accessibility issues addressing UX-1573 
Conflicts:
	common/lib/xmodule/xmodule/css/sequence/display.scss
 2015-01-29 16:39:27 -05:00
Christine Lytwynec
4ee99f1911 Merge pull request #6824 from edx/clytwynec/TE-728 
Fix "No data to report" coverage errors in bok choy tests
 2015-01-29 16:12:33 -05:00
Jonathan Piacenti
f1fff439a6 Add clearer error message for library content blocks on incompatible modulestores. 2015-01-29 20:36:19 +00:00
AlasdairSwan
1562fdbbb4 ECOM-1002 fixed issue of grey background for logistration page. Also fixed focus issue when toggling between forms - as raised by @cptvitamin 2015-01-29 15:29:49 -05:00
Adam Palay
d4d785bfd7 update codejail (TNL-1248) 
(optionally use a proxy process to spawn subprocesses)
 2015-01-29 15:10:39 -05:00
Diana Huang
c71a183316 Update embargo copy. 
ECOM-963

update copy in tests
 2015-01-29 15:10:35 -05:00
Christine Lytwynec
4c8ab7dab5 Fix "No data to report" coverage errors in bok choy tests 2015-01-29 14:48:05 -05:00
Renzo Lucioni
f203651a37 Merge pull request #6817 from edx/renzo/pay-and-verify-fix-flaky-bok-choy 
Fix flaky bok-choy tests caused by malformed URL
 2015-01-29 14:06:43 -05:00
Jim Abramson
116dba39a8 Merge pull request #6711 from edx/jsa/fix-rerun-exception 
avoid database error when recording task exception
 2015-01-29 12:51:02 -05:00
Ben Patterson
00926740c1 Merge pull request #6819 from edx/benp/fix-pep8-jan291015 
Fix pep8 violation.
 2015-01-29 12:50:15 -05:00
Ben Patterson
2dd3cd8659 Fix pep8 violation. 2015-01-29 12:20:23 -05:00
David Baumgold
6134bedfca Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu 
Add classes to cohort selector element group
 2015-01-29 11:49:33 -05:00
Renzo Lucioni
d5fa69ee54 Fix flaky bok-choy tests caused by malformed URL 2015-01-29 11:36:03 -05:00
Mark Hoeber
dd857fb464 Merge pull request #6760 from edx/markhoeber-doc1510 
Platform API Doc Update
 2015-01-29 11:34:03 -05:00
Chris
53b22da9bc Merge pull request #6766 from edx/clrux/forums-indicate-current-convo 
Adding ARIA label to selected conversation
 2015-01-29 11:26:25 -05:00
jsa
ace2bffae6 avoid database error when recording task exception 2015-01-29 11:25:45 -05:00
Jesse Zoldak
dc5b88cc22 Merge pull request #6813 from edx/zoldak/ECOM-1007 
skip flaky test - test_immediate_verification_enrollment
 2015-01-29 11:18:03 -05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow 
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
 2015-01-29 10:56:25 -05:00
Adam
1ad0e9fdd8 Merge pull request #6560 from openfun/openfun/studio-csrf-error 
Fix csrf error on studio login
 2015-01-29 10:52:17 -05:00
Christine Lytwynec
20a605f043 Merge pull request #6803 from edx/clytwynec/add-extra-args-opt 
Add cov_args and extra_args to python unittest commands
 2015-01-29 10:35:42 -05:00
Mark Hoeber
1d738527b6 Platform/Mobile API doc updates 2015-01-29 10:19:35 -05:00
srpearce
30966eb618 Merge pull request #6772 from edx/sylvia/docs/EnrollCodesUI 
Update UI text for enrollment codes
 2015-01-29 10:01:42 -05:00
Syed Hassan Raza
a1ffcc5259 Disable referrer (TNL-1144) 2015-01-29 09:53:55 -05:00
Jesse Zoldak
663d02dd40 skip flaky test - test_immediate_verification_enrollment 
ECOM-1007
 2015-01-29 09:08:20 -05:00
Chris Rodriguez
d30088dd0d Using .sr instead of aria-label 2015-01-29 08:39:54 -05:00
Chris Rodriguez
42486a5ee6 Adding ARIA label to selected conversation 2015-01-29 08:39:54 -05:00
muzaffaryousaf
3a09af07e5 Fixing the broken tests. 
TNL-1185
 2015-01-29 18:37:22 +05:00
Adam
b17290cd75 Merge pull request #6802 from edx/adam/fix-translation 
fix settings page not handling unicode (TNL-1237)
 2015-01-29 08:02:09 -05:00
muzaffaryousaf
c461541d35 Refactoring tests. 
TNL-1185
 2015-01-29 13:33:28 +05:00
Régis Behmo
dce56b135e Make sure login form can't be submitted too early 
Tyhe sign in form should not be submitted before the submit event is
ready to be intercepted. This can occur if the user clicks too fast on
the sign in button.
 2015-01-29 09:10:59 +01:00
Régis Behmo
c3c35f076c Fix csrf error on studio login 
Context: We have witnessed multiple, seemingly random "CSRF verification
failed" errors while signing in (with valid ID) to the Studio.

Explanation: The login form does not initially include a CSRF field.
The CSRF header of the request is appended to the studio login request
headers by intercepting the form validation. This intercept is performed
by the login.js script. Unfortunately, the login.js script is loaded
pretty late (at the end of the template). So if the login form is
validated sufficiently fast, the login.js script has no time to load and
append the X-CSRFToken header to the request.

Proposed solution: the CSRF token is already passed to the template via
the login view, so we just add a hidden field to the login form to
include the csrf token.
 2015-01-29 09:10:59 +01:00