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

11859 Commits

Author SHA1 Message Date
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Max Rothman
628eb86654 Merge pull request #9558 from edx/max/set-superuser 
Add management command for granting superuser access
 2015-09-16 10:59:37 -04:00
Ben Patterson
9751b00b1c Merge pull request #9774 from edx/benp/sept2015-bok-choy-shard-rebal 
Bok-choy rebalance. Shard 5 is getting long comparatively.
 2015-09-16 10:56:42 -04:00
Ben Patterson
754145a180 Rebalance. Shard_5 is getting long comparatively. 2015-09-15 15:19:38 -04:00
Mushtaq Ali
4f6a1fe766 Merge pull request #9760 from edx/mushtaq/tnl3252-fix-mathjax-rendering 
Fix Mathjax rendering bug
 2015-09-15 23:49:37 +05:00
David Ormsbee
da62662659 Merge pull request #9704 from lduarte1991/lti-iframe-userinfo 
Allows username and user email to be sent to an LTI.
 2015-09-15 12:00:54 -04:00
Matt Drayer
5b2b7be2d9 Merge pull request #9694 from edx/saleem-latif/SOL-449 
SOL-449: Flaky Milestones acceptance test
 2015-09-15 10:04:58 -04:00
John Eskew
6454ffc3b1 Merge pull request #9734 from edx/jeskew/replace_remove_persistent_factory 
Refactor the test_crud file.
 2015-09-15 09:05:43 -04:00
Mushtaq Ali
d563a3e921 Fix Mathjax rendering bug 2015-09-15 17:46:18 +05:00
David Baumgold
1c21a0d250 Remove trailing whitespace from Sass files 2015-09-14 15:17:10 -04:00
Bill DeRusha
1cfadf39cc Add logic to handle not searching when focus is passed to the clear search button 
TNL-3238
 2015-09-14 11:08:33 -04:00
John Eskew
78af86bc5b Refactor the test_crud file. 
Move Split-specific tests to test_split_modulestore.py.
Derive remaining tests from ModuleStoreTestCase.
Remove unused persistent_factory.py.
 2015-09-14 07:51:00 -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
Max Rothman
5923675c35 Add management command for granting superuser access 2015-09-11 15:43:21 -04: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
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
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
Muhammad Shoaib
a7cec3283a Fix of Flaky test in proctored exams. 2015-09-11 20:08:58 +05: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
Saleem Latif
c8dc10b2d7 added wait for loading js files 2015-09-11 18:46:36 +05: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
Matt Drayer
673e7ea553 Merge pull request #9658 from edx/saleem/SOL-1053 
SOL-1053
 2015-09-11 00:04:05 -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
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
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
Peter Fogg
146078e2c6 Fix redirecting to topics page after joining a team. 
TNL-3232
 2015-09-10 11:55:27 -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
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
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release 
Release 2015-09-09
 2015-09-09 12:38:15 -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
3a05726eaf Fix Pylint warning for monkey_patch tests 2015-09-09 09:13:29 -04: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
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
Brian Beggs
b7006533a2 updating lettuce to work with Django 1.4 - 1.8 2015-09-08 15:42:11 -04:00
Diana Huang
0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event 
Add events for tracking when teams are edited.
 2015-09-08 15:21:49 -04:00
Bill DeRusha
62ef4b5b8f Add more defensive code around elasticsearch connection 2015-09-08 12:12:05 -04:00
Jesse Zoldak
baa7bbdd94 Flag test as flaky SOL-1183 2015-09-08 10:36:10 -04:00
Saleem Latif
fc16e58cfa corrected selector for button 2015-09-08 19:21:26 +05:00