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

28535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
a2df7af5db Merge pull request #6958 from edx/adam/fix-settings-500-french 
fix unicode error on cms settings page
 2015-02-11 12:36:44 -05:00
ahsan-ul-haq
77f98e1e77 Merge pull request #6954 from edx/ahsan/tnl-1383-ALT-text-describes-image-not-action 
ALT text describes image, not action
 2015-02-11 22:31:22 +05:00
Adam Palay
d4fff463d1 fix unicode error on cms settings page 2015-02-11 11:02:26 -05:00
Sarina Canelake
3b319b3d3f Merge pull request #6960 from edx/sarina/20150211-translations-update 
Update translations (autogenerated message)
 2015-02-11 10:58:02 -05:00
Sarina Canelake
bbbb630e08 Update translations (autogenerated message) 2015-02-11 10:53:17 -05:00
Daniel Friedman
df23f1e533 Merge pull request #6952 from edx/dan-f/fix-student-view-live 
Ignore staff member's cohort when masquerade is on
 2015-02-11 10:48:11 -05:00
Awais Qureshi
f3c3202341 Merge pull request #6931 from edx/awais786/ECOM-1028-add-profile-linkedin 
ECOM-1028 adding linked-in button , config model and migration for linke...
 2015-02-11 20:45:30 +05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution 
Discussion forum should be independent of mathjax
 2015-02-11 20:27:45 +05:00
Adam
20c9a8af19 Merge pull request #6510 from smarnach/safari-video-speed 
Work around a Youtube API bug that causes Safari to ignore the stored speed
 2015-02-11 10:17:29 -05:00
Daniel Friedman
322f6d1be2 Ignore staff member's cohort when masquerade is on 
TNL-1269
 2015-02-11 09:38:32 -05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url. 
ECOM-1028 update the migration and move the code into class method.
 2015-02-11 19:09:30 +05:00
Ahsan Ulhaq
b727bf70c5 ALT text describes image, not action 
At LMS dashboard course listing the course cover has alt
attribute that have course name and then Cover Page it describe
image not the action which is to take user to course home page

TNL-1383
 2015-02-11 18:43:50 +05:00
Nimisha Asthagiri
9e7b916fd6 Merge pull request #6797 from edx/mobile/perf_improvements 
Mobile performance improvements
 2015-02-10 16:21:37 -05:00
Adam
296167e531 Merge pull request #6950 from edx/release 
Release
 2015-02-10 16:06:24 -05:00
Ned Batchelder
5ccf6d53e1 Merge pull request #6916 from edx/ned/install-edx-lint 
Add our custom pylint plugin
 2015-02-10 15:33:37 -05:00
Clinton Blackburn
a27e747993 Merge pull request #6490 from edx/clintonb/oauth2-course-finder-improvements 
Updated _get_courses_with_access_type
 2015-02-10 15:27:17 -05:00
Daniel Friedman
45b7c2056c Merge pull request #6904 from edx/dan-f/fix-grades-download-in-cohorted-courseware 
Fix grades download in courses with cohorted content
 2015-02-10 14:57:04 -05:00
Adam
f3f6aef94f Merge pull request #6930 from edx/hotfix/2015-02-09b 
get the raw DescriptorSystem, not the CombinedSystem when instantiating ...
 2015-02-10 14:43:20 -05:00
Nimisha Asthagiri
e9e59e85fc Optimize video_module's __init__ method. 
The overall behavior of the __init__ method has remained the same.
What's changed is how it determines whether a field is explicitly set.

Instead of using the slower performing editable_metadata_fields, it
calls _field_data.has directly to check for explicitly set fields.
 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
a6130507c1 Mobile Video Summary API: add filter for get_children 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
4b9434a326 Mobile UserCourseStatus API: performance improvement with depth=2. 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
1840fe7f06 Mobile API: use bulk_operation context manager. 2015-02-10 14:02:49 -05:00
Will Daly
6ba6afced8 Merge pull request #6943 from edx/will/country-access-api-changes 
Finish Country Access (Part 1 of 3)
 2015-02-10 12:57:48 -05:00
Adam
84401f3320 Merge pull request #6946 from edx/shr/hotfix/log/TNL-1379-improve-logging-around-bulk-email 
add logging for send_email_task
 2015-02-10 11:25:24 -05:00
