Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • be55e36d65 Merge pull request #9620 from edx/ammar/update-django-ratelimit-backend Brian Beggs 2015-09-08 14:17:06 -04:00
  • 815a3d6cf3 Merge pull request #9646 from edx/muhhshoaib/SOL-1171-return-display-string-from-backbone-view chrisndodge 2015-09-08 14:09:06 -04:00
  • 3015c4a51d Merge pull request #9638 from jolyonb/fixspace Sarina Canelake 2015-09-08 13:00:05 -04:00
  • 62ef4b5b8f Add more defensive code around elasticsearch connection Bill DeRusha 2015-09-04 15:36:19 -04:00
  • 19b705ac73 Merge pull request #9659 from edx/zoldak/SOL-1183 Jesse Zoldak 2015-09-08 11:57:27 -04:00
  • 89ea9885c5 Merge pull request #9662 from edx/zoldak/edx-lint-027 Jesse Zoldak 2015-09-08 11:54:34 -04:00
  • 1b861b9d81 SOL-1171 passed the display string to the underscore template so that the word "proctored" is not hard coded in the underscore file. Muhammad Shoaib 2015-09-07 17:54:47 +05:00
  • 3415b94aa8 Merge pull request #9655 from edx/ned/disable-pip-version-check Ned Batchelder 2015-09-08 11:39:04 -04:00
  • bb285f9f3c Use the oauth provider utils to suggest a key/secret Kevin Falcone 2015-09-06 22:15:45 -04:00
  • 0ce72adbf1 Update edx-lint to v0.2.7 Jesse Zoldak 2015-09-08 11:15:33 -04:00
  • baa7bbdd94 Flag test as flaky SOL-1183 Jesse Zoldak 2015-09-08 10:36:10 -04:00
  • fc16e58cfa corrected selector for button Saleem Latif 2015-09-08 19:21:26 +05:00
  • 3949242c43 Merge pull request #9656 from edx/saleem-latif/authors Matt Drayer 2015-09-08 09:55:12 -04:00
  • 19c89a3c84 remove django-robots from docs/shared/requirements.txt muhammad-ammar 2015-09-08 18:06:10 +05:00
  • d0aff223ad updated AUTHORS file Saleem Latif 2015-09-08 17:36:43 +05:00
  • dae0285af8 Merge pull request #9473 from edx/zub/story/ecom-2044-login-registration-requirejs Zubair Afzal 2015-09-08 17:30:33 +05:00
  • bd3dfee911 Merge pull request #9629 from edx/asadiqbal08/SOL-1159 Matt Drayer 2015-09-08 08:10:01 -04:00
  • 0dea5605c0 Disable the pip version check message Ned Batchelder 2015-09-08 07:18:15 -04:00
  • 6ffbb4e3ba remove django-threaded-multihost muhammad-ammar 2015-09-08 15:11:09 +05:00
  • 5858d62b53 remove django-kombu muhammad-ammar 2015-09-08 15:01:00 +05:00
  • 6163d2e071 Remove django-masquerade muhammad-ammar 2015-09-07 14:58:18 +05:00
  • 9aba4a72f4 Merge pull request #9621 from edx/ammar/update-django-robots Muhammad Ammar 2015-09-08 14:17:52 +05:00
  • 1fcdc9de2e update django-ratelimit-backend muhammad-ammar 2015-09-04 15:06:13 +05:00
  • ea40c2f1c6 Credit-Eligible Assessments Appearing in Incorrect Order Ahsan Ulhaq 2015-08-24 19:49:59 +05:00
  • f495c135d6 Merge pull request #9458 from edx/muhhshoaib/PHX-update-dialog-box-css Muhammad Shoaib 2015-09-08 12:41:12 +05:00
  • c652cb2d1d Fix order of tracking backends Gabe Mulley 2015-09-07 18:00:38 -04:00
  • 9badf24a66 Merge pull request #9641 from edx/ziafazal/MAYN-119-update Matt Drayer 2015-09-07 15:19:44 -04:00
  • d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files ECOM-2044 zubair-arbi 2015-09-07 13:49:02 +05:00
  • 17f10d21d0 SOL-1159 asadiqbal 2015-09-04 20:10:21 +05:00
  • 3ac27a5d6b Merge pull request #9625 from edx/afeef/bugfix/tnl-3094-unit-ribbon-courseware-z-index-fix Afeef Janjua 2015-09-07 16:04:10 +05:00
  • 044788dbf2 Remove django-settings-context-processor muhammad-ammar 2015-09-07 14:38:51 +05:00
  • 0adea67662 hide shopping cart menu Zia Fazal 2015-09-07 12:23:45 +05:00
  • 8e04f92167 Fixing spacing in tooltip Jolyon Bloomfield 2015-09-06 15:37:19 -04:00
  • 34eaecc3d4 Test student_grade_summary_data method Brandon DeRosier 2015-09-04 15:42:16 -04:00
  • 8c1bf2cd3a Add events for tracking when teams are edited. Diana Huang 2015-09-03 16:07:12 -04:00
  • 1ba4200a84 Merge pull request #9624 from edx/peter-fogg/forum-teams-events Peter Fogg 2015-09-04 13:58:43 -04:00
  • 807299a8a3 CRI-40 Don't assume user in request context when grading Brandon DeRosier 2015-09-04 13:55:50 -04:00
  • d7e1ec1922 Merge pull request #9613 from edx/peter-fogg/team-search-events Peter Fogg 2015-09-04 13:22:39 -04:00
  • 607bd538e6 Update discussion events to include team_id when appropriate. Peter Fogg 2015-09-04 09:39:09 -04:00
  • 0dbcd397e9 Merge pull request #9571 from mirjamsk/mirjamsk/TNL-3183 Sarina Canelake 2015-09-04 13:01:07 -04:00
  • 7179fac6a2 Merge pull request #9575 from edx/tasawer/story/xcom-285-removing-deprecated-view tasawernawaz 2015-09-04 21:50:07 +05:00
  • 86cce5f0ef Add teams eventing for search. Peter Fogg 2015-09-03 16:22:27 -04:00
  • c21976086c Merge pull request #9626 from edx/peter-fogg/disable-flaky-video-test Peter Fogg 2015-09-04 11:51:32 -04:00
  • deacfebd7e Merge pull request #9607 from edx/diana/teams-event-tracking Diana Huang 2015-09-04 11:32:25 -04:00
  • d567e5e3c8 Merge pull request #9591 from edx/ned/pylint-for-inherited-tests Ned Batchelder 2015-09-04 11:18:33 -04:00
  • 88e380a383 Merge pull request #9628 from edx/sarina/20150904-update-translations Sarina Canelake 2015-09-04 10:57:53 -04:00
  • 03f555210b Update translations (autogenerated message) Sarina Canelake 2015-09-04 10:56:27 -04:00
  • a743f4a642 Add teams eventing and tests. Diana Huang 2015-09-03 11:30:24 -04:00
  • 7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso Calen Pennington 2015-09-04 10:40:55 -04:00
  • 9cc1859eed Merge pull request #9596 from edx/ziafazal/MAYN-118 Matt Drayer 2015-09-04 10:37:35 -04:00
  • ff0bacdea3 Merge pull request #9594 from edx/cdodge/edx-proctoring-0.8.0 chrisndodge 2015-09-04 10:37:24 -04:00
  • 57a0356b69 Merge pull request #9608 from edx/jibsheet/lti-provider-admin-ui Kevin Falcone 2015-09-04 10:31:58 -04:00
  • 43da9f060e Merge pull request #9550 from edx/asadiqbal08/SOL-1157 Matt Drayer 2015-09-04 10:27:00 -04:00
  • 70d3868b81 Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members Peter Pinch 2015-09-04 10:00:28 -04:00
  • ae006cffc4 Skip extra-flaky video test. Peter Fogg 2015-09-04 09:53:47 -04:00
  • b69c16293f Merge pull request #8692 from edx/derf/pymongo_2.8 Fred Smith 2015-09-04 09:47:15 -04:00
  • d5389736f4 pushed the unit ribbon in lms courseware to back which brought the user drop down to front TNL-3094 Afeef Janjua 2015-09-04 18:44:20 +05:00
  • 05e33677f7 Merge pull request #9615 from edx/release-2015-09-02-merge-to-master Calen Pennington 2015-09-04 09:43:38 -04:00
  • 4427e0e2ec PHX-120 Muhammad Shoaib 2015-08-25 18:53:06 +05:00
  • 3c7b0b6168 remove django-robots muhammad-ammar 2015-09-04 15:36:11 +05:00
  • ede8974419 Merge pull request #9478 from edx/mjevtic/SOL-1105 Marko Jevtić 2015-09-04 15:13:58 +02:00
  • 2df7585128 Merge pull request #9580 from edx/ammar/update-django-nose Muhammad Ammar 2015-09-04 17:55:50 +05:00
  • dbfa6dafed Resolve conflicts in merge to master Calen Pennington 2015-09-03 16:59:12 -04:00
  • d3474f2830 Update requirements of edx-proctoring to 0.8.x Chris Dodge 2015-09-02 21:19:10 -04:00
  • c035d6eece update django-debug-toolbar muhammad-ammar 2015-09-04 16:39:40 +05:00
  • 080a44b663 (SOL-1105) Requirement for enabling search in devstack Marko Jevtic 2015-08-26 13:59:33 +00:00
  • 322693c858 Upgrading django-simple-history to 1.6.3 muzaffaryousaf 2015-09-04 12:03:49 +05:00
  • 6e0ef385a2 load header extra file if request comes from micro site Zia Fazal 2015-09-03 16:40:48 +05:00
  • 9a83e99938 Avoid losing error messages when inside a frame William Ono 2015-08-13 16:43:08 -07:00
  • 4d1194800e Support LTI third-party-auth providers William Ono 2015-05-28 14:16:37 -07:00
  • 97a11c1178 Merge pull request #9612 from edx/peter-fogg/mark-video-control-test-flaky Ben Patterson 2015-09-03 18:59:49 -04:00
  • f47a53eb66 Update edx-lint to 0.2.6 Ned Batchelder 2015-09-02 17:03:07 -04:00
  • dff9f745e4 Reference appropriate JIRA ticket as a TODO. Ben Patterson 2015-09-03 17:19:53 -04:00
  • 821cc59415 Merge master into release-2015-09-02, leaving conflicts Calen Pennington 2015-09-03 16:36:56 -04:00
  • 7b492f1d92 Merge pull request #9521 from edx/rc/2015-09-02 Calen Pennington 2015-09-03 16:28:02 -04:00
  • bf99963491 Merge pull request #9604 from edx/asadiqbal08/SOL-1128-enhancement Matt Drayer 2015-09-03 16:20:26 -04:00
  • 57085c011c Merge pull request #9582 from edx/ormsbee/lti_passback_delay_config David Ormsbee 2015-09-03 16:17:43 -04:00
  • 447e0cf838 Mark test_video_control_events as flaky. Peter Fogg 2015-09-03 16:12:38 -04:00
  • 406d5a9186 Add details to the admin listing of LTI Consumers Kevin Falcone 2015-09-03 14:38:20 -04:00
  • 725e186677 SOL-1128 further enhancement asadiqbal 2015-09-03 21:48:46 +05:00
  • 9ff0a16251 Merge pull request #9603 from edx/clrux/rc-2015-09-02-patch Calen Pennington 2015-09-03 14:11:06 -04:00
  • ec49576eb4 Merge pull request #9387 from cpennington/csm-count-requested-blocks Calen Pennington 2015-09-03 13:37:30 -04:00
  • fb19d32815 Don't package or optimize assets on devstack Andy Armstrong 2015-07-24 13:48:25 -04:00
  • 2c7c4ba8b5 Merge pull request #9601 from open-craft/smarnach/update-xblock-hash Sven Marnach 2015-09-03 19:23:57 +02:00
  • 210edb0122 Merge pull request #9546 from edx/dan-f/add-profile-images-to-team-card Daniel Friedman 2015-09-03 13:15:28 -04:00
  • 24c6a885f6 Merge pull request #9585 from edx/raees-fix-chrome-test-user-management raeeschachar 2015-09-03 22:06:05 +05:00
  • 1c29763441 Overriding white color for messages on dashboard Chris Rodriguez 2015-09-03 11:57:29 -04:00
  • f1bf3d1736 Update the XBlock commit hash in the requirements to the latest version. Sven Marnach 2015-09-03 17:15:58 +02:00
  • dd78e27155 adjusting team card profile pic styles Frances Botsford 2015-09-01 14:45:13 -04:00
  • 0e180bd2c2 Add membership thumbnails to team cards. Daniel Friedman 2015-08-31 13:57:44 -04:00
  • 42181aeafd Merge pull request #9595 from edx/muhhshoaib/MAYN-122-Enrollment-Codes-popup-is-not-completely-visible Muhammad Shoaib 2015-09-03 18:56:32 +05:00
  • c812963808 Merge pull request #9584 from edx/mattdrayer/cert-webview-add-org-fields Matt Drayer 2015-09-03 09:50:46 -04:00
  • 3bbd021a73 MAYN-122 Muhammad Shoaib 2015-09-03 13:43:00 +05:00
  • 70573ca859 Fixed Chrome test_user_management under LibraryUsersPageTest raeeschachar 2015-09-02 18:53:58 +05:00
  • 3e4d4504ff SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view. and update the bokchoy test asadiqbal 2015-09-01 16:32:40 +05:00
  • 4e5dc9f342 Merge pull request #9533 from edx/ammar/update-mako Muhammad Ammar 2015-09-03 13:49:03 +05:00
  • baa0f45e8a Merge pull request #9406 from edx/waheed/tnl3056-fix-duration-not-displaying-for-youtube-player Waheed Ahmed 2015-09-03 13:12:51 +05:00
  • 01ca1f9be1 removing deprecated view VerifyLaterView XCOM-285 Tasawer 2015-09-02 14:46:48 +05:00
  • 8f12fdf6eb Fixed duration not display on youtube player. TNL-3056 Waheed Ahmed 2015-08-20 20:19:50 +05:00
  • 4377981486 Optimise getting list of courses from Enrollment API for global staff. Sven Marnach 2015-09-02 21:17:08 +02:00