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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rodriguez
7c02782f90 Adding new logistration Sass partial to RTL compiled 2015-02-12 18:53:20 -05:00
Chris
7e2d4decd9 Merge pull request #6966 from edx/clrux/rtl-1628-fix 
Adjusting RTL styles for UX-1628
 2015-02-12 18:51:44 -05:00
Christina Roberts
60836459d5 Merge pull request #6965 from edx/christina/course-reruns-default 
Enable course reruns by default.
 2015-02-12 14:15:20 -06:00
Akiva Leffert
ee03612a20 Merge pull request #6959 from edx/aleffert/email-opt-with-enrollment 
Add optional email_opt_in parameter to enrollment end point.
 2015-02-12 11:58:07 -05:00
Chris Rodriguez
23e2b8b702 Adjusting RTL styles for UX-1628 2015-02-12 11:29:59 -05:00
Akiva Leffert
388139778d Add optional email_opt_in parameter to enrollment end point. 
JIRA: MA-286
 2015-02-12 10:40:27 -05:00
Piotr Mitros
eb2d8c4e68 Merge pull request #6867 from edx/pmitros/add-referer 
Add referer and accept_language to tracking logs
 2015-02-12 08:34:04 -05:00
Muzaffar yousaf
5bcb3a5e92 Merge pull request #6611 from edx/muzaffar/change-submission-version-tnl1125 
Changing the edx-submissions version to latest commit.
 2015-02-12 18:04:15 +05:00
Jesse Zoldak
2b3d927f68 Merge pull request #6964 from edx/zoldak/TE-745 
Fix flaky library test TE-745
 2015-02-12 06:55:50 -05:00
muzaffaryousaf
71e267eb69 Changing the edx-submission repo version to the latest commit. 
TNL-1125
 2015-02-12 15:54:30 +05:00
cahrens
0d2969909f Enable course reruns by default. 
TNL-1380
 2015-02-11 17:16:52 -05:00
John Eskew
b3cc2f576f Merge pull request #6716 from edx/jeskew/update_pycontracts_version 
Updated version of PyContracts.
 2015-02-11 16:10:06 -05:00
Christine Lytwynec
ecad6784fe Merge pull request #6863 from edx/clytwynec/split_unittests_into_shards 
split unittests into shards for in jenkins
 2015-02-11 15:01:05 -05:00
Piotr Mitros
cf719a40ba Add referer and accept_language to tracking logs 
3 line patch, together with a world of pain due to buggy code, broken abstractions in tests, etc.
 2015-02-11 13:35:27 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2 
Finish Country Access (Part 2 of 3)
 2015-02-11 13:15:38 -05:00
Will Daly
ea29bb4277 Merge pull request #6961 from edx/will/quiet-error-logs-invoice-pdf-missing-image 
Avoid logging errors when the image path is not provided for invoice PDFs
 2015-02-11 13:15:24 -05:00
Jesse Zoldak
405c92f4f4 Fix flaky library container test TE-745 2015-02-11 12:47:02 -05:00
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
Will Daly
5173525389 Avoid logging errors when the image path is not provided for invoice PDFs 2015-02-11 11:01:51 -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
e609f982d7 Country Access: block enrollment 
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
 2015-02-10 13:07:51 -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