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

44475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
faecaf3316 Merge pull request #17088 from edx/arch/delete-dev-files 
Delete old development config files
 2018-01-04 09:23:57 -05:00
sanfordstudent
5867f2d632 Merge pull request #17085 from edx/sstudent/EDUCATOR-1290-loggin 
EDUCATOR-1290: logging
 2018-01-04 09:10:58 -05:00
Zubair Afzal
2eddbad3af Merge pull request #17072 from edx/zub/ENT-403-django-admin-thrid-party-auth-name-with-update_link 
add update link on name field for django admin SAMLProviderConfigAdmin
 2018-01-04 16:39:03 +05:00
Nimisha Asthagiri
ddfeb61b08 Delete old development config files 2018-01-03 17:26:09 -05:00
Sanford Student
14618c35de EDUCATOR-1290: logging 2018-01-03 16:36:23 -05:00
Tyler Hallada
e2d449b432 Merge pull request #17057 from edx/thallada/file-upload-limit 
Pass max_file_size_in_mbs to studio-frontend
 2018-01-03 16:06:35 -05:00
Douglas Hall
c223ccdc5b Merge pull request #17030 from edx/douglashall/ENT-779_drop_existing_session_migration 
ENT-779 Remove ProviderConfig.drop_existing_session field from DB.
 2018-01-03 15:51:35 -05:00
Nimisha Asthagiri
2d6c9d459d Merge pull request #17039 from edx/pacing/upsell-date-translation 
Schedules: Fix date translation of upsell messaging
 2018-01-03 14:16:33 -05:00
Michael LoTurco
70522862a3 Merge pull request #17023 from edx/MLoTurco/learner-serialize-entitlement-enrollment 
Add enrollment_course_run to CourseEntitlementSerializer

The marketing site currently cannot use the entitlement
api to determine whether a user has an unfilled entitlement.
Including the entitlement enrollment_course_run makes this
information accessible to consumers of the entitlement API.

Learner-3731
 2018-01-03 13:54:28 -05:00
Tyler Hallada
5728ce49cc Pass max_file_size_in_mbs to studio frontend 2018-01-03 13:53:57 -05:00
Alex Dusenbery
792d0db5da Convert weekly highlights exception to warning. 2018-01-03 13:11:46 -05:00
Brittney Exline
034bdf991e Merge pull request #17082 from edx/bexline/enterprise_version_bump 
ENT-775 Upgrade edx-enterprise to 0.60.0
 2018-01-03 11:10:58 -07:00
Ayub khan
4d77d7c38f Merge pull request #17080 from edx/update-translations-3-jan 
updated translations
 2018-01-03 22:49:46 +05:00
Brittney Exline
175eb1d0f6 ENT-775 Upgrade edx-enterprise to 0.60.0 2018-01-03 11:53:53 -05:00
Nimisha Asthagiri
a1047794e8 Schedules: Fix date translation of upsell messaging 2018-01-03 11:53:09 -05:00
Christopher Lee
e928c11368 Merge pull request #17046 from edx/clee/LEARNER-271 
Wrap strings in gettext for graders file
 2018-01-03 11:41:10 -05:00
Michael LoTurco
2807d9915e Add enrollment_course_run to entitlementserializer 
The marketing site currently cannot use the entitlement
api to determine whether a user has an unfilled entitlement.
Including the entitlement enrollment_course_run makes this
information accessible to consumers of the entitlement API.

Learner-3731
 2018-01-03 11:28:53 -05:00
christopher lee
10f1907ff4 Wrap strings in gettext for graders file 2018-01-03 10:27:46 -05:00
ayub-khan
7085dc77f3 updated translations 2018-01-03 20:04:28 +05:00
Ayub khan
565e1271cf Merge pull request #17077 from edx/update-pull-translations-make-target 
LEARNER-2653 Remove compilejsi18n commands
 2018-01-03 19:08:38 +05:00
Michael Terry
66980b53cc Merge pull request #17060 from edx/mikix/ie-login-align 
Fix login box alignment in IE
 2018-01-03 08:51:10 -05:00
Zubair Afzal
b281bb5b32 Merge pull request #17066 from edx/zub/ENT-832-third-party-auth-stop-username-sync 
Remove username from force syncing in third party auth pipeline
 2018-01-03 18:40:23 +05:00
Noraiz Anwar
7e0d7c151a Merge pull request #17073 from edx/revert-16858-noraiz/EDUCATOR-1931 
Revert "temporary logs to check if anonymous user is accessing courseware"
 2018-01-03 18:36:37 +05:00
