Граф коммитов

2672 Коммитов

Автор SHA1 Сообщение Дата
dependabot[bot] b5d9f37a27
Merge pull request #2325 from nextcloud/dependabot/npm_and_yarn/core-js-3.22.2 2022-04-27 12:36:14 +00:00
dependabot[bot] 9089145651 build(deps): bump core-js from 3.22.0 to 3.22.2
Bumps [core-js](https://github.com/zloirock/core-js) from 3.22.0 to 3.22.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.22.0...v3.22.2)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-27 12:28:11 +00:00
max-nextcloud 8b9983468b
Merge pull request #2324 from nextcloud/dependabot/npm_and_yarn/markdown-it-13.0.0
build(deps): bump markdown-it from 12.3.2 to 13.0.0
2022-04-27 14:20:17 +02:00
dependabot[bot] 50d3629cb4 build(deps): bump markdown-it from 12.3.2 to 13.0.0
Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 12.3.2 to 13.0.0.
- [Release notes](https://github.com/markdown-it/markdown-it/releases)
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/12.3.2...13.0.0)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-27 12:04:37 +00:00
max-nextcloud 2091aece1a
Merge pull request #2292 from nextcloud/pierreozoux-patch-1
Changes menu entry.
2022-04-27 13:44:12 +02:00
Pierre Ozoux ce9daac3d7
Changes menu entry.
We realized with our users that when the apps Text and ONLYOFFICE are installed in parallel, this is a bit confusing.

You can see a screenshot here, in french:
https://forge.liiib.re/indiehost/tech/plateforme/-/issues/217#note_9733

So we propose this change.

In relation to this change in [onlyoffice app](https://github.com/ONLYOFFICE/onlyoffice-nextcloud/pull/617).

Signed-off-by: Pierre Ozoux <pierre@ozoux.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-27 13:28:20 +02:00
max-nextcloud f86dfa0c5b
Merge pull request #2315 from nextcloud/fix/menubar-after-sidebar-toggle
fix: adjust menubar on sidebar toggling
2022-04-27 13:27:09 +02:00
Max d5e3b7932a
fix: adjust menubar on sidebar toggling
Signed-off-by: Max <max@nextcloud.com>
2022-04-27 12:07:28 +02:00
Nextcloud bot 22002d0a29
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-27 03:31:21 +00:00
Julius Härtl 7159f16106
Merge pull request #2341 from nextcloud/feat/workflow-auto-update-command-rebase.yml
Updating command-rebase.yml workflow from template
2022-04-26 20:09:08 +02:00
Julius Härtl d50e162e2b
Merge pull request #2340 from nextcloud/bugfix/2323/performance-issue
Performance improviments
2022-04-26 20:07:21 +02:00
nextcloud-command 4d15a34bf0 Compile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-26 16:19:43 +00:00
Nextcloud bot e074c370a4 Updating command-rebase.yml workflow from template
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-26 15:21:46 +00:00
Vinicius Reis 4fa7f2f93b
Merge remote-tracking branch 'origin/master' into bugfix/2323/performance-issue 2022-04-26 11:58:56 -03:00
Vinicius Reis 5d69744cf6
️ (#2323): inject SyncService instance
Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-26 11:21:39 -03:00
Vinicius Reis 217a7f13c7
️ (#2323): remove reactivity from SyncService instance
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-26 09:51:21 -03:00
Vinicius Reis 3cf3fdd436
️ (#2323): inject editor into MenuBubble
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-26 09:37:15 -03:00
Vinicius Reis 7feabf83b8
️ (#2323): use editor as provider
inject editor into MenuBar

Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-26 09:36:01 -03:00
Nextcloud bot f0a3661389
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-26 03:27:31 +00:00
Vinicius Reis 1ab0c27695
️ (#2323): remove reactivity from tiptap instance 2022-04-25 22:03:55 -03:00
Vinicius Reis 7aa0f9fa40
fix some cypress tests
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-25 22:02:45 -03:00
Jonas 58e285d7f0
Merge pull request #2329 from nextcloud/fix/dragndrop
Fix drag&drop of non-image objects
2022-04-25 14:33:43 +02:00
Jonas 65563031d1
Fix drag&drop of non-image objects
Only catch drop with custom image-drop event if it contains files.

Fixes: #2317

Signed-off-by: Jonas <jonas@freesources.org>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-25 14:22:24 +02:00
Jonas 9b1094e993
Merge pull request #2331 from nextcloud/fix/cypress-workspace-narrow-page
Fix workspace cypress test with narrow pages
2022-04-25 14:18:00 +02:00
Julien Veyssier 83ed1d7989
force click on menu buttons when they are hidden (in the dropdown)
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2022-04-25 13:57:39 +02:00
Jonas 25389bd1df
Merge pull request #2330 from nextcloud/fix/cypress-login-command
Adapt cypress login command to small change in login page
2022-04-25 13:50:32 +02:00
Julien Veyssier ad9cea4db7
adapt cypress login command to small change in 25
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2022-04-25 13:29:29 +02:00
Nextcloud bot dfae31451c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-24 03:28:57 +00:00
Nextcloud bot 92107698ce
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-23 03:23:23 +00:00
Nextcloud bot 85a18faaa2
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-22 03:25:06 +00:00
Julius Härtl d61932ef48
Merge pull request #2248 from nextcloud/enh/locking
Implement collaborative locking
2022-04-21 18:08:20 +02:00
Julius Härtl 42a7882492 Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-21 14:08:00 +00:00
Julius Härtl de93bcee44
Use proper file id source for public shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 16:04:53 +02:00
Julius Härtl ff819afde9
Make psalm happy
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:44 +02:00
Julius Härtl ede33b50d4
Unlock during session cleanup
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:44 +02:00
Julius Härtl fa139cfa1b
Also take mtime into account for change detection during editing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:44 +02:00
Julius Härtl 5c9225e886
Expose lock in the text UI
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:44 +02:00
Julius Härtl 53d1012f7f
Open files read only if locked
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:44 +02:00
Julius Härtl 8c00c8eb25
Implement collaborative locking
Signed-off-by: Julius Härtl <jus@bitgrid.net>

TMP: Switch to OCP branch for tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Let locked files open in read only

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Adapt LockScope to LockContext rename

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2022-04-21 13:27:43 +02:00
Julius Härtl bc020a0bbc
Merge pull request #2318 from nextcloud/bugfix/2097/add-support-to-auto-link
Small test adjusts
2022-04-21 08:28:06 +02:00
Vinicius Reis e6f099ae43
Merge branch 'master' into bugfix/2097/add-support-to-auto-link 2022-04-20 19:13:34 -03:00
Vinicius Reis 55ee9b60bf
(#2097): use calledWithMatch instead of calledWith
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-20 19:13:04 -03:00
Vinicius Reis fdf2829e84
(#2097): improve login action
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-20 19:08:00 -03:00
Julius Härtl fddfacb23c
Merge pull request #2316 from nextcloud/bugfix/2097/add-support-to-auto-link
Bugfix: add support to auto link
2022-04-20 18:22:46 +02:00
Vinicius Reis 2cfde2fa50
Merge branch 'master' into bugfix/2097/add-support-to-auto-link 2022-04-20 10:43:27 -03:00
Nextcloud bot 329ab8d2b6
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-20 03:25:02 +00:00
nextcloud-command ad42b304bf Compile assets
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-04-19 22:26:33 +00:00
Vinicius Reis a555ff0580
(#2097): add link integration tests
Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-19 18:59:57 -03:00
Vinicius Reis ed31545913
🐛 (#2097): add support to autolink
auto link is included in original tiptap extension-link.

We should keep the original behavior as much as possible.

Signed-off-by: Vinicius Reis <vinicius.reis@nextcloud.com>
2022-04-19 18:57:56 -03:00
Julius Härtl 6f5e192896
Merge pull request #2312 from nextcloud/fix/modal_height
Fix modal heights
2022-04-19 19:39:14 +02:00