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

10137 Commits

Author SHA1 Message Date
David Baumgold
d644da9ecd Merge pull request #6890 from edx/i18n-aria-labels 
Internationalize aria-label attributes
 2015-02-04 12:11:37 -05:00
ahsan-ul-haq
3b6e76ce82 Merge pull request #6808 from edx/ahsan/tnl-1076-change-name-modal-accessibilty 
Change name and email modal couple of accessibilty issues
 2015-02-04 21:37:07 +05:00
Sarina Canelake
6cdaad58de Merge pull request #6730 from OmarIthawi/edraak/unicode-fixes-log-username 
(WIP) Unicode fixes for log messages with username and other unicode input
 2015-02-04 11:31:57 -05:00
Christina Roberts
f579482e7f Merge pull request #6883 from edx/christina/delete-unused-api 
Delete unused student_profile API.
 2015-02-04 11:29:24 -05:00
Davorin Šego
b81d2ed143 Merge pull request #6887 from edx/dsego/search_a11y 
Search form accessibility
 2015-02-04 16:39:23 +01:00
David Baumgold
1a20891cbd Internationalize aria-label attributes 2015-02-04 10:31:40 -05:00
Will Daly
820cc4aaee Merge pull request #6784 from edx/will/invoice-refactor-squashed 
Invoice data model refactor
 2015-02-04 07:48:57 -05:00
Davorin Sego
3298971459 Search form accessibility 2015-02-04 10:49:44 +01:00
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +02:00
Sarina Canelake
0f45724c9a Convert shopping cart to use unicode lazy logging 
Conflicts:
	lms/djangoapps/shoppingcart/views.py
 2015-02-04 10:53:01 +02:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
Chris
6266dcf1e7 Merge pull request #6820 from edx/clrux/forums-assign-regions 
Assign regions/landmarks for easier navigation
 2015-02-03 16:03:18 -05:00
cahrens
48474eba83 Delete unused student_profile API. 2015-02-03 13:51:11 -05:00
cahrens
c84195867b Delete unused student_profile API. 2015-02-03 13:45:22 -05:00
Ben Patterson
b6256def99 Merge pull request #6814 from edx/benp/lms-one-shard 
LMS Acceptance to one shard.
 2015-02-03 13:41:09 -05:00
Sarina Canelake
41475d462c Merge pull request #6876 from Stanford-Online/giulio/course-price-upstream 
Add cosmetic price field to studio & logic
 2015-02-03 13:34:12 -05:00
Awais Qureshi
22af2b75af ECOM-890: Update invoice data model. 
ECOM-891: Allow tracking of invoice transactions.

Authors: Awais Qureshi and Aamir Khan
 2015-02-03 13:27:40 -05:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-02-03 09:40:00 -08:00
Will Daly
6fa7815f89 Merge pull request #6872 from edx/will/country-access-message-theme 
Country access messaging theme fixup
 2015-02-03 11:44:05 -05:00
Marco Morales
e061024557 Merge pull request #6849 from edx/marco/discussions-endorse/font-awesome-fix 
Fixes broken answer and endorse icons on discussion forums
 2015-02-03 10:44:50 -05:00
Chris Rodriguez
66f909cd50 Assigning regions to forum areas and adding ARIA to new post form 2015-02-03 10:34:37 -05:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Will Daly
ce9c258f8b Update country access message end-points to be backwards compatible with embargo theme templates 
Move default country access messages out of static_templates, so they are not served by other Django views.
 2015-02-03 08:59:41 -05:00
Ned Batchelder
b048d98eb9 Merge pull request #6851 from edx/ned/fix-gettext-literals 
Fix a number of incorrect translation string uses.
 2015-02-03 08:38:58 -05:00
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses 
These were found by the new pylint checker I wrote! :)
 2015-02-02 22:38:27 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream 
Add Cosmetic Display Price field to studio & logic to show it
 2015-02-02 20:07:58 -05:00
Ben Patterson
6708ed8fa6 This test no longer follows modern workflows. Disabling. TE-736. 
Also cleaning up some lint.
 2015-02-02 16:05:55 -05:00
Ben Patterson
c83ea18d91 Fix test failing under one shard. 
This test consistently fails when combining
lms acceptance onto one shard. (TE-737)
 2015-02-02 16:05:55 -05:00
Will Daly
82d7e25f3e Add views to the embargo app to render messages explaining why students are blocked. 2015-02-02 14:04:29 -05:00
Martyn James
98e92bfb12 Merge pull request #6847 from edx/mjames/search_setting 
Default search engine to None
 2015-02-02 08:31:06 -05:00
Anton Stupak
64b3768d6b Merge pull request #6837 from edx/anton/fix-flaky-unit-test 
TNL-1298: Flaky Jasmine test for Student Notes.
 2015-02-02 14:23:41 +02:00
Chris
2967f18d3f Merge pull request #6739 from edx/clrux/lms-navigation-accessibility-update 
Accessibility fixes for UX-1572
 2015-02-02 07:05:00 -05:00
polesye
bf3740696e TNL-1298: Flaky Jasmine test for Student Notes. 2015-02-02 09:53:24 +02:00
Marco Morales
951773150f updated icons on discussion forums 2015-01-31 18:40:38 -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
Martyn James
1b769b53cd Default search engine to None, so that all search/indexing operations are disabled until enabled 2015-01-30 16:40:03 -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
Chris Rodriguez
3acb5c53f0 Accessibility issues addressing UX-1572 2015-01-30 14:16:59 -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
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
Sarina Canelake
2fd7657e0f Update text in LMS footer as per legal 
[OPEN-444]
 2015-01-30 11:33:46 -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
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
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
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