Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
This commit is contained in:
commit
aea1b72f54
|
@ -124,6 +124,7 @@ Vagrantfile
|
||||||
# Tests - auto-generated files
|
# Tests - auto-generated files
|
||||||
/data-autotest
|
/data-autotest
|
||||||
/tests/coverage*
|
/tests/coverage*
|
||||||
|
/tests/css
|
||||||
/tests/karma-coverage
|
/tests/karma-coverage
|
||||||
/tests/autoconfig*
|
/tests/autoconfig*
|
||||||
/tests/autotest*
|
/tests/autotest*
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
<info>
|
<info>
|
||||||
<id>admin_audit</id>
|
<id>admin_audit</id>
|
||||||
<name>Auditing / Logging</name>
|
<name>Auditing / Logging</name>
|
||||||
<description>Provides logging abilities for Nextcloud such as logging file
|
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
|
||||||
accesses or otherwise sensitive actions.
|
|
||||||
</description>
|
|
||||||
<licence>AGPL</licence>
|
<licence>AGPL</licence>
|
||||||
<author>Nextcloud</author>
|
<author>Nextcloud</author>
|
||||||
<version>1.2.0</version>
|
<version>1.2.0</version>
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
"jquery-migrate": "~1.4.0",
|
"jquery-migrate": "~1.4.0",
|
||||||
"jquery-ui": "1.10.0",
|
"jquery-ui": "1.10.0",
|
||||||
"jsTimezoneDetect": "~1.0.5",
|
"jsTimezoneDetect": "~1.0.5",
|
||||||
|
"marked": "^0.3.6",
|
||||||
"moment": "^2.15.0",
|
"moment": "^2.15.0",
|
||||||
"select2": "~3.4.8",
|
"select2": "~3.4.8",
|
||||||
"zxcvbn": "*",
|
"zxcvbn": "*",
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
test/
|
test/
|
||||||
src/
|
src/
|
||||||
bower.json
|
bower.json
|
||||||
|
component.json
|
||||||
.jshintrc
|
.jshintrc
|
||||||
.travis.yml
|
.travis.yml
|
||||||
CHANGELOG*
|
CHANGELOG*
|
||||||
Gemfile
|
Gemfile
|
||||||
gruntfile.js
|
gruntfile.js
|
||||||
Gruntfile.js
|
Gruntfile.js
|
||||||
|
Gulpfile.js
|
||||||
Makefile
|
Makefile
|
||||||
package.json
|
package.json
|
||||||
README*
|
README*
|
||||||
|
@ -156,3 +158,17 @@ autosize/**
|
||||||
!autosize/dist/autosize.js
|
!autosize/dist/autosize.js
|
||||||
!autosize/.bower.json
|
!autosize/.bower.json
|
||||||
!autosize/LICENCE.md
|
!autosize/LICENCE.md
|
||||||
|
|
||||||
|
#marked
|
||||||
|
marked/bin
|
||||||
|
marked/doc
|
||||||
|
marked/index.js
|
||||||
|
marked/lib
|
||||||
|
marked/man
|
||||||
|
|
||||||
|
# DOMPurity
|
||||||
|
DOMPurify/**
|
||||||
|
!DOMPurify/dist
|
||||||
|
!DOMPurify/dist/purify.min.js
|
||||||
|
!DOMPurify/.bower.json
|
||||||
|
!DOMPurify/LICENSE
|
|
@ -0,0 +1,42 @@
|
||||||
|
{
|
||||||
|
"name": "DOMPurify",
|
||||||
|
"version": "0.8.4",
|
||||||
|
"homepage": "https://github.com/cure53/DOMPurify",
|
||||||
|
"author": "Cure53 <info@cure53.de>",
|
||||||
|
"description": "A DOM-only, super-fast, uber-tolerant XSS sanitizer for HTML, MathML and SVG",
|
||||||
|
"main": "src/purify.js",
|
||||||
|
"keywords": [
|
||||||
|
"dom",
|
||||||
|
"xss",
|
||||||
|
"cross site scripting",
|
||||||
|
"html",
|
||||||
|
"svg",
|
||||||
|
"mathml",
|
||||||
|
"sanitizer",
|
||||||
|
"filter",
|
||||||
|
"sanitize",
|
||||||
|
"security",
|
||||||
|
"secure"
|
||||||
|
],
|
||||||
|
"license": [
|
||||||
|
"MPL-2.0",
|
||||||
|
"Apache-2.0"
|
||||||
|
],
|
||||||
|
"ignore": [
|
||||||
|
"**/.*",
|
||||||
|
"demos",
|
||||||
|
"scripts",
|
||||||
|
"test",
|
||||||
|
"website"
|
||||||
|
],
|
||||||
|
"_release": "0.8.4",
|
||||||
|
"_resolution": {
|
||||||
|
"type": "version",
|
||||||
|
"tag": "0.8.4",
|
||||||
|
"commit": "9be8f9def3124ccf2db71b7711027b55f9b90f48"
|
||||||
|
},
|
||||||
|
"_source": "https://github.com/cure53/DOMPurify.git",
|
||||||
|
"_target": "^0.8.4",
|
||||||
|
"_originalSource": "DOMPurify",
|
||||||
|
"_direct": true
|
||||||
|
}
|
|
@ -0,0 +1,378 @@
|
||||||
|
DOMPurify
|
||||||
|
Copyright 2015 Mario Heiderich
|
||||||
|
|
||||||
|
DOMPurify is free software; you can redistribute it and/or modify it under the
|
||||||
|
terms of either:
|
||||||
|
|
||||||
|
a) the Apache License Version 2.0, or
|
||||||
|
b) the Mozilla Public License Version 2.0
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------------
|
||||||
|
Mozilla Public License, version 2.0
|
||||||
|
|
||||||
|
1. Definitions
|
||||||
|
|
||||||
|
1.1. “Contributor”
|
||||||
|
|
||||||
|
means each individual or legal entity that creates, contributes to the
|
||||||
|
creation of, or owns Covered Software.
|
||||||
|
|
||||||
|
1.2. “Contributor Version”
|
||||||
|
|
||||||
|
means the combination of the Contributions of others (if any) used by a
|
||||||
|
Contributor and that particular Contributor’s Contribution.
|
||||||
|
|
||||||
|
1.3. “Contribution”
|
||||||
|
|
||||||
|
means Covered Software of a particular Contributor.
|
||||||
|
|
||||||
|
1.4. “Covered Software”
|
||||||
|
|
||||||
|
means Source Code Form to which the initial Contributor has attached the
|
||||||
|
notice in Exhibit A, the Executable Form of such Source Code Form, and
|
||||||
|
Modifications of such Source Code Form, in each case including portions
|
||||||
|
thereof.
|
||||||
|
|
||||||
|
1.5. “Incompatible With Secondary Licenses”
|
||||||
|
means
|
||||||
|
|
||||||
|
a. that the initial Contributor has attached the notice described in
|
||||||
|
Exhibit B to the Covered Software; or
|
||||||
|
|
||||||
|
b. that the Covered Software was made available under the terms of version
|
||||||
|
1.1 or earlier of the License, but not also under the terms of a
|
||||||
|
Secondary License.
|
||||||
|
|
||||||
|
1.6. “Executable Form”
|
||||||
|
|
||||||
|
means any form of the work other than Source Code Form.
|
||||||
|
|
||||||
|
1.7. “Larger Work”
|
||||||
|
|
||||||
|
means a work that combines Covered Software with other material, in a separate
|
||||||
|
file or files, that is not Covered Software.
|
||||||
|
|
||||||
|
1.8. “License”
|
||||||
|
|
||||||
|
means this document.
|
||||||
|
|
||||||
|
1.9. “Licensable”
|
||||||
|
|
||||||
|
means having the right to grant, to the maximum extent possible, whether at the
|
||||||
|
time of the initial grant or subsequently, any and all of the rights conveyed by
|
||||||
|
this License.
|
||||||
|
|
||||||
|
1.10. “Modifications”
|
||||||
|
|
||||||
|
means any of the following:
|
||||||
|
|
||||||
|
a. any file in Source Code Form that results from an addition to, deletion
|
||||||
|
from, or modification of the contents of Covered Software; or
|
||||||
|
|
||||||
|
b. any new file in Source Code Form that contains any Covered Software.
|
||||||
|
|
||||||
|
1.11. “Patent Claims” of a Contributor
|
||||||
|
|
||||||
|
means any patent claim(s), including without limitation, method, process,
|
||||||
|
and apparatus claims, in any patent Licensable by such Contributor that
|
||||||
|
would be infringed, but for the grant of the License, by the making,
|
||||||
|
using, selling, offering for sale, having made, import, or transfer of
|
||||||
|
either its Contributions or its Contributor Version.
|
||||||
|
|
||||||
|
1.12. “Secondary License”
|
||||||
|
|
||||||
|
means either the GNU General Public License, Version 2.0, the GNU Lesser
|
||||||
|
General Public License, Version 2.1, the GNU Affero General Public
|
||||||
|
License, Version 3.0, or any later versions of those licenses.
|
||||||
|
|
||||||
|
1.13. “Source Code Form”
|
||||||
|
|
||||||
|
means the form of the work preferred for making modifications.
|
||||||
|
|
||||||
|
1.14. “You” (or “Your”)
|
||||||
|
|
||||||
|
means an individual or a legal entity exercising rights under this
|
||||||
|
License. For legal entities, “You” includes any entity that controls, is
|
||||||
|
controlled by, or is under common control with You. For purposes of this
|
||||||
|
definition, “control” means (a) the power, direct or indirect, to cause
|
||||||
|
the direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (b) ownership of more than fifty percent (50%) of the
|
||||||
|
outstanding shares or beneficial ownership of such entity.
|
||||||
|
|
||||||
|
|
||||||
|
2. License Grants and Conditions
|
||||||
|
|
||||||
|
2.1. Grants
|
||||||
|
|
||||||
|
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||||
|
non-exclusive license:
|
||||||
|
|
||||||
|
a. under intellectual property rights (other than patent or trademark)
|
||||||
|
Licensable by such Contributor to use, reproduce, make available,
|
||||||
|
modify, display, perform, distribute, and otherwise exploit its
|
||||||
|
Contributions, either on an unmodified basis, with Modifications, or as
|
||||||
|
part of a Larger Work; and
|
||||||
|
|
||||||
|
b. under Patent Claims of such Contributor to make, use, sell, offer for
|
||||||
|
sale, have made, import, and otherwise transfer either its Contributions
|
||||||
|
or its Contributor Version.
|
||||||
|
|
||||||
|
2.2. Effective Date
|
||||||
|
|
||||||
|
The licenses granted in Section 2.1 with respect to any Contribution become
|
||||||
|
effective for each Contribution on the date the Contributor first distributes
|
||||||
|
such Contribution.
|
||||||
|
|
||||||
|
2.3. Limitations on Grant Scope
|
||||||
|
|
||||||
|
The licenses granted in this Section 2 are the only rights granted under this
|
||||||
|
License. No additional rights or licenses will be implied from the distribution
|
||||||
|
or licensing of Covered Software under this License. Notwithstanding Section
|
||||||
|
2.1(b) above, no patent license is granted by a Contributor:
|
||||||
|
|
||||||
|
a. for any code that a Contributor has removed from Covered Software; or
|
||||||
|
|
||||||
|
b. for infringements caused by: (i) Your and any other third party’s
|
||||||
|
modifications of Covered Software, or (ii) the combination of its
|
||||||
|
Contributions with other software (except as part of its Contributor
|
||||||
|
Version); or
|
||||||
|
|
||||||
|
c. under Patent Claims infringed by Covered Software in the absence of its
|
||||||
|
Contributions.
|
||||||
|
|
||||||
|
This License does not grant any rights in the trademarks, service marks, or
|
||||||
|
logos of any Contributor (except as may be necessary to comply with the
|
||||||
|
notice requirements in Section 3.4).
|
||||||
|
|
||||||
|
2.4. Subsequent Licenses
|
||||||
|
|
||||||
|
No Contributor makes additional grants as a result of Your choice to
|
||||||
|
distribute the Covered Software under a subsequent version of this License
|
||||||
|
(see Section 10.2) or under the terms of a Secondary License (if permitted
|
||||||
|
under the terms of Section 3.3).
|
||||||
|
|
||||||
|
2.5. Representation
|
||||||
|
|
||||||
|
Each Contributor represents that the Contributor believes its Contributions
|
||||||
|
are its original creation(s) or it has sufficient rights to grant the
|
||||||
|
rights to its Contributions conveyed by this License.
|
||||||
|
|
||||||
|
2.6. Fair Use
|
||||||
|
|
||||||
|
This License is not intended to limit any rights You have under applicable
|
||||||
|
copyright doctrines of fair use, fair dealing, or other equivalents.
|
||||||
|
|
||||||
|
2.7. Conditions
|
||||||
|
|
||||||
|
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
|
||||||
|
Section 2.1.
|
||||||
|
|
||||||
|
|
||||||
|
3. Responsibilities
|
||||||
|
|
||||||
|
3.1. Distribution of Source Form
|
||||||
|
|
||||||
|
All distribution of Covered Software in Source Code Form, including any
|
||||||
|
Modifications that You create or to which You contribute, must be under the
|
||||||
|
terms of this License. You must inform recipients that the Source Code Form
|
||||||
|
of the Covered Software is governed by the terms of this License, and how
|
||||||
|
they can obtain a copy of this License. You may not attempt to alter or
|
||||||
|
restrict the recipients’ rights in the Source Code Form.
|
||||||
|
|
||||||
|
3.2. Distribution of Executable Form
|
||||||
|
|
||||||
|
If You distribute Covered Software in Executable Form then:
|
||||||
|
|
||||||
|
a. such Covered Software must also be made available in Source Code Form,
|
||||||
|
as described in Section 3.1, and You must inform recipients of the
|
||||||
|
Executable Form how they can obtain a copy of such Source Code Form by
|
||||||
|
reasonable means in a timely manner, at a charge no more than the cost
|
||||||
|
of distribution to the recipient; and
|
||||||
|
|
||||||
|
b. You may distribute such Executable Form under the terms of this License,
|
||||||
|
or sublicense it under different terms, provided that the license for
|
||||||
|
the Executable Form does not attempt to limit or alter the recipients’
|
||||||
|
rights in the Source Code Form under this License.
|
||||||
|
|
||||||
|
3.3. Distribution of a Larger Work
|
||||||
|
|
||||||
|
You may create and distribute a Larger Work under terms of Your choice,
|
||||||
|
provided that You also comply with the requirements of this License for the
|
||||||
|
Covered Software. If the Larger Work is a combination of Covered Software
|
||||||
|
with a work governed by one or more Secondary Licenses, and the Covered
|
||||||
|
Software is not Incompatible With Secondary Licenses, this License permits
|
||||||
|
You to additionally distribute such Covered Software under the terms of
|
||||||
|
such Secondary License(s), so that the recipient of the Larger Work may, at
|
||||||
|
their option, further distribute the Covered Software under the terms of
|
||||||
|
either this License or such Secondary License(s).
|
||||||
|
|
||||||
|
3.4. Notices
|
||||||
|
|
||||||
|
You may not remove or alter the substance of any license notices (including
|
||||||
|
copyright notices, patent notices, disclaimers of warranty, or limitations
|
||||||
|
of liability) contained within the Source Code Form of the Covered
|
||||||
|
Software, except that You may alter any license notices to the extent
|
||||||
|
required to remedy known factual inaccuracies.
|
||||||
|
|
||||||
|
3.5. Application of Additional Terms
|
||||||
|
|
||||||
|
You may choose to offer, and to charge a fee for, warranty, support,
|
||||||
|
indemnity or liability obligations to one or more recipients of Covered
|
||||||
|
Software. However, You may do so only on Your own behalf, and not on behalf
|
||||||
|
of any Contributor. You must make it absolutely clear that any such
|
||||||
|
warranty, support, indemnity, or liability obligation is offered by You
|
||||||
|
alone, and You hereby agree to indemnify every Contributor for any
|
||||||
|
liability incurred by such Contributor as a result of warranty, support,
|
||||||
|
indemnity or liability terms You offer. You may include additional
|
||||||
|
disclaimers of warranty and limitations of liability specific to any
|
||||||
|
jurisdiction.
|
||||||
|
|
||||||
|
4. Inability to Comply Due to Statute or Regulation
|
||||||
|
|
||||||
|
If it is impossible for You to comply with any of the terms of this License
|
||||||
|
with respect to some or all of the Covered Software due to statute, judicial
|
||||||
|
order, or regulation then You must: (a) comply with the terms of this License
|
||||||
|
to the maximum extent possible; and (b) describe the limitations and the code
|
||||||
|
they affect. Such description must be placed in a text file included with all
|
||||||
|
distributions of the Covered Software under this License. Except to the
|
||||||
|
extent prohibited by statute or regulation, such description must be
|
||||||
|
sufficiently detailed for a recipient of ordinary skill to be able to
|
||||||
|
understand it.
|
||||||
|
|
||||||
|
5. Termination
|
||||||
|
|
||||||
|
5.1. The rights granted under this License will terminate automatically if You
|
||||||
|
fail to comply with any of its terms. However, if You become compliant,
|
||||||
|
then the rights granted under this License from a particular Contributor
|
||||||
|
are reinstated (a) provisionally, unless and until such Contributor
|
||||||
|
explicitly and finally terminates Your grants, and (b) on an ongoing basis,
|
||||||
|
if such Contributor fails to notify You of the non-compliance by some
|
||||||
|
reasonable means prior to 60 days after You have come back into compliance.
|
||||||
|
Moreover, Your grants from a particular Contributor are reinstated on an
|
||||||
|
ongoing basis if such Contributor notifies You of the non-compliance by
|
||||||
|
some reasonable means, this is the first time You have received notice of
|
||||||
|
non-compliance with this License from such Contributor, and You become
|
||||||
|
compliant prior to 30 days after Your receipt of the notice.
|
||||||
|
|
||||||
|
5.2. If You initiate litigation against any entity by asserting a patent
|
||||||
|
infringement claim (excluding declaratory judgment actions, counter-claims,
|
||||||
|
and cross-claims) alleging that a Contributor Version directly or
|
||||||
|
indirectly infringes any patent, then the rights granted to You by any and
|
||||||
|
all Contributors for the Covered Software under Section 2.1 of this License
|
||||||
|
shall terminate.
|
||||||
|
|
||||||
|
5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
|
||||||
|
license agreements (excluding distributors and resellers) which have been
|
||||||
|
validly granted by You or Your distributors under this License prior to
|
||||||
|
termination shall survive termination.
|
||||||
|
|
||||||
|
6. Disclaimer of Warranty
|
||||||
|
|
||||||
|
Covered Software is provided under this License on an “as is” basis, without
|
||||||
|
warranty of any kind, either expressed, implied, or statutory, including,
|
||||||
|
without limitation, warranties that the Covered Software is free of defects,
|
||||||
|
merchantable, fit for a particular purpose or non-infringing. The entire
|
||||||
|
risk as to the quality and performance of the Covered Software is with You.
|
||||||
|
Should any Covered Software prove defective in any respect, You (not any
|
||||||
|
Contributor) assume the cost of any necessary servicing, repair, or
|
||||||
|
correction. This disclaimer of warranty constitutes an essential part of this
|
||||||
|
License. No use of any Covered Software is authorized under this License
|
||||||
|
except under this disclaimer.
|
||||||
|
|
||||||
|
7. Limitation of Liability
|
||||||
|
|
||||||
|
Under no circumstances and under no legal theory, whether tort (including
|
||||||
|
negligence), contract, or otherwise, shall any Contributor, or anyone who
|
||||||
|
distributes Covered Software as permitted above, be liable to You for any
|
||||||
|
direct, indirect, special, incidental, or consequential damages of any
|
||||||
|
character including, without limitation, damages for lost profits, loss of
|
||||||
|
goodwill, work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses, even if such party shall have been
|
||||||
|
informed of the possibility of such damages. This limitation of liability
|
||||||
|
shall not apply to liability for death or personal injury resulting from such
|
||||||
|
party’s negligence to the extent applicable law prohibits such limitation.
|
||||||
|
Some jurisdictions do not allow the exclusion or limitation of incidental or
|
||||||
|
consequential damages, so this exclusion and limitation may not apply to You.
|
||||||
|
|
||||||
|
8. Litigation
|
||||||
|
|
||||||
|
Any litigation relating to this License may be brought only in the courts of
|
||||||
|
a jurisdiction where the defendant maintains its principal place of business
|
||||||
|
and such litigation shall be governed by laws of that jurisdiction, without
|
||||||
|
reference to its conflict-of-law provisions. Nothing in this Section shall
|
||||||
|
prevent a party’s ability to bring cross-claims or counter-claims.
|
||||||
|
|
||||||
|
9. Miscellaneous
|
||||||
|
|
||||||
|
This License represents the complete agreement concerning the subject matter
|
||||||
|
hereof. If any provision of this License is held to be unenforceable, such
|
||||||
|
provision shall be reformed only to the extent necessary to make it
|
||||||
|
enforceable. Any law or regulation which provides that the language of a
|
||||||
|
contract shall be construed against the drafter shall not be used to construe
|
||||||
|
this License against a Contributor.
|
||||||
|
|
||||||
|
|
||||||
|
10. Versions of the License
|
||||||
|
|
||||||
|
10.1. New Versions
|
||||||
|
|
||||||
|
Mozilla Foundation is the license steward. Except as provided in Section
|
||||||
|
10.3, no one other than the license steward has the right to modify or
|
||||||
|
publish new versions of this License. Each version will be given a
|
||||||
|
distinguishing version number.
|
||||||
|
|
||||||
|
10.2. Effect of New Versions
|
||||||
|
|
||||||
|
You may distribute the Covered Software under the terms of the version of
|
||||||
|
the License under which You originally received the Covered Software, or
|
||||||
|
under the terms of any subsequent version published by the license
|
||||||
|
steward.
|
||||||
|
|
||||||
|
10.3. Modified Versions
|
||||||
|
|
||||||
|
If you create software not governed by this License, and you want to
|
||||||
|
create a new license for such software, you may create and use a modified
|
||||||
|
version of this License if you rename the license and remove any
|
||||||
|
references to the name of the license steward (except to note that such
|
||||||
|
modified license differs from this License).
|
||||||
|
|
||||||
|
10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
|
||||||
|
If You choose to distribute Source Code Form that is Incompatible With
|
||||||
|
Secondary Licenses under the terms of this version of the License, the
|
||||||
|
notice described in Exhibit B of this License must be attached.
|
||||||
|
|
||||||
|
Exhibit A - Source Code Form License Notice
|
||||||
|
|
||||||
|
This Source Code Form is subject to the
|
||||||
|
terms of the Mozilla Public License, v.
|
||||||
|
2.0. If a copy of the MPL was not
|
||||||
|
distributed with this file, You can
|
||||||
|
obtain one at
|
||||||
|
http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
If it is not possible or desirable to put the notice in a particular file, then
|
||||||
|
You may include the notice in a location (such as a LICENSE file in a relevant
|
||||||
|
directory) where a recipient would be likely to look for such a notice.
|
||||||
|
|
||||||
|
You may add additional accurate notices of copyright ownership.
|
||||||
|
|
||||||
|
Exhibit B - “Incompatible With Secondary Licenses” Notice
|
||||||
|
|
||||||
|
This Source Code Form is “Incompatible
|
||||||
|
With Secondary Licenses”, as defined by
|
||||||
|
the Mozilla Public License, v. 2.0.
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,33 @@
|
||||||
|
{
|
||||||
|
"name": "marked",
|
||||||
|
"version": "0.3.6",
|
||||||
|
"homepage": "https://github.com/chjj/marked",
|
||||||
|
"authors": [
|
||||||
|
"Christopher Jeffrey <chjjeffrey@gmail.com>"
|
||||||
|
],
|
||||||
|
"description": "A markdown parser built for speed",
|
||||||
|
"keywords": [
|
||||||
|
"markdown",
|
||||||
|
"markup",
|
||||||
|
"html"
|
||||||
|
],
|
||||||
|
"main": "lib/marked.js",
|
||||||
|
"license": "MIT",
|
||||||
|
"ignore": [
|
||||||
|
"**/.*",
|
||||||
|
"node_modules",
|
||||||
|
"bower_components",
|
||||||
|
"app/bower_components",
|
||||||
|
"test",
|
||||||
|
"tests"
|
||||||
|
],
|
||||||
|
"_release": "0.3.6",
|
||||||
|
"_resolution": {
|
||||||
|
"type": "version",
|
||||||
|
"tag": "v0.3.6",
|
||||||
|
"commit": "eddec20467c2d10c7769061ee9074e268500966f"
|
||||||
|
},
|
||||||
|
"_source": "https://github.com/chjj/marked.git",
|
||||||
|
"_target": "0.3.6",
|
||||||
|
"_originalSource": "marked"
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
File diff suppressed because one or more lines are too long
|
@ -1304,43 +1304,21 @@ class OC_App {
|
||||||
$data['summary'] = self::findBestL10NOption($data['summary'], $lang);
|
$data['summary'] = self::findBestL10NOption($data['summary'], $lang);
|
||||||
}
|
}
|
||||||
if ($lang && isset($data['description']) && is_array($data['description'])) {
|
if ($lang && isset($data['description']) && is_array($data['description'])) {
|
||||||
$data['description'] = self::findBestL10NOption($data['description'], $lang);
|
$data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
|
||||||
}
|
} else if (isset($data['description']) && is_string($data['description'])) {
|
||||||
|
$data['description'] = trim($data['description']);
|
||||||
// just modify the description if it is available
|
|
||||||
// otherwise this will create a $data element with an empty 'description'
|
|
||||||
if (isset($data['description'])) {
|
|
||||||
if (is_string($data['description'])) {
|
|
||||||
// sometimes the description contains line breaks and they are then also
|
|
||||||
// shown in this way in the app management which isn't wanted as HTML
|
|
||||||
// manages line breaks itself
|
|
||||||
|
|
||||||
// first of all we split on empty lines
|
|
||||||
$paragraphs = preg_split("!\n[[:space:]]*\n!mu", $data['description']);
|
|
||||||
|
|
||||||
$result = [];
|
|
||||||
foreach ($paragraphs as $value) {
|
|
||||||
// replace multiple whitespace (tabs, space, newlines) inside a paragraph
|
|
||||||
// with a single space - also trims whitespace
|
|
||||||
$result[] = trim(preg_replace('![[:space:]]+!mu', ' ', $value));
|
|
||||||
}
|
|
||||||
|
|
||||||
// join the single paragraphs with a empty line in between
|
|
||||||
$data['description'] = implode("\n\n", $result);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$data['description'] = '';
|
$data['description'] = '';
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $config
|
* @param \OCP\IConfig $config
|
||||||
* @param $l
|
* @param \OCP\IL10N $l
|
||||||
* @param $info
|
* @param array $info
|
||||||
* @throws Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
protected static function checkAppDependencies($config, $l, $info) {
|
protected static function checkAppDependencies($config, $l, $info) {
|
||||||
$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
|
$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
|
||||||
|
|
|
@ -551,6 +551,26 @@ span.version {
|
||||||
flex-basis: 90%;
|
flex-basis: 90%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#apps-list .app-description p {
|
||||||
|
margin: 10px 0;
|
||||||
|
}
|
||||||
|
#apps-list .app-description ul {
|
||||||
|
list-style: disc;
|
||||||
|
}
|
||||||
|
#apps-list .app-description ol {
|
||||||
|
list-style: decimal;
|
||||||
|
}
|
||||||
|
#apps-list .app-description > ul,
|
||||||
|
#apps-list .app-description > ol {
|
||||||
|
margin-left: 19px;
|
||||||
|
}
|
||||||
|
#apps-list .app-description ol ol,
|
||||||
|
#apps-list .app-description ol ul,
|
||||||
|
#apps-list .app-description ul ol,
|
||||||
|
#apps-list .app-description ul ul {
|
||||||
|
padding-left: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (min-width: 1601px) {
|
@media (min-width: 1601px) {
|
||||||
#apps-list .section {
|
#apps-list .section {
|
||||||
width: 22%;
|
width: 22%;
|
||||||
|
@ -634,9 +654,6 @@ form.section {
|
||||||
.app-description {
|
.app-description {
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
.app-description pre {
|
|
||||||
white-space: pre-line;
|
|
||||||
}
|
|
||||||
|
|
||||||
#apps-list .groups-enable {
|
#apps-list .groups-enable {
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
|
|
|
@ -19,6 +19,8 @@ Handlebars.registerHelper('level', function() {
|
||||||
|
|
||||||
OC.Settings = OC.Settings || {};
|
OC.Settings = OC.Settings || {};
|
||||||
OC.Settings.Apps = OC.Settings.Apps || {
|
OC.Settings.Apps = OC.Settings.Apps || {
|
||||||
|
markedOptions: {},
|
||||||
|
|
||||||
setupGroupsSelect: function($elements) {
|
setupGroupsSelect: function($elements) {
|
||||||
OC.Settings.setupGroupsSelect($elements, {
|
OC.Settings.setupGroupsSelect($elements, {
|
||||||
placeholder: t('core', 'All')
|
placeholder: t('core', 'All')
|
||||||
|
@ -186,6 +188,25 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
||||||
app.author = app.author['@value'];
|
app.author = app.author['@value'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Parse markdown in app description
|
||||||
|
app.description = DOMPurify.sanitize(
|
||||||
|
marked(app.description.trim(), OC.Settings.Apps.markedOptions),
|
||||||
|
{
|
||||||
|
SAFE_FOR_JQUERY: true,
|
||||||
|
ALLOWED_TAGS: [
|
||||||
|
'strong',
|
||||||
|
'p',
|
||||||
|
'a',
|
||||||
|
'ul',
|
||||||
|
'ol',
|
||||||
|
'li',
|
||||||
|
'em',
|
||||||
|
'del',
|
||||||
|
'blockquote'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
var html = template(app);
|
var html = template(app);
|
||||||
if (selector) {
|
if (selector) {
|
||||||
selector.html(html);
|
selector.html(html);
|
||||||
|
@ -633,6 +654,50 @@ OC.Settings.Apps = OC.Settings.Apps || {
|
||||||
* Initializes the apps list
|
* Initializes the apps list
|
||||||
*/
|
*/
|
||||||
initialize: function($el) {
|
initialize: function($el) {
|
||||||
|
|
||||||
|
var renderer = new marked.Renderer();
|
||||||
|
renderer.link = function(href, title, text) {
|
||||||
|
try {
|
||||||
|
var prot = decodeURIComponent(unescape(href))
|
||||||
|
.replace(/[^\w:]/g, '')
|
||||||
|
.toLowerCase();
|
||||||
|
} catch (e) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (prot.indexOf('http:') !== 0 && prot.indexOf('https:') !== 0) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
var out = '<a href="' + href + '" rel="noreferrer noopener"';
|
||||||
|
if (title) {
|
||||||
|
out += ' title="' + title + '"';
|
||||||
|
}
|
||||||
|
out += '>' + text + '</a>';
|
||||||
|
return out;
|
||||||
|
};
|
||||||
|
renderer.image = function(href, title, text) {
|
||||||
|
if (text) {
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
return title;
|
||||||
|
};
|
||||||
|
renderer.blockquote = function(quote) {
|
||||||
|
return quote;
|
||||||
|
};
|
||||||
|
|
||||||
|
OC.Settings.Apps.markedOptions = {
|
||||||
|
renderer: renderer,
|
||||||
|
gfm: false,
|
||||||
|
highlight: false,
|
||||||
|
tables: false,
|
||||||
|
breaks: false,
|
||||||
|
pedantic: false,
|
||||||
|
sanitize: true,
|
||||||
|
smartLists: true,
|
||||||
|
smartypants: false
|
||||||
|
};
|
||||||
|
|
||||||
OC.Plugins.register('OCA.Search', OC.Settings.Apps.Search);
|
OC.Plugins.register('OCA.Search', OC.Settings.Apps.Search);
|
||||||
OC.Settings.Apps.loadCategories();
|
OC.Settings.Apps.loadCategories();
|
||||||
OC.Util.History.addOnPopStateHandler(_.bind(this._onPopState, this));
|
OC.Util.History.addOnPopStateHandler(_.bind(this._onPopState, this));
|
||||||
|
|
|
@ -3,7 +3,9 @@ style('settings', 'settings');
|
||||||
vendor_script(
|
vendor_script(
|
||||||
'core',
|
'core',
|
||||||
[
|
[
|
||||||
'handlebars/handlebars'
|
'handlebars/handlebars',
|
||||||
|
'marked/marked.min',
|
||||||
|
'DOMPurify/dist/purify.min',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
script(
|
script(
|
||||||
|
@ -59,7 +61,7 @@ script(
|
||||||
<div class="app-detailpage"></div>
|
<div class="app-detailpage"></div>
|
||||||
|
|
||||||
<div class="app-description-container hidden">
|
<div class="app-description-container hidden">
|
||||||
<div class="app-description"><pre>{{description}}</pre></div>
|
<div class="app-description">{{{description}}}</div>
|
||||||
<!--<div class="app-changed">{{changed}}</div>-->
|
<!--<div class="app-changed">{{changed}}</div>-->
|
||||||
{{#if documentation}}
|
{{#if documentation}}
|
||||||
<p class="documentation">
|
<p class="documentation">
|
||||||
|
|
|
@ -185,23 +185,27 @@ describe('OC.Settings.Apps tests', function() {
|
||||||
{
|
{
|
||||||
id: 'foo',
|
id: 'foo',
|
||||||
name: 'Foo app',
|
name: 'Foo app',
|
||||||
|
description: 'Hello',
|
||||||
level: 0,
|
level: 0,
|
||||||
author: 'foo'
|
author: 'foo'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'alpha',
|
id: 'alpha',
|
||||||
name: 'Alpha app',
|
name: 'Alpha app',
|
||||||
|
description: 'Hello',
|
||||||
level: 300,
|
level: 300,
|
||||||
author: ['alpha', 'beta']
|
author: ['alpha', 'beta']
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'nolevel',
|
id: 'nolevel',
|
||||||
name: 'No level',
|
name: 'No level',
|
||||||
|
description: 'Hello',
|
||||||
author: 'bar'
|
author: 'bar'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'zork',
|
id: 'zork',
|
||||||
name: 'Some famous adventure game',
|
name: 'Some famous adventure game',
|
||||||
|
description: 'Hello',
|
||||||
level: 200,
|
level: 200,
|
||||||
author: 'baz'
|
author: 'baz'
|
||||||
|
|
||||||
|
@ -209,6 +213,7 @@ describe('OC.Settings.Apps tests', function() {
|
||||||
{
|
{
|
||||||
id: 'delta',
|
id: 'delta',
|
||||||
name: 'Mathematical symbol',
|
name: 'Mathematical symbol',
|
||||||
|
description: 'Hello',
|
||||||
level: 200,
|
level: 200,
|
||||||
author: 'foobar'
|
author: 'foobar'
|
||||||
}
|
}
|
||||||
|
@ -223,29 +228,34 @@ describe('OC.Settings.Apps tests', function() {
|
||||||
'foo': {
|
'foo': {
|
||||||
id: 'foo',
|
id: 'foo',
|
||||||
name: 'Foo app',
|
name: 'Foo app',
|
||||||
|
description: 'Hello',
|
||||||
level: 0,
|
level: 0,
|
||||||
author: 'foo'
|
author: 'foo'
|
||||||
},
|
},
|
||||||
'alpha': {
|
'alpha': {
|
||||||
id: 'alpha',
|
id: 'alpha',
|
||||||
name: 'Alpha app',
|
name: 'Alpha app',
|
||||||
|
description: 'Hello',
|
||||||
level: 300,
|
level: 300,
|
||||||
author: ['alpha', 'beta']
|
author: ['alpha', 'beta']
|
||||||
},
|
},
|
||||||
'nolevel': {
|
'nolevel': {
|
||||||
id: 'nolevel',
|
id: 'nolevel',
|
||||||
name: 'No level',
|
name: 'No level',
|
||||||
|
description: 'Hello',
|
||||||
author: 'bar'
|
author: 'bar'
|
||||||
},
|
},
|
||||||
'zork': {
|
'zork': {
|
||||||
id: 'zork',
|
id: 'zork',
|
||||||
name: 'Some famous adventure game',
|
name: 'Some famous adventure game',
|
||||||
|
description: 'Hello',
|
||||||
level: 200,
|
level: 200,
|
||||||
author: 'baz',
|
author: 'baz',
|
||||||
},
|
},
|
||||||
'delta': {
|
'delta': {
|
||||||
id: 'delta',
|
id: 'delta',
|
||||||
name: 'Mathematical symbol',
|
name: 'Mathematical symbol',
|
||||||
|
description: 'Hello',
|
||||||
level: 200,
|
level: 200,
|
||||||
author: 'foobar'
|
author: 'foobar'
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,7 +110,9 @@ module.exports = function(config) {
|
||||||
name: 'settings',
|
name: 'settings',
|
||||||
srcFiles: [
|
srcFiles: [
|
||||||
'settings/js/apps.js',
|
'settings/js/apps.js',
|
||||||
'settings/js/users/deleteHandler.js'
|
'settings/js/users/deleteHandler.js',
|
||||||
|
'core/vendor/marked/marked.min.js',
|
||||||
|
'core/vendor/DOMPurify/dist/purify.min.js'
|
||||||
],
|
],
|
||||||
testFiles: [
|
testFiles: [
|
||||||
'settings/tests/js/appsSpec.js',
|
'settings/tests/js/appsSpec.js',
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Test;
|
namespace Test;
|
||||||
|
|
||||||
use OC\AppConfig;
|
use OC\AppConfig;
|
||||||
use OCP\IAppConfig;
|
use OCP\IAppConfig;
|
||||||
|
|
||||||
|
@ -24,7 +25,7 @@ class AppTest extends \Test\TestCase {
|
||||||
const TEST_GROUP1 = 'group1';
|
const TEST_GROUP1 = 'group1';
|
||||||
const TEST_GROUP2 = 'group2';
|
const TEST_GROUP2 = 'group2';
|
||||||
|
|
||||||
function appVersionsProvider() {
|
public function appVersionsProvider() {
|
||||||
return array(
|
return array(
|
||||||
// exact match
|
// exact match
|
||||||
array(
|
array(
|
||||||
|
@ -338,7 +339,7 @@ class AppTest extends \Test\TestCase {
|
||||||
/**
|
/**
|
||||||
* Providers for the app config values
|
* Providers for the app config values
|
||||||
*/
|
*/
|
||||||
function appConfigValuesProvider() {
|
public function appConfigValuesProvider() {
|
||||||
return array(
|
return array(
|
||||||
// logged in user1
|
// logged in user1
|
||||||
array(
|
array(
|
||||||
|
@ -561,27 +562,30 @@ class AppTest extends \Test\TestCase {
|
||||||
/**
|
/**
|
||||||
* Providers for the app data values
|
* Providers for the app data values
|
||||||
*/
|
*/
|
||||||
function appDataProvider() {
|
public function appDataProvider() {
|
||||||
return [
|
return [
|
||||||
[
|
[
|
||||||
['description' => " \t This is a multiline \n test with \n \t \n \n some new lines "],
|
['description' => " \t This is a multiline \n test with \n \t \n \n some new lines "],
|
||||||
['description' => "This is a multiline test with\n\nsome new lines"]
|
['description' => "This is a multiline \n test with \n \t \n \n some new lines"],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
['description' => " \t This is a multiline \n test with \n \t some new lines "],
|
['description' => " \t This is a multiline \n test with \n \t some new lines "],
|
||||||
['description' => "This is a multiline test with some new lines"]
|
['description' => "This is a multiline \n test with \n \t some new lines"],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
['description' => hex2bin('5065726d657420646520732761757468656e7469666965722064616e732070697769676f20646972656374656d656e74206176656320736573206964656e74696669616e7473206f776e636c6f75642073616e73206c65732072657461706572206574206d657420c3a0206a6f757273206365757820636920656e20636173206465206368616e67656d656e74206465206d6f742064652070617373652e0d0a0d')],
|
['description' => hex2bin('5065726d657420646520732761757468656e7469666965722064616e732070697769676f20646972656374656d656e74206176656320736573206964656e74696669616e7473206f776e636c6f75642073616e73206c65732072657461706572206574206d657420c3a0206a6f757273206365757820636920656e20636173206465206368616e67656d656e74206465206d6f742064652070617373652e0d0a0d')],
|
||||||
['description' => "Permet de s'authentifier dans piwigo directement avec ses identifiants owncloud sans les retaper et met à jours ceux ci en cas de changement de mot de passe."]
|
['description' => "Permet de s'authentifier dans piwigo directement avec ses identifiants owncloud sans les retaper et met à jours ceux ci en cas de changement de mot de passe."],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "],
|
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "],
|
||||||
['not-a-description' => " \t This is a multiline \n test with \n \t some new lines "]
|
[
|
||||||
|
'not-a-description' => " \t This is a multiline \n test with \n \t some new lines ",
|
||||||
|
'description' => '',
|
||||||
|
],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
['description' => [100, 'bla']],
|
['description' => [100, 'bla']],
|
||||||
['description' => ""]
|
['description' => ''],
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue