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

32761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Pinch
01eb2dffaf Merge pull request #9635 from mitocw/fix/bdero/dump-grades-command 
CRI-40 Don't assume user in request context when grading
 2015-09-14 09:05:56 -04:00
Muhammad Shoaib
20a3723544 Merge pull request #9693 from edx/muhhshoaib/fix-flaky-test 
SOL-1182 Fix of Flaky test in proctored exams.
 2015-09-14 13:44:41 +05:00
Aamir
b61f6bde2c Merge pull request #9581 from edx/aamir-khan/ECOM-2150-ga-client-missing-in-request 
ECOM-2150: Added the ga client fetching as a customer header in middl…
 2015-09-14 12:25:09 +05:00
Bill DeRusha
4234ff5959 Merge pull request #9707 from edx/bderusha/edx-search-config 
Add edx-search configuration to lms
 2015-09-11 14:45:23 -04:00
Brian Beggs
60e4a9f31f Merge pull request #9653 from edx/ammar/remove-django-threaded-multihost 
remove django-threaded-multihost
 2015-09-11 14:08:30 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms 
remove "defensive code" until we can figure out how to actually
catch the errors,
 2015-09-11 13:55:39 -04:00
Peter Fogg
12c9d6b52f Merge pull request #9714 from edx/peter-fogg/fix-slow-memberships 
Prevent over-expansion of team memberships.
 2015-09-11 13:37:50 -04:00
Matt Drayer
5241b04b03 Merge pull request #9689 from edx/ziafazal/SOL-1187 
SOL-1187: missing is_active attribute fix
 2015-09-11 13:35:27 -04:00
Daniel Friedman
87fcdb8088 Merge pull request #9723 from edx/dan-f/fix-teams-tab-spec-syntax-error 
Fix syntax error in teams_tab_spec.js
 2015-09-11 13:05:32 -04:00
Peter Fogg
48f72612c3 Prevent over-expansion of team memberships. 
TNL-3202
 2015-09-11 12:55:39 -04:00
Mark Hoeber
1aa73aa639 Merge pull request #9712 from edx/markhoeber-apidocfix 
Fix and cleanup of API doc
 2015-09-11 12:34:51 -04:00
chrisndodge
987808261d Merge pull request #9699 from edx/cdodge/0.9-proctoring 
update edx-proctoring to 0.9.x
 2015-09-11 12:29:07 -04:00
Zia Fazal
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Daniel Friedman
44fd787a98 Fix syntax error in teams_tab_spec.js 2015-09-11 11:43:20 -04:00
Sarina Canelake
40976cef76 Merge pull request #9720 from edx/sarina/flaky-cert-test 
Mark test as flaky (SOL-1199)
 2015-09-11 11:31:59 -04:00
Matt Drayer
034a7261e8 Merge pull request #9715 from edx/ziafazal/SOL-1192 
SOL-1192: include Null in filters while making a decision to pick right custom template
 2015-09-11 11:22:47 -04:00
Muhammad Shoaib
a7cec3283a Fix of Flaky test in proctored exams. 2015-09-11 20:08:58 +05:00
Sarina Canelake
39bfe27191 Merge pull request #9718 from edx/sarina/20150911-translations-update 
Update translations (autogenerated message)
 2015-09-11 10:36:57 -04:00
Sarina Canelake
463d425c7a Mark test as flaky (SOL-1199) 2015-09-11 10:30:42 -04:00
Sarina Canelake
a4904b38d8 Merge pull request #9686 from jolyonb/feqanswer 
Modifying template for formulaequationinput and fixing CSS
 2015-09-11 10:27:21 -04:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Peter Pinch
fe1c44afaf Merge pull request #9637 from edx/shr/bug/ccx_plat-795 
save_cxx slow transaction
 2015-09-11 09:56:51 -04:00
Diana Huang
222c3ba01e Merge pull request #9713 from edx/diana/eventing-updates 
Add course id contexts to teams events
 2015-09-11 09:16:06 -04:00
Syed Hassan Raza
49dfee0e44 save_cxx slow transaction 2015-09-11 06:06:42 -07:00
Sarina Canelake
da86964ff4 Update translations (autogenerated message) 2015-09-11 08:56:36 -04:00
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
Jolyon Bloomfield
7f14a151b9 Modifying template for formulaequationinput and fixing CSS 2015-09-10 21:43:24 -04:00
Diana Huang
f37ffc2f03 Add the course as part of the context for teams events. 
TNL-3248
 2015-09-10 17:24:54 -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
Mark Hoeber
d33f237644 Fix and cleanup of API doc 2015-09-10 15:55:17 -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