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

1345 Commits

Author SHA1 Message Date
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Kevin Falcone
80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict 2015-11-20 13:13:05 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Adam Palay
5b5cf7d3b0 Fix login redirect when user is logged out while answering a question (TNL-3789) 2015-11-19 10:28:58 -05:00
Usman Khalid
bc22f592c6 Merge pull request #10664 from edx/usman/regenerate-db-cache 
Recreate db caches for bokchoy and lettuce
 2015-11-19 19:20:21 +05:00
Ben Patterson
0d68cd01bf Rebalance shard 7. 2015-11-18 15:30:50 -05:00
Usman Khalid
d8fd8ed678 Recreate db caches for bokchoy and lettuce 2015-11-18 21:08:05 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
raeeschachar
dfa0fe2db7 Fixed Chrome Bok Choy tests 2015-11-18 17:24:22 +05:00
Adnan Ghaffar
7dac728ee9 adding fixed tests for chrome 2015-11-16 14:47:12 +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
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
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
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
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
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05: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
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -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
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
Christine Lytwynec
a40f286ecf Updating a11y tests 2015-11-05 16:09:06 -05:00
Ben Patterson
7e8d3fdae5 Merge pull request #10519 from edx/benp/chrome-fix-certs 
Fixes for chrome automation:
 2015-11-05 15:24:38 -05:00
Christine Lytwynec
5d422b107c remove @attr('shard_5') from mixin 2015-11-05 15:08:00 -05:00
David Baumgold
07f331bcda Fix flaky tests related to creative commons 
TNL-2800
 2015-11-05 14:22:02 -05:00
Christine Lytwynec
468864a314 add paver test_a11y and a11y_coverage commands 2015-11-05 13:55:35 -05:00
Ben Patterson
947538bb1f Merge pull request #10507 from edx/benp/mp-learner-profile-events 
Refactor for multiprocessing.
 2015-11-05 09:18:48 -05:00
Ben Patterson
ef17e0b9a1 Fixes for chrome automation: 
* We do not need to click the upload button twice (typo?)
* Using a non-unique name for the upload image is causing GridFS indexing errors when
run too closely together (which happens with Chrome's speed)
 2015-11-05 08:36:40 -05:00
Peter Fogg
acf5bb57cb Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes 
Course pacing template changes.
 2015-11-04 14:11:49 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Ben Patterson
8f05878e2e Refactor for multiprocessing. 2015-11-04 10:34:36 -05:00
Peter Fogg
b98c89117c Course pacing template changes. 
Instructor-led is changed to instructor-paced. Adds a label to the
course outline page to show the course pacing.

ECOM-2794
ECOM-2800
 2015-11-04 09:59:58 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315 
SOL-1315: Add Cert Exception UI on Instructor Dash
 2015-11-03 10:09:19 -05:00
Jesse Zoldak
81782c4ecf Merge pull request #10283 from edx/zoldak/SOL-1160 
Fix for flaky asset test SOL-1160
 2015-11-03 10:07:39 -05:00
Jesse Zoldak
71ecb6c9f2 Fix for flaky asset test SOL-1160 2015-11-03 09:22:08 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
cahrens
f94459dde2 Provide time for the display of video speed to change. 
TNL-3725
 2015-11-02 13:33:59 -05:00
Matt Drayer
b900221ca4 Merge pull request #10394 from edx/asadiqbal08/SOL-1292 
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
 2015-11-02 10:14:47 -05:00
Christina Roberts
67f649a2d7 Merge pull request #10435 from edx/christina/flaky-bio 
Remove flaky flag from profile bok choy test
 2015-11-02 09:59:03 -05:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +05:00
cahrens
65a0994ca6 Remove flaky flag-- passed 30 times. 
TNL-3679
 2015-10-30 16:22:45 -04:00
Chris Dodge
cb4901431d mark test_can_reset_attempts as flakey as it sporadically fails 2015-10-30 15:46:13 -04:00
Eric Fischer
74906f248b Marking flaky test 
common.test.acceptance.tests.video.test_video_module.YouTubeVideoTest.test_video_component_stores_speed_correctly_for_multiple_videos
is flaky, see for details.
 2015-10-30 12:12:55 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run. 
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
 2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page. 
Currently unstyled.

ECOM-2462
 2015-10-28 14:33:11 -04:00