Skip to content

Commit aea1b72

Browse files
nickvergessennickvergessen
authored
Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
2 parents 012708e + 6ba7ba6 commit aea1b72

File tree

18 files changed

+625
-51
lines changed

18 files changed

+625
-51
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ Vagrantfile
124124
# Tests - auto-generated files
125125
/data-autotest
126126
/tests/coverage*
127+
/tests/css
127128
/tests/karma-coverage
128129
/tests/autoconfig*
129130
/tests/autotest*

‎apps/admin_audit/appinfo/info.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<info>
33
<id>admin_audit</id>
44
<name>Auditing / Logging</name>
5-
<description>Provides logging abilities for Nextcloud such as logging file
6-
accesses or otherwise sensitive actions.
7-
</description>
5+
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
86
<licence>AGPL</licence>
97
<author>Nextcloud</author>
108
<version>1.2.0</version>

‎apps/files_external/appinfo/info.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<id>files_external</id>
44
<name>External storage support</name>
55
<description>
6-
This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
7-
8-
External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
6+
This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
7+
8+
External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
99
</description>
1010
<licence>AGPL</licence>
1111
<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>

‎bower.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"jquery-migrate": "~1.4.0",
2121
"jquery-ui": "1.10.0",
2222
"jsTimezoneDetect": "~1.0.5",
23+
"marked": "^0.3.6",
2324
"moment": "^2.15.0",
2425
"select2": "~3.4.8",
2526
"zxcvbn": "*",

‎core/vendor/.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
test/
22
src/
33
bower.json
4+
component.json
45
.jshintrc
56
.travis.yml
67
CHANGELOG*
78
Gemfile
89
gruntfile.js
910
Gruntfile.js
11+
Gulpfile.js
1012
Makefile
1113
package.json
1214
README*
@@ -156,3 +158,17 @@ autosize/**
156158
!autosize/dist/autosize.js
157159
!autosize/.bower.json
158160
!autosize/LICENCE.md
161+
162+
#marked
163+
marked/bin
164+
marked/doc
165+
marked/index.js
166+
marked/lib
167+
marked/man
168+
169+
# DOMPurity
170+
DOMPurify/**
171+
!DOMPurify/dist
172+
!DOMPurify/dist/purify.min.js
173+
!DOMPurify/.bower.json
174+
!DOMPurify/LICENSE

‎core/vendor/DOMPurify/.bower.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"name": "DOMPurify",
3+
"version": "0.8.4",
4+
"homepage": "https://github.com/cure53/DOMPurify",
5+
"author": "Cure53 <[email protected]>",
6+
"description": "A DOM-only, super-fast, uber-tolerant XSS sanitizer for HTML, MathML and SVG",
7+
"main": "src/purify.js",
8+
"keywords": [
9+
"dom",
10+
"xss",
11+
"cross site scripting",
12+
"html",
13+
"svg",
14+
"mathml",
15+
"sanitizer",
16+
"filter",
17+
"sanitize",
18+
"security",
19+
"secure"
20+
],
21+
"license": [
22+
"MPL-2.0",
23+
"Apache-2.0"
24+
],
25+
"ignore": [
26+
"**/.*",
27+
"demos",
28+
"scripts",
29+
"test",
30+
"website"
31+
],
32+
"_release": "0.8.4",
33+
"_resolution": {
34+
"type": "version",
35+
"tag": "0.8.4",
36+
"commit": "9be8f9def3124ccf2db71b7711027b55f9b90f48"
37+
},
38+
"_source": "https://github.com/cure53/DOMPurify.git",
39+
"_target": "^0.8.4",
40+
"_originalSource": "DOMPurify",
41+
"_direct": true
42+
}

0 commit comments

Comments
 (0)