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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mushtaq Ali
dc8d020e30 Merge pull request #13875 from edx/revert-13242-ekafeel/TNL-5256-prettify-xml 
Revert "format xml before displaying"
 2016-11-03 14:34:03 +05:00
Mushtaq Ali
d337da7458 Remove pretty print from markdown xml - TNL-5768 
Revert commit bf9d467
 2016-11-03 12:15:48 +05:00
Mushtaq Ali
0e8dacc72a Revert "format xml before displaying" 2016-11-03 12:01:30 +05:00
Diana Huang
6c37e2826e Merge pull request #13897 from edx/diana/update-lti-hash 
Update xblock-lti-consumer version.
 2016-11-02 16:52:38 -04:00
Eric Fischer
00b117586a Merge pull request #13894 from edx/release 
Hotfix 2016-11-02 Release to master
 2016-11-02 16:27:32 -04:00
Diana Huang
1dde6bddbb Update xblock-lti-consumer version. 2016-11-02 15:56:26 -04:00
Andy Armstrong
2bf8254efd Merge pull request #11491 from edx/andya/use-pattern-library-fonts 
Use fonts from the Pattern Library
 2016-11-02 15:34:58 -04:00
Eric Fischer
b00e51268a Merge pull request #13891 from edx/release-candidate 
Update release with latest release-candidate
 2016-11-02 15:13:48 -04:00
Albert (AJ) St. Aubin
5afab424a6 Merge pull request #13858 from edx/aj/TNL-5582_flaky_updates_test 
Update to reduce flakiness of this test set removed flaky annotation
 2016-11-02 12:42:55 -04:00
Kevin Falcone
7c94992fa0 Merge pull request #13892 from edx/jibsheet/fix-problem-builder-version 
problem-builder's tags are vX.Y.Z not X.Y.Z
 2016-11-02 12:29:55 -04:00
Kevin Falcone
0016d1af4e problem-builder's tags are vX.Y.Z not X.Y.Z 2016-11-02 11:34:04 -04:00
Albert St. Aubin
f1101a7ba3 Update to reduce flakiness of this test set removed flaky annotation 
TNL-5582
 2016-11-02 11:19:24 -04:00
Stu Young
964588f57f Merge pull request #13869 from edx/estute/log-pip-freeze 
log pip freeze output for debugging jenkins builds
 2016-11-02 10:54:05 -04:00
Diana Huang
464ab1a154 Merge pull request #13641 from open-craft/jill/problem-builder-edx-release 
Updates problem-builder version to match master
 2016-11-02 09:35:29 -04:00
Nimisha Asthagiri
ceeb0e35f6 Merge pull request #13887 from edx/hotfix2/2016-11-01 
Add grades feature check to subsection task handler.
 2016-11-02 08:23:54 -04:00
Nimisha Asthagiri
8ae20e3812 Add grades feature check to subsection task handler. 2016-11-01 21:21:04 -04:00
Jillian Vogel
d6787cd13b Updates problem-builder version to use 2.6.0 
Ref: https://github.com/open-craft/problem-builder/pull/119
 2016-11-02 11:03:01 +10:30
Kevin Falcone
4fb8064722 Merge pull request #13882 from edx/jibsheet/upgrade-django-1.8.16 
Upgrade to django 1.8.16 for the security release
 2016-11-01 16:44:45 -04:00
Eric Fischer
f03e2ce685 Merge pull request #13884 from edx/hotfix/2016-11-01 
Hotfix for grades issues in 2016-11-01 release
 2016-11-01 16:07:35 -04:00
Eric Fischer
a54c4ea4f9 Revert "Unrevert "Fix Gating to use grades API, instead of its own calculations"" 
This reverts commit 7aacae9a4f.
 2016-11-01 15:02:04 -04:00
Christina Roberts
de5b989e06 Merge pull request #13862 from proversity-org/proversity/fix-closing-tag 
Fix bad closing tag in staff problem info template
 2016-11-01 14:39:19 -04:00
Andy Armstrong
369b9baad6 Use fonts from the Pattern Library 
* Updated the SASS to point to the Pattern Library
* Removed duplicate copies of fonts
 2016-11-01 14:35:36 -04:00
Eric Fischer
caeac6921a Fast-fail grades tasks if feature flag disabled 2016-11-01 13:34:10 -04:00
Carol Tong
689f614e71 Merge pull request #13576 from mehulsr/master 
DOC-2921 Fix certificates Studio page sidebar Help text
 2016-11-01 13:12:16 -04:00
Matthew Piatetsky
c089ea42b4 Merge pull request #13880 from edx/release 
Merge release into master
 2016-11-01 11:59:32 -04:00
Kevin Falcone
aae4bce3af Upgrade to django 1.8.16 for the security release 
https://www.djangoproject.com/weblog/2016/nov/01/security-releases/
 2016-11-01 11:29:03 -04:00
stu
48b2575ca5 log pip freeze output for debugging jenkins builds 2016-11-01 11:21:46 -04:00
Matthew Piatetsky
333c68665b Merge pull request #13865 from edx/release-candidate 
Release Candidate rc/2016-11-01
 2016-11-01 10:52:21 -04:00
Mehul Smriti Raje
86b5218fec [DOC - 2921] - Fix certificates Studio page sidebar Help text 
[DOC - 2921] Removed the emphasis on 'activate' and 'issuing'

[DOC-2921] Removed the format statement
 2016-11-01 16:18:07 +05:30
Andy Armstrong
9d1e77e028 Merge pull request #13840 from edx/andya/support-proctoring-only 
Allow authors to remove option for unproctored exams
 2016-10-31 18:01:52 -04:00
Andy Armstrong
afee725fb1 Allow authors to remove option for unproctored exams 
TNL-5084
 2016-10-31 16:58:15 -04:00
Matthew Piatetsky
5eece3a935 Merge pull request #13870 from edx/include_hidden_revert 
Revert "Merge pull request #13846 from edx/ECOM-5050"
 2016-10-31 14:22:49 -04:00
Jesse Zoldak
f8e7a5d4a2 Merge pull request #13872 from edx/revert-13814-benp/fix-bok-choy-mp 
Revert "Bug fix: collect test results when running in multiprocess mode."
 2016-10-31 11:40:55 -04:00
Jesse Zoldak
8e31eee734 Revert "Bug fix: collect test results when running in multiprocess mode." 2016-10-31 11:37:30 -04:00
Matthew Piatetsky
dc5f251938 Revert "Merge pull request #13846 from edx/ECOM-5050" 
This reverts commit c6b6d0bc74, reversing
changes made to fa2b1ae470.
 2016-10-31 10:04:20 -04:00
noraiz-anwar
902d7324a5 Merge pull request #13807 from edx/na/ECOM-6167 
Logging improved for case when exception is raised during submission to SoftwareSecure
 2016-10-31 16:58:35 +05:00
Jillian Vogel
ba9242b37c Merge pull request #12633 from tanmaykm/tanmaykm/video-upload 
MA-333 Added ability to refresh uploaded videos
 2016-10-31 18:18:05 +10:30
tan
1bc1c5453e MA-333 Added ability to refresh uploaded videos 
This adds ability to refresh the list of uploaded videos without refreshing the whole page.

Added a refresh button that when clicked:
- fetches a fresh list of uploaded files from the server
- updates `PreviousVideoUploadListView`
- removes the successfully completed uploads from `ActiveVideoUploadListView`
- retains the ongoing or failed uploads in `ActiveVideoUploadListView` so that they can be monitored/retried

The view can also be refreshed without user action, but I felt it may be less surprising to have a button instead.

MA-333 update: auto-refresh list, fix test failure

Changes:
1. Refresh of file list triggered by upload completion. Refresh button retained and label changed to "Refresh List".
2. Added `aria-live="polite"` to `.active-video-upload-list` and `.assets-table`.
3. Removed unused parameter `evt`.
4. Added self to the `AUTHORS` file.

MA-333 update: added tests

MA-333 update: removed refresh button

MA-333 update: address review comments of @mushtaqak

MA-333 update: simplify nested `_each`

MA-333 update: rename viewRefresh to isViewRefresh

MA-333 update: doc string for `clearSuccesful`

MA-333 update: fix accessibility

MA-333 update: update only successfully uploaded videos

MA-333 update: use window.SR feature to notify screen readers that video upload was successful (@pomegranited)
 2016-10-29 07:27:10 +05:30
Christina Roberts
c012bd6c31 Merge pull request #13848 from edx/christina/pdfjs 
Allow zooming, fix button link.
 2016-10-28 13:40:04 -04:00
Edward Fagin
e1eb23dfe4 Merge pull request #13774 from edx/efagin/auth-logging 
Add logging when header permissions in use.
 2016-10-28 11:08:18 -04:00
alisan617
cd62fc39bc Merge pull request #13861 from edx/alisan/instructor-email-history-modal-fix 
Instructor dashboard email history modal fix
 2016-10-28 11:06:53 -04:00
cahrens
c50c9fc92d Allow zooming, fix button link. 
TNL-5829
 2016-10-28 09:53:54 -04:00
Diana Huang
5bb4fd1b8b Merge pull request #13859 from edx/release 
Merge Release back into master
 2016-10-28 09:42:18 -04:00
Eugeny Kolpakov
1dc7567282 Merge pull request #13723 from edx/ekolpakov/enterprise_app 
Enterprise Customer: model and admin integration
 2016-10-28 12:51:22 +03:00
Ahsan Ulhaq
875f5424aa Merge pull request #13842 from edx/ahsan/ECOM-5365-Expose-user-email-to-api-admin 
Expose the user email to the api-admin view
 2016-10-28 14:27:05 +05:00
Ahsan Ulhaq
53e84390de Expose the user email to the api-admin view 
ECOM-5365
 2016-10-28 12:55:27 +05:00
Tasawer Nawaz
73559f39d6 Merge pull request #13849 from edx/tasawer/ecom-6213-revert-ecom-4763 
Revert "update error messages in enrollment API"
 2016-10-28 11:25:04 +05:00
Noraiz
067ca02196 Logging improved for case exception raised during submission to SoftwareSecure. 2016-10-28 06:22:27 +00:00
tasawernawaz
84314e7a14 Revert "update error messages in enrollment API" 
This reverts commit 21746f1e93.
 2016-10-28 10:12:17 +05:00
alisan617
2d2f41668c typo in prop 2016-10-27 22:04:50 -04:00