Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,728 Commits 1 Branch 0 Tags
3613d0f0c34d8d7c7c1c1940cfe6216b4e9ffe6e
Commit Graph

32728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahsan Ulhaq
3613d0f0c3 Merge pull request #9701 from edx/ahsan/Update-reverification-block-version-hash 
Update edX Reverification Block hash to the updated version
 2015-09-11 12:17:51 +05:00
Matt Drayer
673e7ea553 Merge pull request #9658 from edx/saleem/SOL-1053 
SOL-1053
 2015-09-11 00:04:05 -04:00
Andy Armstrong
84442697f0 Merge pull request #9706 from edx/andya/remove-stray-breadcrumb 
Remove unnecessary breadcrumbs for Teams tab
 2015-09-10 22:45:29 -04:00
Andy Armstrong
5f5310446f Remove unnecessary breadcrumbs for Teams tab 
TNL-3249
 2015-09-10 21:48:44 -04:00
Eric Fischer
17e6453546 Merge pull request #9520 from edx/efischer/teams-instructor-toolbar 
Teams Instructor Tools bar
 2015-09-10 17:24:39 -04:00
Eric Fischer
65cbab739a Team deleted and learner removed events 
Now emitting `edx.team.deleted` event where relevant. Includes tests.
Also includes tests to cover learner_removed events that are fired
as part of the deletion process, as well as learner_removed events
fired from the edit membership view.

Adding these deleted events has brought about a change in the teams
API - the DELETE membership endpoint now takes an optional `admin`
query parameter to differentiate between admin removal and self
removal for analytics purposes.

Also includes some changes needed to get page viewed events working
with admin tools changes made in this PR.
 2015-09-10 16:37:04 -04:00
Eric Fischer
6edadc2acc Developer-quality css 
Adding my humble attempts at making the tools match the wireframes
given in invision. Only done via changes in _developer.scss, the
real rules will be made by UX team elsewhere.

Includes preliminary accessibility feedback, and basic RTL.
 2015-09-10 16:37:03 -04:00
cahrens
3662fbc133 Edit Membership functionality and tests 
TNL-1913
 2015-09-10 16:36:55 -04:00
Andy Armstrong
55b2ea374f Merge pull request #9684 from edx/andya/fix-teams-i18n 
Fix i18n for last activity date on team cards
 2015-09-10 16:27:00 -04:00
clrux
f8bbbc8729 Merge pull request #9698 from edx/clrux/lms-global-sr-contrast 
LMS: setting fore/background colors for all sr elements
 2015-09-10 14:32:04 -04:00
Michael Frey
0a01a35b24 Merge pull request #9711 from edx/mjfrey/authors-update 
Add Michael Frey to AUTHORS file
 2015-09-10 14:14:58 -04:00
Michael Frey
6f1a1c9104 Add Michael Frey 
Added Michael Frey to AUTHORS file.
 2015-09-10 14:06:00 -04:00
Chris Rodriguez
e2bffc793d LMS: setting fore/background colors for all sr elements 2015-09-10 13:40:15 -04:00
Peter Fogg
f8da90e533 Merge pull request #9667 from edx/peter-fogg/join-team-redirect 
Fix redirecting to topics page after joining a team.
 2015-09-10 12:46:29 -04:00
Peter Fogg
0c3be8e121 Delete Team functionality and tests 
TNL-3164 TNL-3163
 2015-09-10 12:42:33 -04:00
Eric Fischer
8942b31d31 Introducing instructor toolbar 
All the non-CSS changes to get instructor toolbar working as in
wireframes, with non of the functionality or style.
 2015-09-10 12:39:41 -04:00
David Baumgold
04714d0d65 Merge pull request #9634 from edx/use-latest-gitpython 
Use latest version of GitPython
 2015-09-10 12:18:41 -04:00
Daniel Friedman
b03ba6f997 Merge pull request #9705 from edx/dan-f/remove-silly-debugger-statement 
Remove debugger statement from JS spec
 2015-09-10 11:58:52 -04:00
Peter Fogg
146078e2c6 Fix redirecting to topics page after joining a team. 
TNL-3232
 2015-09-10 11:55:27 -04:00
wajeeha-khalid
4d8f4bad53 Merge pull request #9648 from edx/jia/MA-1182_newPR 
Jia/ma 1182 new PR to integrate jenkins
 2015-09-10 20:54:31 +05:00
Daniel Friedman
68060d5139 Remove debugger statement from JS spec 2015-09-10 11:15:41 -04:00
Andy Armstrong
439ddfa97e Merge pull request #9668 from edx/andya/team-search-i18n-bug 
Improve support for Chinese characters in team search
 2015-09-10 11:09:17 -04:00
