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

33785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Davorin Šego
a8cca47cc9 Merge pull request #10455 from edx/search/optimization 
Search performance (SOL-1030, SOL-1031)
 2015-11-11 10:41:33 +01:00
Davorin Sego
a62e403ed8 Search optimization 
Remove filtering by partition, course and user
Rewrite the LMS result processor to use the course blocks api
 2015-11-11 09:38:00 +01:00
Cliff Dyer
ce99ca63fa Merge pull request #10561 from edx/release 
Verify patched fix merge back into master.
 2015-11-10 14:10:05 -05:00
chrisndodge
3bd9f95ace Merge pull request #10557 from edx/hotfix/2015-11-10 
Disable posting to LinkedIn feature for microsites until we can suppo…
 2015-11-10 13:04:22 -05:00
Matt Drayer
31c5b94548 Merge pull request #10518 from edx/saleem-latif/SOL-1333 
SOL-1333: Add Cert Regenerate UI on Instructor Dash
 2015-11-10 12:20:07 -05:00
Matt Drayer
fab6e00313 Merge pull request #10417 from edx/ziafazal/SOL-1358 
ziafazal/SOL-1358: enabled web certs by default for all new courses
 2015-11-10 10:56:13 -05:00
Chris Dodge
eeb8c48922 Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts 2015-11-10 09:41:43 -05:00
Zia Fazal
cbc57aae6b enabled web certs by default 
changing default value instead of setting it via fields

fixed broken test

fixed quality violation

following another approach
 2015-11-10 18:51:14 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
Afeef Janjua
23ef989108 Merge pull request #10503 from edx/afeef/story/ECOM-2602-initial-verification-possible-states 
ECOM-2602 Initial Verification status should convey all possible states
 2015-11-10 14:36:25 +05:00
Syed Hasan raza
40847db72c Merge pull request #10153 from edx/shr/bug/PLAT-875-Courses_Appear_in_search_after_deletion 
Delete course entry from CourseAboutSearchIndex
 2015-11-10 14:30:57 +05:00
Afeef Janjua
ed6e46453c allow reverification for pending status ('must_retry', 'submitted') 2015-11-10 13:23:52 +05:00
Alison Hodges
f475200a16 Revert "Update example location to split style" 
This reverts commit 69b261775e.
 2015-11-09 17:22:00 -05:00
Alison Hodges
69b261775e Update example location to split style 2015-11-09 17:15:08 -05:00
Peter Fogg
7b801c66ca Remove check for course home page improvements. 2015-11-09 14:43:53 -05:00
Christopher Lee
c5138aae6b Merge pull request #10549 from edx/clee/dapi_allow_inactive_users 
Clee/dapi allow inactive users
 2015-11-09 13:55:50 -05:00
Cliff Dyer
27b85fb737 Merge pull request #10554 from edx/release 
Verifying release branch for release-2015-11-09
 2015-11-09 13:26:01 -05:00
christopher lee
0646f9bfcf MA-1637 Discussion API now uses the view_auth_classes for permissions 
Added missing unit tests.
 2015-11-09 13:05:37 -05:00
Sarina Canelake
2ae8ee2666 Merge pull request #10395 from mitocw/feature/skm/add_max_score#95 
Optionally add max and actual score for assignments to get_student_grade_summary_data output.
 2015-11-09 12:05:46 -05:00
Ned Batchelder
ca49d4de6b Merge pull request #10552 from edx/ned/xunit-tools-has-its-own-repo 
This script is now in github.com/nedbat/xunit_tools
 2015-11-09 11:34:24 -05:00
Ned Batchelder
1573c61d82 Merge pull request #10551 from edx/ned/coverage-4.0.2 
Bump coverage.py to 4.0.2
 2015-11-09 11:33:45 -05:00
Ned Batchelder
58e0633eae This script is now in github.com/nedbat/xunit_tools 2015-11-09 06:11:42 -05:00
Ned Batchelder
10e8435b3a Bump coverage.py to 4.0.2 2015-11-08 21:32:11 -05:00
Sarina Canelake
8e20faae10 Merge pull request #10548 from louyihua/i18n_fix 
Fix gettext guidance violation
 2015-11-07 08:58:37 -05:00
Syed Hassan Raza
3102788bd1 Delete course entry from CourseAboutSearchIndex 2015-11-07 18:27:09 +05:00
louyihua
73d8f06499 Fix gettext guidance violation 
1. No string concatenation should be used in the gettext function.
2. Some extra parentheses should be used in coffee script, to avoid the following situation: in coffee script, the call ```gettext "text to be extracted" + "text should not be extracted"``` will be translated into ```gettext("text to be extracted" + "text should not be extracted")``` rather than ```gettext("text to be extracted") + "text should not be extracted"```.
 2015-11-07 13:55:10 +08:00
