Commit graph

44015 commits

Author SHA1 Message Date
John Molakvoæ
c4a2632d95
Merge pull request #9833 from nextcloud/dependabot/composer/build/integration/phpunit/phpunit-approx-6.5
Update phpunit/phpunit requirement to ~6.5 in /build/integration
2018-06-13 08:40:45 +02:00
John Molakvoæ (skjnldsv)
49d0f0c499
Fixed phpunit Test class
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-13 07:24:41 +02:00
dependabot[bot]
9a32592aca
Update phpunit/phpunit requirement to ~6.5 in /build/integration
Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-6.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/commits/6.5.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-13 07:24:40 +02:00
Nextcloud bot
5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
John Molakvoæ
ed25fc3440
Merge pull request #9834 from nextcloud/copy-fix
Copyright fix, changed vue settings output name and fixes template name
2018-06-12 11:28:57 +02:00
John Molakvoæ (skjnldsv)
885b6be733
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-12 11:13:24 +02:00
Morris Jobke
dbd4da2e91
Merge pull request #9828 from nextcloud/gc-s3-list
Fix listing s3 objects when using google cloud aws compatibility
2018-06-12 10:39:28 +02:00
John Molakvoæ (skjnldsv)
27e68964a0
Indent fix and copy2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-12 10:32:18 +02:00
John Molakvoæ (skjnldsv)
62667914a0
Copyright fix, changed vue settings output name and fixes template name
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-12 10:26:53 +02:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Robin Appelman
47fd3499a3
Fix listing s3 objects when using google cloud aws compatibility
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-11 17:10:57 +02:00
Morris Jobke
61fa284d07
Merge pull request #9473 from nextcloud/dav-upload-no-partfile-lock
properly lock the target file on dav upload when not using part files
2018-06-11 16:54:05 +02:00
Robin Appelman
f017f431f6
properly lock the target file on dav upload when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-11 15:26:41 +02:00
Morris Jobke
c923ee7419
Merge pull request #9558 from nextcloud/fix/9489/trashbin_previews
Previews on for all trashbin files
2018-06-11 14:49:51 +02:00
Morris Jobke
cc78e17d5f
Merge pull request #9814 from nextcloud/bugfix/6032/delete_group_with_slash
Make the DELETION of groups match greedy on the groupID
2018-06-11 09:42:12 +02:00
John Molakvoæ
142505ecb2
Merge pull request #9810 from nextcloud/tests/9769/apps-management-acceptance
Acceptance tests for apps management and minor fixes
2018-06-11 09:30:18 +02:00
John Molakvoæ
a1496d7cc1
Merge pull request #9807 from nextcloud/fix-highlighting-of-the-upload-drop-zone
Fix highlighting of the upload drop zone
2018-06-11 09:17:48 +02:00
Morris Jobke
51d867c5d7
Merge pull request #9798 from nextcloud/bugfix/noid/enable_caldav_for_public_calendars
enable caldav for webdav subtree public-calendars
2018-06-11 09:17:28 +02:00
Nextcloud bot
e13f90ebe2
[tx-robot] updated from transifex 2018-06-11 00:12:38 +00:00
Nextcloud bot
c1d3515952
[tx-robot] updated from transifex 2018-06-10 00:12:59 +00:00
Roeland Jago Douma
228d1cfbd7
Make the DELETION of groups match greedy on the groupID
fixes #6032

Now since the match is greedy it will also eat the /

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-09 19:55:09 +02:00
Julius Härtl
b61e72fe00
Update asettings bundled javascript
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-09 12:07:55 +02:00
Julius Härtl
c8be44be90
Add key and fix disabled apps listing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-09 12:07:12 +02:00
Julius Härtl
cdbe39d006
Properly check for the sidebar
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-09 12:06:14 +02:00
Julius Härtl
f5ecd1c100
Add category field to apps that are only known from the app store
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-09 11:38:44 +02:00
Julius Härtl
de66336f9c
Add basic acceptance tests for apps management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-06-09 11:37:41 +02:00
Morris Jobke
0c2f016b67
Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_better
Make the token expiration also work for autocasting 0
2018-06-09 11:25:58 +02:00
Nextcloud bot
ae3bdb4fb9
[tx-robot] updated from transifex 2018-06-09 00:13:06 +00:00
Daniel Calviño Sánchez
4eafae4178 Do not show an error message when draging and dropping text
When the browser reports a drag of items other than files (for example,
text) and then triggers a drop event with no files no error message
should be shown to the user, as in that case there would be no highlight
of the drop zone and no indication that the drop would be valid (except
for the mouse cursor); the error message should be shown only when
the drop event with no files follows a file drag.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-08 20:37:43 +02:00
Daniel Calviño Sánchez
463d92c339 Remove no longer needed special handling for Firefox
The highlighting was removed in Firefox when the cursor was no longer
moving to handle the behaviour of reporting a file drag and then
providing no files in the drop event. That behaviour (which was only
present in Firefox 48 and 49) is already handled with the "dropnofiles"
callback, so that special handling is no longer needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-08 20:01:41 +02:00
Daniel Calviño Sánchez
d8251344c1 Use "dropnofiles" callback to disable the drop state in the UI
When a file is dragged from the desktop to the file list the file list
is highlighted, and when the file is finally dropped or the drag
operation is cancelled the highlighting is removed. In some cases, due
to a wrong implementation, a browser may end a file drag with a drop
with no files (for example, when a folder or text is dragged), which
would cause the highlight to not be removed. Now those cases are handled
with the "dropnofiles" callback, which restores the UI and also shows a
message to the user.

