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

44757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rabia Iftikhar
e75a2ef5d4 Merge pull request #17270 from edx/ri/EDUCATOR-2147-update-message-info 
EDUCATOR-2147 update message info for Community TA's in Membership Dashboard
 2018-01-23 16:10:26 +05:00
rabia23
96df2eb35e EDUCATOR-2147 update message info for Community TA's in Membership Dashboard 2018-01-23 10:04:22 +00:00
Michael Roytman
d2320cbba5 Merge pull request #17119 from edx/thallada/files-search 
Add filename search to Files & Uploads
 2018-01-22 21:12:47 -05:00
Tyler Hallada
ad773dac5c Add text_search param for searching by displayname 2018-01-22 19:05:43 -05:00
Matthew Piatetsky
e17527c570 Merge pull request #17280 from edx/add_price_url_to_context 
Add price and url to context
 2018-01-22 17:01:08 -05:00
Feanil Patel
4ded0909d1 Merge pull request #17281 from edx/feanil/update_comment 
Update github.txt
 2018-01-22 16:55:44 -05:00
Ned Batchelder
d84d261cde Merge pull request #16533 from bzhang443/master 
Delete hard coded npm registry setting to accelerate installation
 2018-01-22 16:52:53 -05:00
Harry Rein
e3e363a342 Merge pull request #17274 from edx/HarryRein/a11y-issues-verification-sock 
LEARNER-3055: Clean up a11y issues on the verification sock
 2018-01-22 16:18:36 -05:00
Feanil Patel
6a7f941a18 Update github.txt 
Add more detail about using hashes/shas for requirements in this file.
 2018-01-22 15:47:51 -05:00
Matthew Piatetsky
ca8a1fcb29 Add price and url to context 2018-01-22 15:46:52 -05:00
Christopher Lee
3959509696 Merge pull request #17242 from edx/clee/optimizely 
Disable optimizely for xblocks for the mobile app
 2018-01-22 15:36:20 -05:00
Michael Terry
948cae4148 Fix crash using create_user 
Fix an invalid import usage to avoid a crash with the management
command create_user.

LEARNER-3932
 2018-01-22 13:46:35 -05:00
Matthew Piatetsky
e0bdd3773a Merge pull request #17273 from edx/try_bundling_test_fix 
Request correct program for bundling test
 2018-01-22 13:31:07 -05:00
Harry Rein
38cc3141cf Merge pull request #17277 from edx/HarryRein/course-dashboard-styling 
Fixing alignment of View Course button on course dashboard.
 2018-01-22 13:21:32 -05:00
Harry Rein
9dab9d2c20 a11y issues on upgrade footer. 
LEARNER-3055
 2018-01-22 13:14:47 -05:00
Harry Rein
d5e6ddc4f0 Fixing alignment of View Course button on course dashboard. 2018-01-22 12:07:47 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00
Sofiya Semenova
b3294bdea1 Merge pull request #17240 from edx/sofiya/ed-2140 
Video completion recording does not happen at the end of the video
 2018-01-22 11:38:00 -05:00
Jeremy Bowman
0558869f93 Merge pull request #17261 from edx/jmbowman/PLAT-1888 
PLAT-1888 Update edx-proctoring to fix URL reversal in Django 1.10
 2018-01-22 11:04:03 -05:00
Matthew Piatetsky
472de18f2e Request correct program for bundling test 2018-01-22 09:19:41 -05:00
Jeremy Bowman
6014313de1 PLAT-1888 Update edx-proctoring to fix URL reversal in Django 1.10 2018-01-22 09:02:52 -05:00
Ahsan Ul Haq
c368c9066d Merge pull request #17268 from edx/ahsan/LEARNER-3858-increase-rate-limit-rate 
Increase rate-limit rate
 2018-01-22 18:49:22 +05:00
Ahsan Ulhaq
3b0f16649d Increase rate-limit rate 
LEARNER-3858
 2018-01-22 12:57:58 +05:00
David Ormsbee
a7652a2080 Merge pull request #17264 from edx/ormsbee/sinon_module_id_fix 
Fix modules[moduleId] error when running JS tests
 2018-01-21 09:44:35 -05:00
David Ormsbee
17277ca1c2 Fix modules[moduleId] error when running JS tests 
Running LMS Karma tests was causing the following error:

  TypeError: modules[moduleId] is undefined
  at /edx/app/edxapp/edx-platform/lms/static/course_experience/js/spec/Enrollment_spec.js:20