David Baumgold
85a18e28e5 Use latest version of GitPython 2015-09-10 11:03:16 -04:00
Daniel Friedman
d1d44e7bd0 Merge pull request #9611 from edx/dan-f/add-team-page-viewed-events 
Add page viewed events to teams app.
 2015-09-10 10:37:59 -04:00
wajeeha-khalid
1059456d69 added GET method for Threads in Dicussion API 2015-09-10 19:23:38 +05:00
Ahsan Ulhaq
3d2b6c40cb Update edX Reverification Block hash to the updated version 2015-09-10 19:04:54 +05:00
tasawernawaz
83e6da0683 Merge pull request #9691 from edx/tasawer/bugfix/ecom-1730-integrityError-on-course-enrollment 
Fixing IntegrityError happened on concurrent requests for course enrollment
 2015-09-10 18:33:37 +05:00
clrux
530312ab6d Merge pull request #9676 from edx/clrux/hotfix-lms-dashboard-link-hover 
Updating reset link colors
 2015-09-10 09:17:30 -04:00
Chris Rodriguez
16ae0df38d LMS: updating hover colors for visited links 2015-09-10 08:05:18 -04:00
Tasawer
02d4606e57 Fixing IntegrityError happened on concurrent requests for course enrollment 
ECOM-1730
 2015-09-10 10:51:14 +00:00
Daniel Friedman
3b957a7ee9 Add page viewed events to teams app. 
TNL-3188
 2015-09-09 23:04:44 -04:00
Peter Fogg
1c910cfbbb Merge pull request #9631 from edx/peter-fogg/teams-ajax-errors 
Respond to AJAX errors in Teams UI.
 2015-09-09 18:49:39 -04:00
Andy Armstrong
6817e89f4a Fix i18n for last activity date on team cards 2015-09-09 17:59:25 -04:00
Peter Fogg
95339311b0 Respond to AJAX errors in Teams UI. 
TNL-3042
 2015-09-09 17:04:23 -04:00
chrisndodge
34e01581c1 Merge pull request #9680 from edx/cdodge/only-show-proctoring-download-when-enabled 
only show proctoring download button when the course has proctoring e…
 2015-09-09 15:01:18 -04:00
chrisndodge
0afa0ab764 Merge pull request #9674 from edx/muhhshoaib/PHX-141-proctoring-timer-count-down-acccessibility 
PHX-141
 2015-09-09 14:28:43 -04:00
Andy Armstrong
321a0ea6a0 Fix searching with Chinese characters 
TNL-3228
 2015-09-09 14:16:05 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release 
Release 2015-09-09
 2015-09-09 12:38:15 -04:00
chrisndodge
f5057b841c Merge pull request #9597 from edx/cdodge/adjust-log-level 
reduce logging severity from exception to error
 2015-09-09 12:29:43 -04:00
Chris Dodge
5591101a18 only show proctoring download button when the course has proctoring enabled 2015-09-09 12:06:58 -04:00
Clinton Blackburn
020e16495d Merge pull request #9630 from edx/rc/2015-09-09 
Release 2015-09-09
 2015-09-09 11:04:27 -04:00
Sarina Canelake
7eb41ed840 Merge pull request #9590 from openfun/openfun/fix-dropdown-problem-template 
Fix correct answer position in dropdown problem template.
 2015-09-09 10:15:06 -04:00
Sarina Canelake
c5bca132bd Merge pull request #9670 from edx/sarina/fix-inherited-tests 
Fix Pylint warning for monkey_patch tests
 2015-09-09 10:06:21 -04:00
Christine Lytwynec
8d0bc488e1 Merge pull request #9664 from edx/clytwynec/AC-166 
Remove unicode quotes in courseware html attrs
 2015-09-09 09:43:37 -04:00
Sarina Canelake
b19a0e71d3 Fix pylint issues in spoc_gradebook test 2015-09-09 09:13:29 -04:00
Sarina Canelake
3a05726eaf Fix Pylint warning for monkey_patch tests 2015-09-09 09:13:29 -04:00
Muhammad Shoaib
24195c12ea PHX-141 
added the accessibility element for timer count down
 2015-09-09 15:51:14 +05:00
Muzaffar yousaf
4aa38330b8 Merge pull request #9622 from edx/muzaffar/upgrade-django-sekizai 
Upgrading django-sekizai
 2015-09-09 15:41:20 +05:00
muzaffaryousaf
e33d1dc563 Upgrading django-sekizai 
TNL-2811
 2015-09-09 14:33:13 +05:00
Muzaffar yousaf
d17bff1cbb Merge pull request #9645 from edx/muzaffar/upgrade-django-ses 
Upgrading django-ses
 2015-09-09 14:19:40 +05:00