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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lduarte1991
1455882b4f Allows username and user email to be sent to an LTI. 
Currently, there is a way to do so via opening the LTI tool in a new
page, this removes the one line of code that specifies that it is the
only way to do it. It allows the iframe’d version of the tool to be
able to receive such information if necessary.
 2015-09-10 10:53:36 -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
Zia Fazal
4d08cfd4e2 include Null in filters 2015-09-10 15:29:32 +05: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
Christine Lytwynec
6164c20a0f Make studio forgot password link focusable 2015-09-09 12:40:31 -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
Muhammad Shoaib
2ee10a6c1d fixed the allowances table css issue in instructor dashboard 2015-09-09 19:22:41 +05: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
muhammad-ammar
2521e379b9 update python-social-auth 2015-09-09 15:04:30 +05:00
aamir-khan
282b9449a4 ECOM-2150: Added the ga client fetching as a customer header in middleware 2015-09-09 14:50:12 +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
jpaille
b8c33e7b30 Add Julien Paillé to AUTHORS. 2015-09-09 09:12:29 +00:00
jpaille
ef2a855e93 Fix dropdown problem (optioninput) template. 
The correct answer is now correctly displayed after `show answer` is pressed.
 2015-09-09 09:11:33 +00:00
muzaffaryousaf
86553c2f13 Upgrading django-ses 
TNL-2811
 2015-09-09 12:56:44 +05:00
Muzaffar yousaf
0ee2112b78 Merge pull request #9573 from edx/muzaffar/upgrade-mock-django 
Upgrade mock-django in platform & released version for edx-search.
 2015-09-09 12:40:50 +05:00
Ahsan Ulhaq
de6d49701b Merge pull request #9447 from edx/ahsan/ECOM-2118-Credit-Eligible-Assessments-Appear-in-Incorrect-Order 
Credit-Eligible Assessments Appearing in Incorrect Order
 2015-09-09 12:28:54 +05:00
muzaffaryousaf
0ed729b0ca Upgrading edx-search version in platform 
TNL-3136
 2015-09-09 11:49:15 +05:00
muzaffaryousaf
6be65f6595 Upgrade mock-django to 0.6.9. 2015-09-09 11:49:12 +05:00
Muzaffar yousaf
4c2dc816bb Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history 
Upgrading django-simple-history to 1.6.3
 2015-09-09 11:38:23 +05:00