The error message is just a generic one, as in some cases it is not even
possible to know whether the problem came from a text drag or a folder
drag, and whether the problem appears or not depends on the browser,
version and even operating system.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-08 19:15:28 +02:00
Daniel Calviño Sánchez
bb64b6f87c Add callback to clean up after misbehaved drag and drop events
The jQuery Plugin triggers the "dragover" callback when the browser
triggers the "dragover" event and the types in their DataTransfer
include a "Files" item. It also triggers the "drop" callback when the
browser triggers the "drop" event and the list of files in its
DataTransfer is not empty.

Unfortunately some browsers may trigger "dragover" events with a
DataTransfer that includes a "Files" item and then trigger a "drop"
event with an empty list of files. When that happens the actions
performed in the "dragXXX" callbacks could be left hanging if they were
expected to be finished in the "drop" callback (for example, if the drop
zone was highlighted during the drag to be then restored when the file
was finally dropped). This commit adds the "dropnofiles" callback to be
able to handle those situations.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-08 19:15:27 +02:00
John Molakvoæ
fd1498a171
Merge pull request #9793 from nextcloud/fix-mention-regex
Fix mentions regex
2018-06-08 18:02:46 +02:00
Mario Danic
d959ca8eb0 Add another test
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 17:21:46 +02:00
Mario Danic
5acdd45b77 Add a new regex test
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 17:15:41 +02:00
Roeland Jago Douma
480864b3e3
Make the token expiration also work for autocasting 0
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:20:43 +02:00
Georg Ehrke
7ea41a1461
enable caldav for webdav subtree public-calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-08 13:12:34 +02:00
John Molakvoæ
8d26f9cd6d
Merge pull request #9796 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.12.0
Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotification
2018-06-08 11:54:45 +02:00
John Molakvoæ
aefc680e61
Merge pull request #9797 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.12.0
Bump webpack from 4.11.1 to 4.12.0 in /settings
2018-06-08 11:54:27 +02:00
dependabot[bot]
0c297d4943
Bump webpack from 4.11.1 to 4.12.0 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.11.1...v4.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-08 09:11:39 +00:00
dependabot[bot]
6e676ee62d
Bump webpack from 4.11.1 to 4.12.0 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.11.1...v4.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-06-08 09:11:24 +00:00
Daniel Calviño Sánchez
74ab68872f Remove duplicated code
"disableDropState" was set as the event handler in 8d4e5747f3, but
the duplicated code was accidentally added back in 786e858d23.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-08 11:10:46 +02:00
Mario Danic
47769d2640 New regex to match mentions
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 10:21:19 +02:00
Morris Jobke
bbfc028169
Merge pull request #9786 from nextcloud/feature/noid/external_sftp_password_and_key
Add SFTP auth mechanism to use a password and private key for SFTP
2018-06-08 09:23:47 +02:00
Nextcloud bot
b34111bfc9
[tx-robot] updated from transifex 2018-06-08 00:12:51 +00:00
Mario Danic
dc7beda308 Remove unsupported modifier
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:59:31 +02:00
Mario Danic
6bf8fca574 Fix mentions regex
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-06-08 00:35:51 +02:00
Morris Jobke
be30c09e9e
Merge pull request #9787 from nextcloud/notify-credentials-env
allow setting notify credentials in environment
2018-06-07 16:13:10 +02:00
Morris Jobke
c60c8ac675
Merge pull request #9772 from nextcloud/feature/8123/same_site_cookie_config_php
Move samesite cookie opt-out to config.php
2018-06-07 15:36:33 +02:00
Robin Appelman
48fb126505
allow setting notify credentials in environment
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-07 15:33:58 +02:00