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

33818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
asadiqbal
290e577ea7 SOL-1380 release tag update in github.txt 2015-11-17 13:35:31 +05:00
wajeeha-khalid
9fcc1c32a1 Merge pull request #10586 from edx/jia/MA-862 
MA-862; accept application/merge-patch+json for comment/thread update
 2015-11-17 11:01:37 +05:00
Christina Roberts
08087861e1 Merge pull request #10643 from edx/christina/fix-remove-icons 
Correct the remove icon.
 2015-11-16 14:13:08 -05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Sarina Canelake
79eea58ba6 Merge pull request #10483 from mitocw/gdm_feature_ccx_api_#122 
Enforced maximum amount of students for CCX
 2015-11-16 11:08:52 -05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Christine Lytwynec
32d0fc7c26 Merge pull request #10622 from edx/clytwynec/jshint 
Clytwynec/jshint
 2015-11-16 08:59:41 -05:00
Adnan Ghaffar
fb34877212 Merge pull request #10599 from edx/adnan/chrome-bok-choy-fixes 
Adnan/chrome bok choy fixes
 2015-11-16 16:02:16 +05:00
Adnan Ghaffar
7dac728ee9 adding fixed tests for chrome 2015-11-16 14:47:12 +05:00
Peter Fogg
4cba4007fd Merge pull request #10633 from edx/peter-fogg/login-no-internet 
Show a message when logging in with no internet connection.
 2015-11-13 16:51:32 -05:00
Christine Lytwynec
9aa1f2b73f use .jshintignore instead of hardcoded directory list 2015-11-13 16:19:02 -05:00
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection. 
ECOM-2890
 2015-11-13 15:58:14 -05:00
Ben Patterson
b05c4af41c Merge pull request #10621 from edx/benp/back-to-upstream-nose 
Use upstream nose instead of a fork.
 2015-11-13 13:49:59 -05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Ben Patterson
f81b7cefc9 Merge pull request #10582 from edx/saleem-latif/SOL-1384 
saleem-latif/SOL-1384: Refactor certificates bok-choy pages to use PageObject
 2015-11-13 12:23:11 -05:00
Peter Pinch
6687aa1a66 Merge pull request #10538 from mitocw/fix/aq/error/validation_on_start_time 
Added validations for start and due date in Schedule tab inside CCX coach dashboard
 2015-11-13 11:09:51 -05:00
Diana Huang
b3b1b7e476 Merge pull request #10610 from edx/diana/flaky-pdf-testbook-test-control 
Start running the PDF Textbook test again.
 2015-11-13 10:52:23 -05:00
Amir Qayyum Khan
3ee5acfc00 Added error message incase user specified start or due date without time and also added start date and due date comparison validation in ccx coach dashboard validation. 2015-11-13 20:25:19 +05:00
Diana Huang
de47bcde7e Start running the PDF Textbook test again. 
Remove redundant and skipped video test.
 2015-11-13 10:02:51 -05:00
Matt Drayer
04c0b3aea9 Merge pull request #10595 from edx/saleem-latif/SOL-1333-feedback-changes 
saleem-latif/SOL-1333: Invalidate Generated Certificates before regeneration
 2015-11-13 09:18:54 -05:00
Matt Drayer
b932a202d8 Merge pull request #10593 from edx/asadiqbal08/SOL-1385 
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
 2015-11-13 09:15:18 -05:00
clrux
1587178525 Merge pull request #9974 from edx/clrux/ac-187 
Video player (1 of 2): refreshing the UI
 2015-11-13 08:06:43 -05:00
Saleem Latif
195178aa41 Refactor certificates bok-choy pages to use PageObject 2015-11-13 16:32:13 +05:00
asadiqbal
35d04bff89 SOL-1385 2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19 MA-862; accept application/merge-patch+json for comment/thread update 2015-11-13 12:52:21 +05:00
Saleem Latif
15380a00f7 invalidate Generated Certificates before regeneration 2015-11-13 12:26:19 +05:00
Ben Patterson
dcc9172e7b Use upstream nose instead of a fork. 
The multiprocessing issues we had seen previously do not appear
when we use our combination of plugin settings for multiprocessing.
This makes it unnecessary to use a fork.
 2015-11-12 20:34:55 -05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
David Baumgold
685572cbee Merge pull request #10581 from open-craft/courseware-error-stray-quotemark 
Remove stray quotation mark from courseware-error text.
 2015-11-12 14:58:21 -05:00
Matt Drayer
9cf0ab5be7 Merge pull request #10587 from edx/saleem-latif/SOL-1387 
saleem-latif/SOL-1387: Custom 500 error message should only be seen for Preview
 2015-11-12 13:16:15 -05:00
Saleem Latif
c068bc95cf Custom 500 error message should only be seen for Preview 2015-11-12 11:31:25 +05:00
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
Matjaz Gregoric
fc2594e37b Remove stray quotation mark from courseware-error text. 2015-11-11 09:02:50 +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
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +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