Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ js/
report
clover.xml
composer.lock
appinfo/info.xsd

# just sane ignores
.*.sw[po]
Expand Down
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ before_install:
- cd apps/$APP_NAME

script:
# Check info.xml schema validity
- wget https://apps.nextcloud.com/schema/apps/info.xsd
- xmllint appinfo/info.xml --schema info.xsd --noout
- rm info.xsd
# Check PHP syntax errors
- find . -name \*.php -exec php -l "{}" \;
# Check app validity
- php ../../occ app:check-code notes
# Run PHP unit tests (skipped due to errors)
Expand Down
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,12 @@ test-coverage:
npm run test:coverage

# Linting
lint: lint-php lint-js lint-css
lint: lint-php lint-js lint-css lint-nextcloud

lint-php:
# Check PHP syntax errors
@! find lib/ -name "*.php" | xargs -I{} php -l '{}' | grep -v "No syntax errors detected"
# PHP CodeSniffer
vendor/bin/phpcs --standard=phpcs.xml --runtime-set ignore_warnings_on_exit 1 appinfo/ lib/

lint-js:
Expand All @@ -102,6 +105,11 @@ lint-js:
lint-css:
npm run stylelint

lint-nextcloud:
# Check info.xml schema validity
wget https://apps.nextcloud.com/schema/apps/info.xsd -P appinfo/ -N --no-verbose || [ -f appinfo/info.xsd ]
xmllint appinfo/info.xml --schema appinfo/info.xsd --noout

# Fix lint
lint-fix: lint-php-fix lint-js-fix lint-css-fix

Expand Down
5 changes: 0 additions & 5 deletions src/components/EditorEasyMDE.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,6 @@ export default {
font-size: 90%;
}

.CodeMirror .cm-comment:only-child {
display: inline-block;
width: calc(100% - 1px);
}

/* Quotes */
.cm-s-easymde .cm-quote {
color: inherit;
Expand Down
8 changes: 8 additions & 0 deletions src/components/EditorMarkdownIt.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,13 @@ export default {
padding-left: 2ex;
color: var(--color-text-light)
}

& table th {
font-weight: bold;
}

& table td, & table th {
padding-right: 1.5em;
}
}
</style>