Cliff Dyer
625b859c21 Merge pull request #10491 from edx/mobile/profile-default-privacy 
Mobile/profile default privacy MA-1580
 2015-11-06 16:44:00 -05:00
Peter Fogg
e068765d3c Merge pull request #10521 from edx/peter-fogg/update-date-display 
Update date summary blocks.
 2015-11-06 14:46:37 -05:00
Adam
e042ee2325 Merge pull request #10546 from edx/revert-disable-check-button-on-save 
Revert disable check button on save
 2015-11-06 13:22:19 -05:00
Shawn Milochik
5d8830096a Added max score to output of get_student_grade_summary_data. 
This will put the actual score and actual max score in scope for
the the return_csv function, so actual scores can be dumped.

The ultimate goal is to provide this data in the CSV dump that is
passed to Stellar via pylmod.

This is PR #10395 on edX, and issue 95 on mitocw's edx fork.

https://github.com/edx/edx-platform/pull/10395

https://github.com/mitocw/edx-platform/issues/95
 2015-11-06 12:49:19 -05:00
Andy Armstrong
a3ff4d50e8 Merge pull request #10534 from edx/andya/fix-studio-videos 
Fix optimizing of draggabilly and json2
 2015-11-06 12:12:44 -05:00
Adam Palay
33d9185d5d Revert "Disable submit button on save click" 
This reverts commit 99cca05730.
 2015-11-06 11:34:33 -05:00
Adam Palay
bc87ec15a9 Revert "add test for disabling check button while clicking save" 
This reverts commit bc6caea6a6.
 2015-11-06 11:33:52 -05:00
Christine Lytwynec
1ca0fa2b57 Merge pull request #10328 from edx/clytwynec/custom-a11y-rules-part2 
Clytwynec/custom a11y rules part2
 2015-11-06 11:17:15 -05:00
J. Cliff Dyer
00b3051b73 Make sure proper logic is used for getting account privacy. 2015-11-06 15:53:08 +00:00
Clinton Blackburn
7de9252e41 Merge pull request #10535 from edx/clintonb/enrollment-admin-fix 
Fixed admin issues
 2015-11-06 09:56:32 -05:00
Peter Fogg
270dc22c1f Update display of dates on Course Home page. 
Adds UTC time to the "Today's Date" block, and a fuzzy/relative
timestamp to all other displayed dates.

ECOM-2807
 2015-11-06 09:54:13 -05:00
chrisndodge
ee29e11ec2 Merge pull request #10533 from edx/cdodge/adjust-report-task-routing 
change 'routing' for some reports which go to potentially backlogged …
 2015-11-06 09:45:20 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
Matt Drayer
10ed76a890 Merge pull request #10543 from edx/asadiqbal08/SOL-1379_point_to_release 
asadiqbal08/SOL-1379 - Removed the limit on the number of lines in a title.
 2015-11-06 09:36:32 -05:00
David Baumgold
8ce94d2bc0 Merge pull request #10523 from edx/db/fix-cc-flaky-tests 
Fix flaky tests related to creative commons
 2015-11-06 09:20:24 -05:00
asadiqbal
13508c7681 SOL-1379 2015-11-06 18:45:36 +05:00
Chris Dodge
4216eaf5c3 change 'routing' for some reports which go to potentially backlogged queues 2015-11-06 08:29:17 -05:00
Syed Hasan raza
ab8aedc298 Merge pull request #9924 from edx/shr/bug/TNL-3168-import_from_youtube_html5_subs 
html5 transcript exists
 2015-11-06 04:28:02 -08:00
Syed Hassan Raza
a8c80535d3 html5 transcript sync 2015-11-06 16:32:13 -08:00
Clinton Blackburn
afd682e224 Fixed admin issues 
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
 2015-11-06 01:49:22 -05:00
Cliff Dyer
222bdd988b Merge pull request #10411 from edx/mobile/course-blocks-api 
Course Blocks API
 2015-11-05 19:16:59 -05:00
Nimisha Asthagiri
46523b1061 Transformer: ProctoredExamTransformer 2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
0698076440 Transformer: StudentViewTransformer 2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
ced7fde37f Transformer: BlockNavigationTransformer 2015-11-05 23:29:12 +00:00