Syed Hassan Raza
2f7bee4254 add logging for send_email_task 2015-02-10 21:18:12 +05:00
Martyn James
c668be3133 Merge pull request #6855 from edx/dsego/SOL-260 
Courseware search: Change name of results page from "Searching [course n...
 2015-02-10 11:02:27 -05:00
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353 
Reorganise reindexing operation
 2015-02-10 10:58:49 -05:00
Ben Patterson
2ddc90cbc5 Merge pull request #6886 from edx/benp/change-enrollment-event-tests 
An upgrade to verified should emit a mode_changed event.
 2015-02-10 10:54:30 -05:00
Will Daly
98ee3a5377 Implement IP filtering in embargo middleware. 
Add history table for course access rule changes.

Provide test utility for simulating restricted access.

Provide `redirect_if_blocked` method for integration with other
parts of the system (will be used for blocking enrollment).

Add info-level logging explaining when and why users are blocked.
 2015-02-10 10:47:51 -05:00
Greg Price
12f89b3c2d Make registration endpoint CSRF exempt 2015-02-10 09:47:49 -05:00
Calen Pennington
89d4749057 get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226) 
get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)

quality fixes

remove trailing comma
 2015-02-10 09:47:44 -05:00
Ben Patterson
630801c72c An upgrade to verified should emit a mode_changed event. 
This change will also move us to bok-choy instead of lettuce for
these scenarios, and re-enable them. See TE-736.

Includes some refactoring of repeated event-checking code as well.
 2015-02-10 09:39:22 -05:00
Daniel Friedman
edd833ebc4 Fix grades download in courses with cohorted content 
TNL-1351
 2015-02-10 09:33:27 -05:00
Ben Patterson
0f92b092fb Merge pull request #6940 from open-craft/flaky-lib-users-tests 
Disabled flaky JS tests pending refactor to Backbone
 2015-02-10 07:55:22 -05:00
ahsan-ul-haq
c7c3e44076 Merge pull request #6932 from edx/ahsan/tnl-1073-Placeholder-text-iframe-inaccessible-content 
Placeholder text for <iframe> encourages inaccessible content
 2015-02-10 16:35:35 +05:00
Waqas Khalid
11159ba71e Discussion forum doesn't work when mathjax is down 
When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.

TNL-1149
 2015-02-10 13:12:41 +05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08:00
Will Daly
2c60a1d546 Merge pull request #6934 from edx/will/fix-embargo-migration 
Fix embargo migration to the new data models.
 2015-02-09 16:16:30 -05:00
Will Daly
7e746f7df0 Fix embargo migration to the new data models. 
The previous version of this migration incorrectly handled
disabled configuration.  When configuration is disabled,
the embargoed country field was the empty string; calling
str.split(",") produced a list with a single empty list entry,
which is not a valid country code.
 2015-02-09 14:08:35 -05:00
Waqas Khalid
78deaed245 Merge pull request #6445 from MatMoore/forum_vote_race_condition 
Vote buttons should be disabled while in use
 2015-02-09 23:51:59 +05:00
Will Daly
847f56d160 Merge pull request #6927 from edx/will/invoice-transaction-history 
Add InvoiceHistory model to record changes to invoices
 2015-02-09 13:16:49 -05:00
Waheed Ahmed
268280dfb5 Merge pull request #6908 from edx/waheed/tnl1352-fix-login-if-user-none-with-advanced-security-on 
Fixed ajax login when advanced security check is on for NoneType user.
 2015-02-09 22:28:54 +05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release 
Release
 2015-02-09 11:14:41 -05:00
Waheed Ahmed
cb88c1dd66 Fixed ajax login when advanced security check is on for NoneType user. 
TNL-1352
 2015-02-09 21:14:06 +05:00
Will Daly
8fba97ead5 Add InvoiceHistory model to record changes to invoices, invoice items, and invoice transactions. 2015-02-09 11:02:10 -05:00
Christina Roberts
4a5679b1df Merge pull request #6762 from edx/christina/split-default 
Enable split for new courses.
 2015-02-09 10:58:40 -05:00
Ahsan Ulhaq
cded2eb546 Changes in iframe placeholder text 2015-02-09 20:46:08 +05:00
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
Will Daly
b22b0a35be Merge pull request #6924 from edx/will/ECOM-1045 
ECOM-1045: Add messaging for when students miss the verification deadline
 2015-02-09 10:02:19 -05:00