The root issue was sinon, as documented here:
  https://github.com/webpack/webpack/issues/304

I tried multiple fixes suggested from that issue until I found one that
worked: https://github.com/webpack/webpack/issues/304#issuecomment-272150177
 2018-01-20 21:54:55 -05:00
Nimisha Asthagiri
dd136b457b Merge pull request #17197 from edx/arch/cert-import-signals-cleanup 
Certificates: clean up imports and signals
 2018-01-20 09:32:59 -05:00
Dillon-Dumesnil
96add87b22 Merge pull request #17228 from edx/ddumesnil/flaky-test 
Removing flaky tests
 2018-01-20 00:10:26 -05:00
Ned Batchelder
c71530558e Merge pull request #17245 from caesar2164/separate-file-index-overlay 
Move default overlay content to themable file
 2018-01-19 16:55:55 -05:00
Ned Batchelder
64a72397bc Merge pull request #17246 from caesar2164/separate-file-index-promo-video 
Move default Promo Video html to themable file
 2018-01-19 16:55:37 -05:00
Dillon Dumesnil
757fc6e2a7 Removing flaky tests 2018-01-19 16:33:49 -05:00
Rabia Iftikhar
f82f05c4ac Merge pull request #17259 from edx/ri/edx-proctoring-version-1.3.5 
update edx-proctoring version
 2018-01-20 02:01:29 +05:00
Giulio Gratta
2ceda12346 Move default Promo Video html to themable file 2018-01-19 12:51:15 -08:00
Giulio Gratta
234c20b202 Move default overlay content to themable file 2018-01-19 12:48:08 -08:00
Nimisha Asthagiri
dd20106c8b Quiet quality 2018-01-19 15:12:29 -05:00
Nimisha Asthagiri
75c3e865a4 Move COURSE_PACING_CHANGED signal 2018-01-19 15:12:29 -05:00
Nimisha Asthagiri
2e9efe6472 Fix Certificates import and signals code 2018-01-19 15:12:28 -05:00
rabia23
1436e5662c update edx-proctoring version 2018-01-19 19:51:20 +00:00
Albert (AJ) St. Aubin
00a1205934 Merge pull request #17254 from edx/aj/LEARNER-3672 
Updated the CourseEnrollment Admin form to correctly handle Course
 2018-01-19 14:50:43 -05:00
Jesse Zoldak
459bf63ee0 Merge pull request #17239 from edx/testeng/bokchoy_auto_cache_update_88834860015445be6b1c5d3affbd5afca7e1b59a 
Bokchoy db cache update
 2018-01-19 14:43:12 -05:00
Sofiya Semenova
380273bcaa Video completion marked at end of video 2018-01-19 14:39:49 -05:00
Albert St. Aubin
3661e1acdf Updated the CourseEnrollment Admin form to correctly handle Course 
[LEARNER-3672]

Updated the CourseEnrollment Admin form to convert the Course Strings to
CourseKey or OpaqueKey values as expected.
 2018-01-19 13:42:18 -05:00
Rabia Iftikhar
dfdf1a4ad3 Merge pull request #17068 from edx/ri/EDUCATOR-2016-suspicious-proctored-exams 
EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious
 2018-01-19 22:54:19 +05:00
Jeremy Bowman
67f4907ef2 Merge pull request #17243 from edx/jmbowman/PLAT-1889 
PLAT-1889 Fix URL config and reversal issues
 2018-01-19 12:50:16 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
sanfordstudent
2d3f9da2aa Merge pull request #17250 from edx/sstudent/reduce_logging 
reducing logging for EDUCATOR-1290
 2018-01-19 12:40:05 -05:00
rabia23
222794ee59 EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious 2018-01-19 16:50:16 +00:00
edx-cache-uploader-bot
f9ac6f1e2f Updating migrations 2018-01-19 11:39:24 -05:00
Sanford Student
af0909e8cf reducing logging for EDUCATOR-1290 2018-01-19 11:34:44 -05:00
Jeremy Bowman
ca84751bbd PLAT-1889 Fix URL config and reversal issues 2018-01-19 11:02:06 -05:00
Nadeem Shahzad
17dd276d16 Merge pull request #17201 from edx/nadeem/OPS-1008 
Remove edx-private.txt from edx-platform and move into configuration
 2018-01-19 16:54:18 +05:00