Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/788/toolbar #790

Open
wants to merge 62 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
2668d98
add toolbar
newhinton Dec 4, 2021
5f7aeec
properly initialize note
newhinton Dec 6, 2021
68408dd
extract threedot menu to component
newhinton Dec 6, 2021
e0a7c9b
properly format overflow menu
newhinton Dec 7, 2021
0fb3361
allow grouped menu items to be shown or hidden
newhinton Dec 7, 2021
8b3d844
use $emit to add new menuitem from mde
newhinton Dec 8, 2021
afde5a8
refactoring
newhinton Dec 8, 2021
0aec325
move placeholder below the toolbar if in editor mode
newhinton Dec 8, 2021
29cdb7b
allow $emit to set hidden-flag
newhinton Dec 8, 2021
9a5c83e
fix linter issues
newhinton Dec 8, 2021
0ea30a6
add 'markdown-it-task-checkbox' dependency to render checkboxes
newhinton Dec 5, 2021
fca8a68
update dependencies
korelstar Dec 5, 2021
2b9b602
[tx-robot] updated from transifex
nextcloud-bot Dec 6, 2021
d359957
[tx-robot] updated from transifex
nextcloud-bot Dec 8, 2021
2a12452
[tx-robot] updated from transifex
nextcloud-bot Jan 3, 2022
c3d7d14
[tx-robot] updated from transifex
nextcloud-bot Jan 4, 2022
0e16b2f
update dependencies
korelstar Jan 9, 2022
e0a62c1
release 4.3.0
korelstar Jan 9, 2022
fb378f5
[tx-robot] updated from transifex
nextcloud-bot Jan 10, 2022
e15589e
update dependencies
korelstar Jan 15, 2022
f8a7d98
[tx-robot] updated from transifex
nextcloud-bot Jan 30, 2022
c8d8e6c
Add Imageproxy to resolve relative Imagepaths
newhinton Jan 30, 2022
313b315
l10n: Change to lowercase
Valdnet Jan 31, 2022
8ebc964
[tx-robot] updated from transifex
nextcloud-bot Feb 1, 2022
27cf1ff
[tx-robot] updated from transifex
nextcloud-bot Feb 2, 2022
1f81e51
[tx-robot] updated from transifex
nextcloud-bot Feb 4, 2022
088b533
[tx-robot] updated from transifex
nextcloud-bot Feb 5, 2022
4986837
[tx-robot] updated from transifex
nextcloud-bot Feb 7, 2022
00e43b9
add support for PHP 8.1
korelstar Jan 30, 2022
f8f7a71
Install latest dev Nextcloud PHP API (max only)
korelstar Feb 7, 2022
a154ff5
update dependencies
korelstar Feb 7, 2022
b262d20
[tx-robot] updated from transifex
nextcloud-bot Feb 10, 2022
a8dc21d
Bump follow-redirects from 1.14.7 to 1.14.8
dependabot[bot] Feb 12, 2022
603f1d0
Allow custom file extensions
vincowl Feb 12, 2022
8b2668a
break long words in preview mode
korelstar Feb 12, 2022
4d73a03
allow empty settings (required for root directory)
korelstar Feb 12, 2022
d0977eb
don't ignore newlines in preview mode
korelstar Feb 12, 2022
b4c5108
[tx-robot] updated from transifex
nextcloud-bot Feb 13, 2022
1ba65b3
[tx-robot] updated from transifex
nextcloud-bot Feb 14, 2022
71aad54
l10n: Change to a capital letter
Valdnet Feb 14, 2022
38f98e3
[tx-robot] updated from transifex
nextcloud-bot Feb 15, 2022
cfa80e0
[tx-robot] updated from transifex
nextcloud-bot Feb 16, 2022
4573160
[tx-robot] updated from transifex
nextcloud-bot Feb 17, 2022
b3e87be
Log issue with uploading in console
newhinton Feb 19, 2022
3f4552a
fix sidemenu not showing up
newhinton Feb 19, 2022
b7c75ff
fix some lint issues
newhinton Feb 19, 2022
b3fea5f
fix undo/redo
newhinton Feb 19, 2022
d8d41be
add icons from notesapp
newhinton Feb 24, 2022
efa122e
properly add formatting to selection from toolbar
newhinton Mar 30, 2022
e144a0c
remove sidemenu
newhinton Mar 30, 2022
38e4a00
use Actions
newhinton Mar 30, 2022
9b39125
dont check historySize on undo/redo
newhinton Mar 30, 2022
f05479c
do check but remove special case
newhinton Mar 30, 2022
82b1383
fix bold icon
newhinton Mar 30, 2022
f55049d
update translations
newhinton Apr 25, 2022
d21b965
implement "inverted" insert
newhinton Apr 25, 2022
e8260e8
use normal buttons as long as no action group is available
newhinton May 12, 2022
9866e81
handle enter similarly to the nextcloud notes android application
newhinton May 12, 2022
36764f4
center checkbox and add slight chamfer to said box
newhinton May 12, 2022
6a077b8
move cursor to center of inserted text if front&back are defined and …
newhinton May 28, 2022
2284751
fix toolbar to top so that it is always visible
newhinton May 28, 2022
f3b4eea
add bigger margin for content and add divider for toolbar
newhinton May 28, 2022
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
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ module.exports = {
rules: {
// no ending html tag on a new line (was warn in "vue/strongly-recommended")
'vue/html-closing-bracket-newline': ['error', { multiline: 'always' }],
// do not require JSDoc comments
'jsdoc/require-jsdoc': 'off',
},
}
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
php-version: ${{ env.PHP_VERSION }}
extensions: pdo_mysql, zip, gd
tools: ${{ env.PHPUNIT }}
- name: Install latest dev Nextcloud PHP API (max only)
if: matrix.version == 'max'
run: composer require --prefer-dist --dev christophwurst/nextcloud:dev-master
- name: Install Dependencies
run: composer install --prefer-dist
- name: Prepare MySQL database
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ Types of changes:
- *Security* in case of vulnerabilities.


