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

28388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahsan Ulhaq
4198b0a33f Placeholder text for <iframe> encourages inaccessible content 
Iframe unit in the studio have accesibility issue as there was no title for
Iframe provided as well as placeholder does not specify what changes to made
to add new iframe

TNL-1073
 2015-02-09 20:41:32 +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
c89c2de9c7 Merge pull request #6891 from edx/dsego/update_authors 
Add dcikatic, dsego and mjevtic to the AUTHORS file
 2015-02-04 16:55:37 +01:00
Davorin Sego
d0b6fea9c8 Add dcikatic, dsego and mjevtic to the AUTHORS file 2015-02-04 16:51:50 +01:00
Davorin Šego
b81d2ed143 Merge pull request #6887 from edx/dsego/search_a11y 
Search form accessibility
 2015-02-04 16:39:23 +01:00
Muzaffar yousaf
b1dfac56f0 Merge pull request #6877 from edx/muzaffar/refactor-test-tnl836 
Refactoring the mocked user service object to return xblock user.
 2015-02-04 18:42:45 +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
muzaffaryousaf
e5a440ef7a Refactoring the mocked user service. 
TNL-836
 2015-02-04 12:32:38 +05: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
Diana Huang
3b6af2df60 Merge pull request #6120 from edx/dkh/add-description-field 
Backfill course_modes migration
 2015-02-03 15:34:11 -05:00
Calen Pennington
dcbfb1d78f Backfill migration of course_modes to add the description field 2015-02-03 14:13:41 -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
ebc86895ea Merge pull request #6874 from edx/revert-6182-giulio/course-price-upstream 
Revert "Add Cosmetic Display Price field to studio & logic to show it"
 2015-02-03 10:32:41 -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
Ben Patterson
407e6ec76b LMS Acceptance to one shard. 
We've transitioned many lettuce tests to bok-choy. It no longer
makes sense to keep LMS acceptance in two shards (each taking less
than 5 mins to run the actual tests).
 2015-02-02 16:05:55 -05:00
Will Daly
fd4ada255c Merge pull request #6864 from edx/will/country-access-messaging 
ECOM-998: Country access messaging
 2015-02-02 15:46:25 -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
Will Daly
19f676a8d7 Merge pull request #6845 from edx/will/country-access-models 
Add new models to embargo to support country access
 2015-02-02 14:03:18 -05:00
Feanil Patel
3570e474e0 Merge pull request #5123 from IONISx/tusbar/enable-https-studio 
Use HTTP_X_FORWARDED_PROTO header in studio
 2015-02-02 13:09:29 -05:00
Christine Lytwynec
74ecb84fc5 Merge pull request #6862 from edx/clytwynec/disable_flaky_tests 
disable PayAndVerifyTest.test_immediate_verification_enrollment
 2015-02-02 12:44:51 -05:00
Will Daly
a5867da9de Add new models to embargo to support country access 
Add Django admin UI for configuring country access

Migrate existing embargo rules into the new tables.
 2015-02-02 11:54:41 -05:00
Bertrand Marron
4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio 2015-02-02 16:54:26 +01:00
Christine Lytwynec
e90c66431b disable PayAndVerifyTest.test_immediate_verification_enrollment 2015-02-02 10:40:48 -05:00
Sarina Canelake
4b6c62a85b Merge pull request #6856 from edx/sarina/20150202-translations-update 
Update translations (autogenerated message)
 2015-02-02 09:35:26 -05:00
Sarina Canelake
67fbfdc8e0 Update translations (autogenerated message) 2015-02-02 09:12:54 -05:00
Ben Patterson
5e1cc88736 Merge pull request #6825 from edx/benp/bok-choy-4shards 
Introduce another bok-choy shard.
 2015-02-02 09:08:18 -05:00
Martyn James
7601046729 Merge pull request #6852 from edx/dcikatic/SOL-302-hide-reindex 
SOL-302 Hide reindex button if 'ENABLE_COURSEWARE_INDEX' false
 2015-02-02 08:34:26 -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