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

44444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
M. Rehan
584dee107e Merge pull request #17019 from open-craft/jill/hide-auto-advance-if-disabled 
Hides Video Auto Advance from Advanced Settings if disabled
 2017-12-28 15:34:03 +05:00
Awais Jibran
13d738fbb6 Improving logging over generate cert button on progress page. 
EDUCATOR-2017.
 2017-12-28 15:19:42 +05:00
Uzair Rasheed
2fcd2830a0 Merge pull request #16993 from edx/LEARNER-3352/GA-event 
Send student course goal event to GA
 2017-12-28 13:59:29 +05:00
John Eskew
e67171b880 Merge pull request #16944 from edx/jmbowman/PLAT-1859 
PLAT-1859 Fix LMS shard 1 tests under Django 1.9
 2017-12-27 16:22:36 -05:00
John Eskew
523b46962c Merge pull request #17037 from edx/bmedx/django111_fix_teams_tests 
Fixes to teams tests in Django 1.9+
 2017-12-27 15:03:38 -05:00
Jeremy Bowman
1aebe11afc PLAT-1859 Fix LMS shard 1 tests under Django 1.9 2017-12-27 14:38:55 -05:00
John Eskew
c7671b75e5 Merge pull request #17036 from edx/jmbowman/PLAT-1863 
PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9
 2017-12-27 14:26:50 -05:00
bmedx
da0858bbdf Add fixes for shoppingcart and discussions test failures 2017-12-27 13:42:42 -05:00
bmedx
39ad7efcbf Add a fix to CourseOverviews::pre_requisite_courses 2017-12-27 13:42:42 -05:00
bmedx
0f897a7b3f Fixes to teams tests in Django 1.9+ 
- add edx.org to lms tests KNOWN_HOSTS
- Don't check CourseTeamMembership field mutability on creation
 2017-12-27 13:42:42 -05:00
uzairr
72c834ed12 Send student course goal event to GA 
Ensure an event is fired whenever a student updates/creates
its course goal.'edx.course_goal.created' and 'edx.course_goal.updated'
should be sent after creation and updation respectively.

LEARNER-3352
 2017-12-27 23:09:30 +05:00
edx-pipeline-bot
2c633f1ed6 Merge pull request #17035 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-27 12:49:21 -05:00
Farhanah Sheets
3fb4ff346e Merge pull request #17034 from edx/fsheets/EDUCATOR-1995 
Pass ReadTheDocs path to studio-frontend
 2017-12-27 12:47:27 -05:00
Sofiya Semenova
edbdb78902 Merge pull request #16943 from edx/sofiya/ora 
Educator-1280 Force grade persist on changed enrollment track
 2017-12-27 12:07:18 -05:00
Ayub khan
872f571baf Merge pull request #17045 from edx/update-translations-26-dec 
updated translations
 2017-12-27 21:53:21 +05:00
Farhanah Sheets
cfdfec1d20 Add mako js filter 2017-12-27 11:25:36 -05:00
Michael Terry
dce5da581c Merge pull request #17032 from edx/mikix/LEARNER-3709 
Fix a11y issues on course dashboard
 2017-12-27 10:51:47 -05:00
Farhanah Sheets
425e3208bb Pass readthedocs course_author files path to studio-frontend assets page 2017-12-27 09:39:40 -05:00
Rabia Iftikhar
fcdead0c77 Merge pull request #17044 from edx/ri/EDUCATOR-1930-reposition-log-message 
EDUCATOR-1930 change log message position in set_score method
 2017-12-27 19:31:38 +05:00
rabia23
b22a656c53 EDUCATOR-1930 change log message position in set_score method 2017-12-27 13:28:49 +00:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05:00
Jillian Vogel
097c0665fc Hides Video Auto Advance from Advanced Settings if disabled 
and fixes affected tests.
 2017-12-27 13:27:36 +10:30
David Ormsbee
c0d0acd335 Merge pull request #17012 from edx/ormsbee/symlink_purge_cms_coffee_fixtures 
Remove cms/static/coffee/fixtures symlink.
 2017-12-23 21:09:00 -05:00
David Ormsbee
3d5585bd31 Merge pull request #16849 from edx/ormsbee/smaller_commons_chunk 
Reduce size of the commons.js bundle.
 2017-12-23 21:08:05 -05:00
Gregory Martin
832a1f2e32 Merge pull request #16972 from edx/yro/add_discussions_tracking 
Add Forum Notifications Email Tracking
 2017-12-23 17:21:16 -05:00
Jesse Zoldak
4fc20cb291 Merge pull request #17028 from edx/zoldak/TE-2353 
Paver commands for storing and retrieving bokchoy db caches from s3  TE-2353
 2017-12-22 14:43:16 -08:00
Brian Mesick
1af17b9c55 Merge pull request #16890 from edx/bmedx/django111_httpretty_0814 
Upgrade httpretty to fix test issues in Django 1.9+
 2017-12-22 17:33:52 -05:00
Jeremy Bowman
bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 2017-12-22 16:53:01 -05:00
Brian Mesick
4ceba7ad64 Merge branch 'master' into bmedx/django111_httpretty_0814 2017-12-22 16:25:25 -05:00
Jesse Zoldak
129bd7afdd Paver commands for storing and retrieving bokchoy db caches from s3 TE-2353 2017-12-22 16:14:29 -05:00