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

28329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
7d7cb7850f don't add xblock with 'detached' tag as direct child of course for split in 'create_child' method 
PLAT-420
 2015-02-02 12:31:57 +05:00
Ned Batchelder
41040be7cc Merge pull request #6850 from edx/ned/contributing-tweaks 
Three spelling fixes
 2015-02-01 07:56:35 -05:00
Ned Batchelder
a0d4aff5ce Three spelling fixes 
I was going to make a more substantial change, but then realized why I
shouldn't.  Along the way, I saw these three words that should be
corrected.  So I was left with three very minor spelling fixes.  Should
I abandon them?  Seemed unfortunate.  So I'm committing them.

These are the kinds of decisions software engineers have to make....
 2015-02-01 07:54:07 -05:00
Will Daly
79ffa0f57f Merge pull request #6838 from edx/will/fix-translator-comments-in-email 
ECOM-1018: Fix translator comments showing up in redeem code email.
 2015-01-30 17:47:16 -05:00
Mark Sadecki
3f211d3ded Merge pull request #6842 from edx/cptvitamin/add-meself-to-authors 
adds Mark Sadecki to AUTHORS
 2015-01-30 16:09:29 -05:00
Ben Patterson
beb9602d2a Merge pull request #6841 from edx/benp/fix-all-scripts-bok-choy 
Fix test script shard bug.
 2015-01-30 15:36:43 -05:00
Will Daly
bf68daa46b Fix translator comments showing up in redeem code email. 
Fix newlines in redeem code email.

Update copy to make sense for edx.org as well as white label.
 2015-01-30 15:28:47 -05:00
Renzo Lucioni
8f974ea901 Merge pull request #6815 from edx/renzo/enable-logistration 
Make logistration generally available if feature flag is enabled
 2015-01-30 15:15:56 -05:00
Ben Patterson
3c689ea435 Fix test script shard bug. 
This will help with rollout of TE-720 and any future new shards.
 2015-01-30 15:15:29 -05:00
Mark Sadecki
74c46d364b adds Mark Sadecki to AUTHORS 2015-01-30 15:08:26 -05:00
Greg Price
20eb84d431 Merge pull request #6828 from edx/gprice/video-upload-ordering 
Sort Studio video uploads by creation date
 2015-01-30 15:08:09 -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
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
Greg Price
3978d91644 Sort Studio video uploads by creation date 
This provides a better UX for video uploaders, because recent uploads
are readily visible at the beginning of the table.
 2015-01-30 13:23:44 -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