## 4.3.0 - 2022-01-09

- checkbox support in preview mode (#787 by @newhinton)
- maintenance (#789, #800)


## 4.2.0 - 2021-11-13

- add setting for view mode (#747)
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description><![CDATA[
The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.
]]></description>
<version>4.2.0</version>
<version>4.3.0</version>
<licence>agpl</licence>
<author>Kristof Hamann</author>
<author>Bernhard Posselt</author>
Expand All @@ -22,7 +22,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
<repository type="git">https://github.com/nextcloud/notes.git</repository>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes-thumbnail.jpg">https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png</screenshot>
<dependencies>
<php min-version="7.3" max-version="8.0" />
<php min-version="7.3" max-version="8.1" />
<nextcloud min-version="20" max-version="24" />
</dependencies>
<repair-steps>
Expand Down
14 changes: 14 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,20 @@
'requirements' => ['id' => '\d+'],
],

////////// A T T A C H M E N T S //////////

[
'name' => 'notes#getAttachment',
'url' => '/notes/{noteid}/attachment',
'verb' => 'GET',
'requirements' => ['noteid' => '\d+'],
],
[
'name' => 'notes#uploadFile',
'url' => '/notes/{noteid}/attachment',
'verb' => 'POST',
'requirements' => ['noteid' => '\d+'],
],

////////// S E T T I N G S //////////
['name' => 'settings#set', 'url' => '/settings', 'verb' => 'PUT'],
Expand Down
24 changes: 24 additions & 0 deletions css/icons.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.icon-undo {@include icon-color('undo', 'notes', $color-black);}
.icon-redo {@include icon-color('redo', 'notes', $color-black);}

.icon-bold {@include icon-color('bold', 'notes', $color-black);}
.icon-strike {@include icon-color('strike', 'notes', $color-black);}
.icon-underline {@include icon-color('underline', 'notes', $color-black);}
.icon-italic {@include icon-color('italic', 'notes', $color-black);}

.icon-h1 {@include icon-color('h1', 'notes', $color-black);}
.icon-image {@include icon-color('image', 'notes', $color-black);}
.icon-link {@include icon-color('link', 'notes', $color-black);}

.icon-ul {@include icon-color('ul', 'notes', $color-black);}
.icon-checklist {@include icon-color('checklist', 'notes', $color-black);}
.icon-code {@include icon-color('code', 'notes', $color-black);}
.icon-emoji {@include icon-color('emoji', 'notes', $color-black);}








4 changes: 2 additions & 2 deletions css/notes.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'app-navigation.scss';
@import 'print.scss';
@import 'app-navigation';
@import 'print';

// workaround for https://github.com/nextcloud/nextcloud-vue/issues/1384
body {
Expand Down
1 change: 1 addition & 0 deletions img/bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/checklist.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/code.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/emoji.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/h1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/image.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/italic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/redo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/strike.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/ul.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/underline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/undo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion l10n/af.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ OC.L10N.register(
"New note" : "Nuwe nota",
"There are unsaved notes. Leaving the page will discard all changes!" : "Daar is ongestoorde veranderinge. Indien die bladsy gesluit word sal alle veranderinge geskrap word!",
"Settings" : "Instellings",
"path to notes" : "pad na notas",
"File extension for new notes" : "Lêeruitbreiding vir nuwe notas",
"All notes" : "Alle notas",
"Categories" : "Kategorieë",
Expand Down
1 change: 0 additions & 1 deletion l10n/af.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"New note" : "Nuwe nota",
"There are unsaved notes. Leaving the page will discard all changes!" : "Daar is ongestoorde veranderinge. Indien die bladsy gesluit word sal alle veranderinge geskrap word!",
"Settings" : "Instellings",
"path to notes" : "pad na notas",
"File extension for new notes" : "Lêeruitbreiding vir nuwe notas",
"All notes" : "Alle notas",
"Categories" : "Kategorieë",
Expand Down
1 change: 0 additions & 1 deletion l10n/bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ OC.L10N.register(
"_Recovered {number} note_::_Recovered {number} notes_" : ["Възстановени {number} бележки","Възстановени {number} бележки"],
"Settings" : "Настройки",
"Folder to store your notes" : "Папка за съхранение на бележките",
"path to notes" : "път до бележките",
"File extension for new notes" : "Разширение за файловете",
"Display mode for notes" : "Режим на показване на бележки",
"Open in edit mode" : "Отваряне в режим за редактиране",
Expand Down
1 change: 0 additions & 1 deletion l10n/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"_Recovered {number} note_::_Recovered {number} notes_" : ["Възстановени {number} бележки","Възстановени {number} бележки"],
"Settings" : "Настройки",
"Folder to store your notes" : "Папка за съхранение на бележките",
"path to notes" : "път до бележките",
"File extension for new notes" : "Разширение за файловете",
"Display mode for notes" : "Режим на показване на бележки",
"Open in edit mode" : "Отваряне в режим за редактиране",
Expand Down
8 changes: 7 additions & 1 deletion l10n/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ OC.L10N.register(
"_Recovered {number} note_::_Recovered {number} notes_" : ["S'ha recuperat {number} nota","S'han recuperat {number} notes"],
"Settings" : "Paràmetres",
"Folder to store your notes" : "Carpeta on es desen les notes",
"path to notes" : "camí de les notes",
"File extension for new notes" : "Extensió de fitxer per a les notes noves",
"Display mode for notes" : "Mode de visualització de les notes",
"Open in edit mode" : "Obre en mode d'edició",
"Open in preview mode" : "Obre en mode de previsualització",
"No notes yet" : "Encara no hi ha notes",
"Select an image" : "Seleccioneu una imatge",
"You cannot select images outside of your notes folder. Your notes folder is: {folder}" : "No podeu seleccionar notes que es trobin fora de la carpeta de notes. La carpeta de notes és: {folder}",
"Wrong image" : "Imatge incorrecta",
"All notes" : "Totes les notes",
"Categories" : "Categories",
"Loading …" : "S'està carregant…",
Expand All @@ -34,6 +39,7 @@ OC.L10N.register(
"Remove from favorites" : "Suprimeix de preferits",
"Add to favorites" : "Afegeix als preferits",
"Error during preparing note for deletion." : "S'ha produït un error en preparar la nota per la supressió.",
"The note has been changed in another session. Please choose which version should be saved." : "S'ha modificat la nota en una altra sessió. Trieu quina versió voleu desar.",
"Use version from server" : "Utilitza la versió del servidor",
"Use current version" : "Utilitza la versió actual",
"Empty note" : "Nota en blanc",
Expand Down
8 changes: 7 additions & 1 deletion l10n/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@
"_Recovered {number} note_::_Recovered {number} notes_" : ["S'ha recuperat {number} nota","S'han recuperat {number} notes"],
"Settings" : "Paràmetres",
"Folder to store your notes" : "Carpeta on es desen les notes",
"path to notes" : "camí de les notes",
"File extension for new notes" : "Extensió de fitxer per a les notes noves",
"Display mode for notes" : "Mode de visualització de les notes",
"Open in edit mode" : "Obre en mode d'edició",
"Open in preview mode" : "Obre en mode de previsualització",
"No notes yet" : "Encara no hi ha notes",
"Select an image" : "Seleccioneu una imatge",
"You cannot select images outside of your notes folder. Your notes folder is: {folder}" : "No podeu seleccionar notes que es trobin fora de la carpeta de notes. La carpeta de notes és: {folder}",
"Wrong image" : "Imatge incorrecta",
"All notes" : "Totes les notes",
"Categories" : "Categories",
"Loading …" : "S'està carregant…",
Expand All @@ -32,6 +37,7 @@
"Remove from favorites" : "Suprimeix de preferits",
"Add to favorites" : "Afegeix als preferits",
"Error during preparing note for deletion." : "S'ha produït un error en preparar la nota per la supressió.",
"The note has been changed in another session. Please choose which version should be saved." : "S'ha modificat la nota en una altra sessió. Trieu quina versió voleu desar.",
"Use version from server" : "Utilitza la versió del servidor",
"Use current version" : "Utilitza la versió actual",
"Empty note" : "Nota en blanc",
Expand Down
6 changes: 5 additions & 1 deletion l10n/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@ OC.L10N.register(
"_Recovered {number} note_::_Recovered {number} notes_" : ["Obnovena {number} poznámka","Obnoveny {number} poznámky","Obnoveno {number} poznámek","Obnoveny {number} poznámky"],
"Settings" : "Nastavení",
"Folder to store your notes" : "Složka pro ukládání vašich poznámek",
"path to notes" : "popis umístění poznámek",
"Root directory" : "Kořenová složka",
"File extension for new notes" : "Přípona souboru pro nové poznámky",
"Display mode for notes" : "Režim zobrazení poznámek",
"User defined" : "Uživatelsky určené",
"Open in edit mode" : "Otevřít v režimu úprav",
"Open in preview mode" : "Otevřít v náhledovém režimu",
"No notes yet" : "Zatím žádné poznámky",
"Select an image" : "Vyberte obrázek",
"You cannot select images outside of your notes folder. Your notes folder is: {folder}" : "Není možné vybírat obrázky nacházející se mimo vaši složku s poznámkami. Vaše složka s poznámkami je: {folder}",
"Wrong image" : "Chybný obrázek",
"All notes" : "Všechny poznámky",
"Categories" : "Kategorie",
"Loading …" : "Načítání…",
Expand Down
6 changes: 5 additions & 1 deletion l10n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@
"_Recovered {number} note_::_Recovered {number} notes_" : ["Obnovena {number} poznámka","Obnoveny {number} poznámky","Obnoveno {number} poznámek","Obnoveny {number} poznámky"],
"Settings" : "Nastavení",
"Folder to store your notes" : "Složka pro ukládání vašich poznámek",
"path to notes" : "popis umístění poznámek",
"Root directory" : "Kořenová složka",
"File extension for new notes" : "Přípona souboru pro nové poznámky",
"Display mode for notes" : "Režim zobrazení poznámek",
"User defined" : "Uživatelsky určené",
"Open in edit mode" : "Otevřít v režimu úprav",
"Open in preview mode" : "Otevřít v náhledovém režimu",
"No notes yet" : "Zatím žádné poznámky",
"Select an image" : "Vyberte obrázek",
"You cannot select images outside of your notes folder. Your notes folder is: {folder}" : "Není možné vybírat obrázky nacházející se mimo vaši složku s poznámkami. Vaše složka s poznámkami je: {folder}",
"Wrong image" : "Chybný obrázek",
"All notes" : "Všechny poznámky",
"Categories" : "Kategorie",
"Loading …" : "Načítání…",
Expand Down
Loading