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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
polesye
adddd75f03 Merge pull request #1564 from edx/anton/fix-video-bugs 
Video player: fix start-end time bugs.
 2013-11-04 02:01:59 -08:00
polesye
af71c780fe Fix bugs in Video player. BLD-468. 2013-11-04 11:30:24 +02:00
Jason Bau
64758673b5 Merge pull request #1563 from edx/jbau/OEE/feedback-handle-nonexistent-child 
add error handling for update_score for OEE when no child_history
 2013-11-01 16:24:18 -07:00
Jason Bau
c648db7f3d add comment explaining child_history condition 2013-11-01 15:51:20 -07:00
Giulio Gratta
6e988443f6 User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate 2013-11-01 14:34:02 -07:00
frances botsford
a57fac3be4 Merge pull request #1566 from edx/frances/fix/studio-course-creation-org-placeholder 
Course creation form cleanup
 2013-11-01 13:56:59 -07:00
Frances Botsford
8ae7bfae4d updated course creation UI: placeholder text for Org is now more generic, run is now using current format, and tips are now below fields to allow more room for tip text 
Addresses bugs STUD-885 and STUD-916
 2013-11-01 16:55:59 -04:00
Brian Talbot
6541b45566 Merge pull request #1572 from edx/talbs/fix-studio-forgotpassword 
Studio: Fix - Forgot Password Modal
 2013-11-01 13:40:40 -07:00
Brian Talbot
8048a4b25b Studio: changes URL for password reset to direct to LMS login view 
STUD-689
 2013-11-01 16:37:08 -04:00
Christina Roberts
5de54dc5ca Merge pull request #1546 from edx/christina/export 
Make export URL restful.
 2013-11-01 13:24:40 -07:00
Greg Price
2123d5e7ae Merge pull request #1570 from edx/gprice/forum-staff-label 
Remove label from forum posts by global staff
 2013-11-01 13:10:54 -07:00
Calen Pennington
25ec217939 Merge pull request #1561 from cpennington/hotfix-assertion-error 
Fix AssertionErrors that were raised when creation of an XModule failed
 2013-11-01 13:06:35 -07:00
Greg Price
7013c997f7 Merge pull request #1553 from edx/gprice/forum-follow-a11y 
Improve accessibility of forum follow buttons
 2013-11-01 13:02:01 -07:00
Brian Talbot
e41214b1ed Studio: revises the styling for the export view to sync with the import view's UI 2013-11-01 16:01:11 -04:00
Diana Huang
002972f24c Remove dates from status messages 
* clean up one last typo

LMS-1387
 2013-11-01 15:47:04 -04:00
Will Daly
78fd1fc1bb Merge pull request #1568 from edx/will/acceptance-test-fixes 
Will/acceptance test fixes
 2013-11-01 12:16:06 -07:00
Don Mitchell
3674d4fe8e Merge pull request #1484 from edx/dhm/course_id_clash 
Course id clash command
 2013-11-01 11:59:43 -07:00
Will Daly
9ab35759be Added wait for problem to re-render when checking or resetting it 
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
 2013-11-01 14:31:37 -04:00
Don Mitchell
32a6df0f9c Skipping new test until Jenkins mongo updated to >= 2.2 2013-11-01 14:24:01 -04:00
Don Mitchell
5fa44123bf Allow 'course' as course's id keyword 2013-11-01 14:20:41 -04:00
Don Mitchell
9cf318cec6 Course id clash command 2013-11-01 14:20:41 -04:00
Greg Price
c4cdb457de Remove label from forum posts by global staff 
The motivation for this change is performance. The forums UI code gets
the list of users for each role and renders the staff label based on
those lists. The list for the staff role is expensive to compute because
there is no index on the is_staff attribute, and we cannot create one
because the User model is built into django.

Users with is_staff=True are still assigned the Moderator role upon
enrolling in a course, so this change will have no practical effect
except that a user who is granted staff privileges after enrolling in a
course will have to be made a Moderator in order for their posts to be
labeled.

Additionally, the UI did not use the list of users with the Student
role, so that list has been removed as well.
 2013-11-01 14:16:55 -04:00
John Jarvis
f0b074b880 also adding insecure option to regenerate_user command 2013-11-01 12:05:59 -04:00
John Jarvis
ff8c58f5ee adds a new option to ungenerated_certs to use http in the callback url 2013-11-01 11:49:12 -04:00
Sarina Canelake
9f104eb617 Merge pull request #1558 from edx/sarina/beta_email_background_history 
Implement background email tasks on student dash
 2013-11-01 08:09:30 -07:00