ayub-khan
5e05da6dad remove compilejsi18n commands 2018-01-03 17:43:35 +05:00
Noraiz Anwar
31fb4a1b19 Revert "temporary logs to check if anonymous user is accessing courseware" 2018-01-03 14:51:30 +05:00
zubair-arbi
4a5f3e8e52 add update link on name field for django admin SAMLProviderConfigAdmin 
ENT-403
 2018-01-03 14:40:03 +05:00
Ayub khan
40be878ac3 Merge pull request #17070 from edx/LEARNER-2653-make-target-for-pull-translations 
Make Target for pull translations
 2018-01-02 18:40:34 +05:00
ayub-khan
634e152752 Make target for pulling translations 2018-01-02 17:00:10 +05:00
Noraiz Anwar
a222f01ac8 Merge pull request #17051 from edx/noraiz/EDUCATOR-2028 
fix course staff ability to perform operations on instructor dashboard
 2018-01-02 16:32:48 +05:00
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +05:00
Saleem Latif
81b200ae9e Merge pull request #17043 from edx/saleem-latif/ENT-829 
[ENT-829]: Move enterprise specific code in student_account views to enterprise_support
 2018-01-01 17:29:10 +05:00
zubair-arbi
7504be1c67 Remove username from force syncing in third party auth pipeline 2018-01-01 16:24:03 +05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Christopher Lee
96977fe2de Merge pull request #17058 from edx/clee/LEARNER-2353 
Use user's language preference on bookmark page
 2017-12-29 14:18:49 -05:00
christopher lee
02a98a7232 Use user's language preference on bookmark page 2017-12-29 13:11:00 -05:00
Stu Young
d75bbf05e4 Merge pull request #17053 from edx/estute/bokchoy-option-to-load-data-without-migrations 
add bokchoy script option for running migrations
 2017-12-29 12:03:12 -05:00
Michael Terry
4e05d43345 Fix login box alignment in IE 
In IE 11, the login page form was being shown right-aligned on the
page. This is because of some IE interaction with margin: auto.
Removing that and relying on flexbox flow fixes it and makes the
form centered again.

LEARNER-3001
 2017-12-29 11:36:49 -05:00
Stuart Young
454e5a3b55 bokchoy option for explicitly running migrations 2017-12-29 08:51:32 -05:00
David Ormsbee
cc229ebb65 Merge pull request #17031 from edx/ormsbee/collectstatic_ignore 
Ignore certain patterns during collectstatic.
 2017-12-28 20:42:12 -05:00
Tyler Hallada
0d23d39341 Merge pull request #16966 from edx/thallada/upgrade-xblock-dnd 
Upgrade xblock-drag-and-drop-v2 to v2.1.5
 2017-12-28 15:39:13 -05:00
David Ormsbee
4029ee1837 Ignore certain patterns during collectstatic. 
There are symlinks and file types that are not necessary to copy over
to the actual static files output, either because they are source files
that get compiled out, or because they exist only for tests. FEDX-448.

With themes enabled, this reduces the unoptimized static asset build
size from 343M to 212M. The optimized version goes from 838M to 500M.
 2017-12-28 15:05:54 -05:00
George Babey
e14c3faed6 Merge pull request #17056 from edx/gbabey/enterprise-0.59.0 
Upgrade edx-enterprise package to 0.59.0
 2017-12-28 15:04:39 -05:00
Tyler Hallada
bd36504584 Fix the tag for xblock-drag-and-drop-v2 2.1.5 2017-12-28 14:24:06 -05:00
Awais Jibran
864d5fc418 Merge pull request #17049 from edx/improve-logging-over-generate-cert-btn 
Improving logging over generate cert button on progress page.
 2017-12-28 23:16:35 +05:00
George Babey
f2881bd91f Upgrade edx-enterprise package to 0.59.0 
https://github.com/edx/edx-enterprise/compare/0.58.0...0.59.0
 2017-12-28 13:13:58 -05:00
Tyler Hallada
8240920aa3 Merge pull request #17002 from edx/thallada/upgrade-proctoring 
Upgrade edx-proctoring to 1.3.4
 2017-12-28 10:25:52 -05:00
Tasawer Nawaz
b716798d13 Merge pull request #17050 from edx/tasawer/learner-3649/exclude-enterprise-learners-from-the-welcome-email 
Exclude enterprise learners from the welcome email
 2017-12-28 19:39:33 +05:00
AsadAzam
18530c31ba Merge pull request #16994 from edx/asad/educator-1958-publish-courserun-multiple-courseaccesrole 
Fixed multiple CourseAccessRole error on publish
 2017-12-28 17:41:42 +05:00
Tasawer Nawaz
abf7b26b32 Exclude enterprise learners from the welcome email 
LEARNER-3649
 2017-12-28 15:49:45 +05:00
Asad Azam
1f5134b5ef Fixed multiple CourseAccessRole error on publish 2017-12-28 15:42:41 +05:00