Calen Pennington
d7766a7b28 Fix AssertionErrors that were raised when creation of an XModule failed 
The ErrorDescriptor wasn't getting the appropriate xmodule_runtime set,
and thus immediately raising an AssertionError when we tried to retrieve
and _xmodule from it.

[LMS-1388[
 2013-11-01 10:15:26 -04:00
Sarina Canelake
fff36275db Implement background email tasks on student dash 
LMS-1244
 2013-11-01 09:20:34 -04:00
polesye
f6b69eab4e Merge pull request #1513 from edx/anton/word-cloud-total-count-in-studio-bug 
Anton/word cloud total count in studio bug
 2013-11-01 06:19:45 -07:00
Jason Bau
ec7d9578ea add error handling for update_score for OEE when no child_history 2013-10-31 15:33:13 -07:00
Greg Price
6bca7de4b0 Avoid CS search endpoint for non-search queries 
This change requires cs_comments_service version 31ef160 or later. Now
that the /threads endpoint can filter by commentable_ids, use that
instead of the /search/threads endpoint, which does not sort and
paginate correctly.

Bug: FOR-224
 2013-10-31 16:49:01 -04:00
Sarina Canelake
944c433699 Merge branch 'release' 2013-10-31 15:04:48 -04:00
Sarina Canelake
6aa5d2cc82 Merge pull request #1562 from edx/hotfix-2013-10-31 
Hotfix 2013 10 31
 2013-10-31 12:03:10 -07:00
Diana Huang
17610edf77 Code cleanup due to review comments 
* make `user_status` more intelligent
* remove some logic from the templates
* rename `parse_error_msg` to `parsed_error_msg`
* fix up and add more tests

LMS-1387
 2013-10-31 15:01:39 -04:00
Diana Huang
5389d6b7cf Remove DAYS_GOOD_FOR from being a class variable. 
LMS-1387
 2013-10-31 15:01:39 -04:00
Victor Shnayder
d939a61e93 Update error messages and copy for re-verification flow 2013-10-31 15:01:39 -04:00
Slater-Victoroff
e3cef4e2a6 Merge pull request #1545 from edx/slater/mixed_mongo_abstract 
Proper abstraction of Module store base class implemented
 2013-10-31 11:35:52 -07:00
Diana Huang
d41a974558 Merge pull request #1556 from edx/diana/wiki-skip-links 
Add skip link to django template pages.
 2013-10-31 10:17:51 -07:00
Julia Hansbrough
70b7ac41c0 Merge pull request #1493 from edx/flowerhack/fix/wiki-textarea-trap 
Fixing accessibility bug where users could not tab through on wiki
 2013-10-31 10:02:29 -07:00
Julia Hansbrough
d3845970fa Removing alt-tab and alt-shift-tab 2013-10-31 16:54:48 +00:00
brianhw
a445009825 Merge pull request #1551 from edx/brian/add-email-datadog 
Add datadog stats for duplicate subtask and subtask update errors.
 2013-10-31 09:48:44 -07:00
Diana Huang
d8862927e1 Add skip link to django template pages. 
Bug: LMS-1387
 2013-10-31 11:03:03 -04:00
Greg Price
b6f5348181 Improve accessibility of forum follow buttons 
They now include screen reader-friendly text, have the ARIA checkbox
role, activate on keypress (for space or enter), and occur in the DOM
after the header information (title, etc.)
 2013-10-31 11:00:28 -04:00
Sarina Canelake
7aa80f6336 Merge pull request #1554 from edx/sarina/fix-violations 
Clean up pep8/pylint
 2013-10-31 05:55:40 -07:00
Valera Rozuvan
9b3bc84c29 Merge pull request #1480 from edx/valera/bugfix_start_end_time_correct_navigation 
Bug fix: video end time proper seek beyond.
 2013-10-31 05:24:29 -07:00
Valera Rozuvan
5cd4bae35d Start and end times function the same for YouTube and HTML5 modes. 
Fix bug when the user clicks on the video time-line either
before or after the specified end time, it jumps
to the very beginning of the video.

BLD-392
 2013-10-31 13:52:34 +02:00
polesye
2628e4f182 Merge pull request #1512 from edx/anton/video-disallow-to-use-http-protocol 
Video Player: Disallow users to enter video url's in http.
 2013-10-30 23:17:39 -07:00
Sarina Canelake
de1955dca6 Merge pull request #1549 from edx/sarina/ins-dash-js-bundle 
Package the instructor dash javascript separately
 2013-10-30 18:30:56 -07:00
Sarina Canelake
d711d29d74 Clean up pep8/pylint 2013-10-30 20:43:44 -04:00
Sarina Canelake
51ab852c69 Package the instructor dash javascript separately 
LMS-1418
 2013-10-30 20:41:38 -04:00