Commit Graph

17758 Commits

Author SHA1 Message Date
Morris Jobke db59474868
Merge pull request #9662 from nextcloud/backport/9640/stable13
[stable13] check user state when fetching to avoid dealing with offline objects
2018-05-30 09:19:24 +02:00
Morris Jobke d95757b7d0
Merge pull request #9657 from nextcloud/backport/9256/stable13
[stable13] improve error reporting and move format parameter to the options
2018-05-30 09:18:36 +02:00
Nextcloud bot b889259b1e
[tx-robot] updated from transifex 2018-05-30 00:12:31 +00:00
Morris Jobke b71c90bac1
Merge pull request #9650 from nextcloud/backport/8842/stable13
[stable13] fix(AmazonS3):  fix loop $result['Contents'] error
2018-05-29 20:56:03 +02:00
Arthur Schiwon d33ba08b05
check user state when fetching to avoid dealing with offline objects
fixes #9502

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-29 20:54:48 +02:00
Roeland Jago Douma d6ab2a4ddb
Merge pull request #9661 from nextcloud/backport/9288/stable13
[stable13] LDAP password renewal fixes
2018-05-29 20:16:05 +02:00
Morris Jobke a52f0150af
Merge pull request #9659 from nextcloud/backport/9653/stable13
[stable13] The OAuth endpoint needs to support Basic Auth
2018-05-29 17:12:00 +02:00
Morris Jobke 9f793f91c9
Merge pull request #9608 from nextcloud/smb-exceptions-on-listing
[13] Handle exception while itterating trough smb file listing
2018-05-29 17:01:51 +02:00
Roger Szabo 49c1a7f2ae
Remove unneeded semicolon and parentheses
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:50 +02:00
Roger Szabo b3b774dfc5
css indent alignment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:46 +02:00
Roger Szabo 733eae5b91
adjust css to nc13 core changes
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:43 +02:00
Roger Szabo 4ba9556bc2
remove reset password link
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:39 +02:00
Roeland Jago Douma d48333910e
The OAuth endpoint needs to support Basic Auth
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 15:57:04 +02:00
Bjoern Schiessle 58be1f1b2f
improve error reporting and move format parameter to the options
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-05-29 15:34:32 +02:00
Roger Szabo 0b25317269
adjust unit tests for \"Invalid argument supplied for foreach()\" fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 15:21:23 +02:00
Roger Szabo 27fca0eebc
Fix "Invalid argument supplied for foreach()"
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 15:21:19 +02:00
enoch 65bb12032d
fix(AmazonS3): fix loop $result['Contents'] error
Invalid argument supplied for foreach() at /var/www/html/apps/files_external/lib/Lib/Storage/AmazonS3.php#295
2018-05-29 15:03:28 +02:00
Arthur Schiwon c2041c5d4a
prepare another theming release including translations for recently
added imprint and privacy policy strings.

Languages: fi, fr, de, de_DE (formal), it, es, pt_BR, tr

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-29 14:13:58 +02:00
Nextcloud bot 00edb8f2d4
[tx-robot] updated from transifex 2018-05-29 00:12:43 +00:00
Morris Jobke 8889220f55
Merge pull request #9622 from nextcloud/backport/9475/stable13
[stable13] Delete the previews when a version is restored
2018-05-28 11:20:18 +02:00
Roeland Jago Douma 5536d17181
Merge pull request #9619 from nextcloud/backport/9515/stable13
[stable13] Regenerate session id after public share auth
2018-05-28 09:05:53 +02:00
Nextcloud bot 5a20bb6980
[tx-robot] updated from transifex 2018-05-28 00:13:05 +00:00
Nextcloud bot f800c1697c
[tx-robot] updated from transifex 2018-05-27 00:13:28 +00:00
Roeland Jago Douma d33834f07a
Delete the previews when a version is restored
Fixes #9469

When a version of a file is restored the previews are no longer valid.
Thus we should remove them so they are regenerated.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-26 14:09:11 +02:00
Roeland Jago Douma 5eb6d7bc05
Regenerate session id after public share auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-26 13:21:08 +02:00
Nextcloud bot 043acfebab
[tx-robot] updated from transifex 2018-05-26 00:13:24 +00:00
Georg Ehrke f1108b9d26
send invitations for shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-25 20:47:02 +02:00
Roland Tapken e8868c2148
Make SMB module more fault-tolerant
Ignore unavailable files when fetching the share's mtime
or reading directory listings. This can happen on servers using a
distributed file system (DFS) with unavailable destinations, for example
when the remote server is offline.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-05-25 15:00:35 +02:00
Nextcloud bot d8e3c3cb22
[tx-robot] updated from transifex 2018-05-25 00:15:16 +00:00
Arthur Schiwon cee2d1783d
bump theming version ¯\_(ツ)_/¯
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon ac22c28045
addjust footer height when legal links are present. fixes #9572
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon 323b665e88
also add a privacy link
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:51 +02:00
Roeland Jago Douma 5bd9087cb7
Merge pull request #9573 from nextcloud/fix/9568/theming-wo-sig
bump version for theming again 🙇
2018-05-24 08:58:39 +02:00
Nextcloud bot c3a1d33959
[tx-robot] updated from transifex 2018-05-24 00:14:07 +00:00
Arthur Schiwon 67340846f9
bump version for theming again 🙇
also make appinfo compliant with appstore's schema. except default_enable…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 00:19:20 +02:00
Roeland Jago Douma 56b8a889c1
Merge pull request #9392 from nextcloud/dav-upload-lock-13
[13] only allow a single concurrent dav write to a file
2018-05-23 20:14:19 +02:00
Morris Jobke 2f059d1caf
Merge pull request #9540 from nextcloud/backport/9517/stable13
[stable13] Improve OAuth
2018-05-23 15:42:22 +02:00
Roeland Jago Douma 01d3586a0f
Merge pull request #9522 from nextcloud/backport/9325/stable13
[stable13] Fix for unbound cloned LDAP connections
2018-05-23 09:18:21 +02:00
Nextcloud bot 82d0d1d704
[tx-robot] updated from transifex 2018-05-23 00:16:07 +00:00
Arthur Schiwon 3a73b9c0bb
bump theming version for extraordinary release
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-22 17:03:41 +02:00
Morris Jobke 5744827696
Merge pull request #9516 from nextcloud/backport/9437/stable13
[stable13] allow to specify a link to a legal notice
2018-05-22 16:54:07 +02:00
Roeland Jago Douma 3c002706a4
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:39 +02:00
Roeland Jago Douma 73f8373151
Don't use special chars to avoid confusion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:30 +02:00
Roeland Jago Douma d03265fb62
Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:17 +02:00
Roeland Jago Douma 30750e4f92
Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:12 +02:00
Roeland Jago Douma a04ea70fca
Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:03 +02:00
Roeland Jago Douma 000cf1951c
Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:50:58 +02:00
Nextcloud bot 41cd6076fb
[tx-robot] updated from transifex 2018-05-22 00:13:54 +00:00
Nextcloud bot 352d0af868
[tx-robot] updated from transifex 2018-05-20 00:13:45 +00:00
Nextcloud bot 3304991965
[tx-robot] updated from transifex 2018-05-19 00:14:03 +00:00
Roger Szabo 8c43834dbc
unbound cloned connection fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-18 15:09:51 +02:00
Arthur Schiwon c3d28885b0
Backport of #9437
allow to specify a link to a legal notice

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix undo for url-typed inputs

and minor adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Use link not address in labels for URLs

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

this file does not belong here

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-18 11:26:57 +02:00
Nextcloud bot c101ad3a65
[tx-robot] updated from transifex 2018-05-18 00:14:09 +00:00
Nextcloud bot b08e53d365
[tx-robot] updated from transifex 2018-05-17 00:14:09 +00:00
Morris Jobke edd5712c6e
Merge pull request #9454 from nextcloud/stable13-9245-fix-race-condition-when-preparing-upload-folder
[stable13] Fix race condition when preparing upload folder
2018-05-14 13:41:47 +02:00
Nextcloud bot a46b8e34f9
[tx-robot] updated from transifex 2018-05-13 00:13:19 +00:00
Nextcloud bot cd3b0ca7da
[tx-robot] updated from transifex 2018-05-12 00:13:27 +00:00
Nextcloud bot 465397fa02
[tx-robot] updated from transifex 2018-05-11 00:13:23 +00:00
Daniel Calviño Sánchez d74b5231b8 Fix race condition when preparing upload folder
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

When all the active uploads were finished the list of known uploads was
cleared. However, an upload is not active until it actually starts
sending the data, so while waiting for the upload directory to be
created the upload is already in the list of known uploads yet not
active. Due to all this, if the active uploads finished while another
pending upload was waiting for the upload directory to be created that
pending upload would be removed from the list of known uploads too, and
once the directory was created and thus the chunks were sent a field of
a null upload object would be accessed thus causing a failure.

Instead of removing all the known uploads at once when the active
uploads finish now each upload is explicitly removed when it finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 16:58:43 +02:00
Roeland Jago Douma 3a013b127c
Merge pull request #9433 from nextcloud/backport/9224/accessibility-improvements-13
[stable13] Add labels for Contacts menu and Settings
2018-05-10 09:30:56 +02:00
Nextcloud bot e2f5355f73
[tx-robot] updated from transifex 2018-05-10 00:13:31 +00:00
Jan-Christoph Borchardt e7d6410f25
Ensure proper color contrast according to WCAG AA
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:39:16 +02:00
Morris Jobke 44255faab3
Merge pull request #9430 from nextcloud/stable13-9407
[13] Fix jsunit tests
2018-05-09 09:14:33 +02:00
Morris Jobke fe2d99f3fb
Merge pull request #9409 from nextcloud/backport/9393/workflow-rules-error-when-changing-operation
[stable13] workflow rules error when changing operation
2018-05-09 08:41:58 +02:00
Julius Härtl 2329f7e2c6
Fix jsunit tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-09 08:21:21 +02:00
Nextcloud bot d8d09475c4
[tx-robot] updated from transifex 2018-05-09 00:11:50 +00:00
Nextcloud bot 583176d36d
[tx-robot] updated from transifex 2018-05-08 00:11:56 +00:00
Joas Schilling a134bf7349
Do not error when the tag does not exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 15:30:12 +02:00
Joas Schilling 0579529145
Reset the value when changing the check class (because it might be invalid)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 15:29:57 +02:00
Nextcloud bot c77b66e179
[tx-robot] updated from transifex 2018-05-07 00:11:59 +00:00
Nextcloud bot 923520823e
[tx-robot] updated from transifex 2018-05-06 00:12:02 +00:00
Nextcloud bot 635814f6a9
[tx-robot] updated from transifex 2018-05-05 00:12:11 +00:00
Robin Appelman 187acecff7
only allow a single concurrent dav write to a file
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 15:08:56 +02:00
Nextcloud bot 1a900c6928
[tx-robot] updated from transifex 2018-05-04 00:12:17 +00:00
Nextcloud bot 5756a8d8ff
[tx-robot] updated from transifex 2018-05-03 00:12:19 +00:00
Roeland Jago Douma 6976241e4e
Merge pull request #9344 from nextcloud/stable13-9248
[stable13] Fix ellipsis in filename column
2018-05-01 19:58:38 +02:00
Nextcloud bot 0d91288f49
[tx-robot] updated from transifex 2018-05-01 00:12:15 +00:00
Julius Härtl 5c6084a545
Add min-width to trick the table width calculation in safari
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-30 11:03:40 +02:00
Julius Härtl 7e39215142
Use flex based layout inside the filename table cell
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-30 11:02:43 +02:00
Nextcloud bot d216d7aff5
[tx-robot] updated from transifex 2018-04-30 00:12:11 +00:00
Nextcloud bot 6b67651951
[tx-robot] updated from transifex 2018-04-29 00:12:11 +00:00
Nextcloud bot 1a3d61cbd3
[tx-robot] updated from transifex 2018-04-28 00:12:20 +00:00
Nextcloud bot 8029998a60
[tx-robot] updated from transifex 2018-04-27 00:12:15 +00:00
Nextcloud bot a21b4469c9
[tx-robot] updated from transifex 2018-04-26 00:12:33 +00:00
Nextcloud bot 9311d4972b
[tx-robot] updated from transifex 2018-04-25 00:12:15 +00:00
Nextcloud bot d4ec708867
[tx-robot] updated from transifex 2018-04-24 00:12:18 +00:00
Nextcloud bot c49ec66188
[tx-robot] updated from transifex 2018-04-23 00:12:13 +00:00
Nextcloud bot cc533aad3b
[tx-robot] updated from transifex 2018-04-22 00:12:14 +00:00
Nextcloud bot 8c0624149f
[tx-robot] updated from transifex 2018-04-21 00:12:06 +00:00
Nextcloud bot 3fe5649b42
[tx-robot] updated from transifex 2018-04-20 00:12:26 +00:00
Nextcloud bot 75f9dd6d67
[tx-robot] updated from transifex 2018-04-19 00:12:16 +00:00
Morris Jobke 51ae913513
Merge pull request #9238 from nextcloud/13-8945
[stable13] Fixed files copy/move when in favorites or recent section
2018-04-18 22:47:15 +02:00
Morris Jobke 5262685e57
Merge pull request #9236 from nextcloud/13-8996
[stable13] Fix webdav support for OneNote clients
2018-04-18 22:46:26 +02:00
Roeland Jago Douma cbe03cb561
Merge pull request #8986 from nextcloud/backport/8821/show-eol-warning
[stable13] Show EOL warning in the update section
2018-04-18 21:14:55 +02:00
Daniel Calviño Sánchez 807955c26c
Merge pull request #9230 from nextcloud/13-9206
[stable13] Fix user selectable text for public links for text files
2018-04-18 20:56:27 +02:00
John Molakvoæ (skjnldsv) 5253343885
Fixed files copy/move when in favorites or recent section
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-18 17:54:04 +02:00
Brandon Kirsch 78a6e94b52
Fix webdav support for OneNote clients 2018-04-18 17:40:36 +02:00
Roeland Jago Douma de70df0031
Use multibyte substring
Fixes #7661

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-18 17:35:09 +02:00
Morris Jobke 21ca50168a
Fix user selectable text for public links for text files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-18 16:45:55 +02:00
Joas Schilling 6b97429ebe
Show EOL warning in the update section
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 13:46:25 +02:00
Nextcloud bot eff3add8f9
[tx-robot] updated from transifex 2018-04-17 00:13:32 +00:00
Nextcloud bot 90102937e4
[tx-robot] updated from transifex 2018-04-16 00:12:10 +00:00
Nextcloud bot a82eacf1f3
[tx-robot] updated from transifex 2018-04-14 00:12:10 +00:00
Nextcloud bot 24eaf35d2f
[tx-robot] updated from transifex 2018-04-13 00:12:11 +00:00
Nextcloud bot f192bcccf9
[tx-robot] updated from transifex 2018-04-12 00:19:44 +00:00
Nextcloud bot 3339fc64f3
[tx-robot] updated from transifex 2018-04-11 00:21:56 +00:00
Roeland Jago Douma 656df69cf0
Merge pull request #9073 from nextcloud/backport/9070/guessing_without_target_is_useles-13
[stable13] When formatting a share node an Empty target is invalid
2018-04-11 00:36:07 +02:00
Nextcloud bot 6209a66f16
[tx-robot] updated from transifex 2018-04-10 00:12:35 +00:00
Daniel Calviño Sánchez 9e9e053b73 Fix progress bar hidden before the upload ends
The jQuery File Upload plugin triggers the "stop" event once there are
no more files being uploaded (even if some of them were added when
another upload was already in progress). Therefore, the progress bar
should be hidden in the "fileuploadstop" callback.

In some cases the "stop" event is not triggered and thus the progress
bar is not hidden once no more files are being uploaded. This is caused
by a race condition and it will be fixed in another commit; except in
buggy cases like that one (that need to be fixed anyway) it is safe to
hide the progress bar in the "fileuploadstop" callback.

In any case, note that the callbacks in "fileuploaddone" may be called
after the "stop" event was triggered and handled when using chunked
uploads. In that case once all the chunks are uploaded the assembled
file is moved to its final destination, so its promise could be resolved
after the "stop" event was triggered. Therefore a different approach
would be needed to keep the progress bar visible until the chunked
upload is truly finished, but for the time being the current one is good
enough.

Before this commit the progress bar was being hidden when the first
upload finished, either successfully or with an error, no matter if
there were other files being uploaded too.

The progress bar was being explicitly hidden also when the upload was
cancelled. When an upload is cancelled all the single uploads are
aborted, which triggers a "fail" event for each of them. However, the
"stop" event is always triggered when no more files are being uploaded,
so it is triggered too once all the single uploads were aborted. As all
the single uploads are immediately aborted in a loop when the general
upload is cancelled it makes no difference to hide the progress bar when
the first single upload is aborted or when all the single uploads were
aborted, so the progress bar is no longer explicitly hidden in the
former case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 11:20:18 +02:00
Nextcloud bot 2b0b717258
[tx-robot] updated from transifex 2018-04-09 00:12:23 +00:00
Nextcloud bot 8ba8719ec3
[tx-robot] updated from transifex 2018-04-08 00:12:25 +00:00
Nextcloud bot 7f2838cf68
[tx-robot] updated from transifex 2018-04-07 00:12:12 +00:00
John Molakvoæ d45a889fe2
Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names
[stable13] Show group display names
2018-04-06 15:14:12 +02:00
Nextcloud bot 80c5eda800
[tx-robot] updated from transifex 2018-04-06 00:14:46 +00:00
Roeland Jago Douma 652d0413cf
Merge pull request #9071 from nextcloud/backport/9006/ignore_encrypted_custom_properties-13
[stable13] Do not treat is-encrypted as custom property
2018-04-05 08:53:28 +02:00
Nextcloud bot 2c6a534d5d
[tx-robot] updated from transifex 2018-04-05 00:12:13 +00:00
Roeland Jago Douma ce7a835772
Merge pull request #9017 from nextcloud/smb-2.0.5-13
[13] update icewind/smb to 2.0.5
2018-04-04 14:08:28 +02:00
Roeland Jago Douma 36bd4b7dde
When formatting a share node an Empty target is invalid
Fixes #9028

For federated shares the share table holds no target information (since
it is on the other server). So when a node is actually invalid and not
found we should not display it anymore in the shared with sections etc
and thus throw the proper exceptions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:03:25 +02:00
Roeland Jago Douma df09b65ee9
Do not treat is-encrypted as customer property
fixes #8977

Else for all files in a folder we would launch off more queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 11:56:59 +02:00
Nextcloud bot ef14f3c0b0
[tx-robot] updated from transifex 2018-04-04 00:13:52 +00:00
Morris Jobke 4f5d057777
Merge pull request #9020 from nextcloud/stable13-8983
[stable13] Clear any theming prefixed cache on cache buster increase
2018-04-03 10:09:33 +02:00
Nextcloud bot e5684a9287
[tx-robot] updated from transifex 2018-04-03 00:12:13 +00:00
Nextcloud bot 9c1c47400f
[tx-robot] updated from transifex 2018-04-02 00:12:13 +00:00
Nextcloud bot 4f34eb7616
[tx-robot] updated from transifex 2018-04-01 00:12:11 +00:00
Nextcloud bot 77bdbb6443
[tx-robot] updated from transifex 2018-03-31 00:14:19 +00:00
Nextcloud bot b6cb092bc6
[tx-robot] updated from transifex 2018-03-30 00:12:01 +00:00
Nextcloud bot ea01c9e92d
[tx-robot] updated from transifex 2018-03-29 00:14:00 +00:00
Julius Härtl 7f209be51d
Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:36 +02:00
Julius Härtl 541bb71513
Clear any theming prefixed cache on cache buster increase
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:35 +02:00
Robin Appelman 6e13e31188
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:17:56 +02:00
Robin Appelman a691b52daf
Revert "update icewind/smb to 2.0.5"
accidental push to wrong branch

This reverts commit 3b35cd0749.
2018-03-28 16:17:30 +02:00
Robin Appelman 3b35cd0749
update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:15:27 +02:00
Nextcloud bot f2e69bd868
[tx-robot] updated from transifex 2018-03-28 00:21:41 +00:00
Nextcloud bot c2ec519bc4
[tx-robot] updated from transifex 2018-03-27 00:12:04 +00:00
Nextcloud bot f8b1acfcfd
[tx-robot] updated from transifex 2018-03-26 00:13:40 +00:00
Nextcloud bot cda89f16d8
[tx-robot] updated from transifex 2018-03-25 01:10:27 +00:00
Nextcloud bot 3604fe1ec5
[tx-robot] updated from transifex 2018-03-24 01:12:43 +00:00
Nextcloud bot 6ef65b3016
[tx-robot] updated from transifex 2018-03-23 01:11:55 +00:00
Nextcloud bot b3ffcda8ff
[tx-robot] updated from transifex 2018-03-22 01:12:05 +00:00
Nextcloud bot 684f6b6429
[tx-robot] updated from transifex 2018-03-21 01:12:19 +00:00
Daniel Calviño Sánchez df5cd18394 Set "share_with" field to the ID of the circle
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:42:27 +01:00
Nextcloud bot a6f1721c2d
[tx-robot] updated from transifex 2018-03-20 01:11:59 +00:00
Nextcloud bot 23022d5dd7
[tx-robot] updated from transifex 2018-03-17 01:11:55 +00:00
Arthur Schiwon 588ee6af06
existence check works without attribute (like with users)
cn is not necessarily given everywhere

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-16 10:26:29 +01:00
Nextcloud bot 161a0f29d9
[tx-robot] updated from transifex 2018-03-16 01:11:55 +00:00
Nextcloud bot 4939ff36a0
[tx-robot] updated from transifex 2018-03-15 01:12:05 +00:00
Nextcloud bot 66eaea9259
[tx-robot] updated from transifex 2018-03-14 01:11:56 +00:00
Nextcloud bot f66af48d49
[tx-robot] updated from transifex 2018-03-13 01:12:30 +00:00
John Molakvoæ (skjnldsv) ae369e870d
Fixed caldav tests and metadata 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-12 12:02:14 +01:00
Joas Schilling 2609b30df0
Fix group displaynames in activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:01:37 +01:00
Nextcloud bot 93f5745700
[tx-robot] updated from transifex 2018-03-12 01:12:46 +00:00
Nextcloud bot 8e27fed9d3
[tx-robot] updated from transifex 2018-03-11 01:12:36 +00:00
Nextcloud bot 8e8368ae0b
[tx-robot] updated from transifex 2018-03-10 01:12:24 +00:00
Morris Jobke b0f0c26fe3
Merge pull request #8745 from nextcloud/stable13-8716
[13] Remove base url from global cache prefix
2018-03-09 16:15:48 +01:00
Morris Jobke 0f1567d8fa
Merge pull request #8752 from nextcloud/13-8112
[stable13] Fix integer overflow in ChunkingPlugin
2018-03-09 11:23:28 +01:00
Morris Jobke 4fa0cac17c
Merge pull request #8725 from nextcloud/objectstore-no-part-files-13
[13]  disable part files for object stores
2018-03-09 10:34:33 +01:00
Morris Jobke ba7cc279e6
Fix integer overflow in ChunkingPlugin
Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 10:27:41 +01:00
Julius Härtl 88e9542d12
Use cache prefix for theming as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:52 +01:00
Julius Härtl d4d3cecbf8
Fix tests to use ICacheFactory
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:50 +01:00
Julius Härtl c4539c34c9
Move base url from global cache prefix to frontend related ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:06 +01:00
Nextcloud bot b593fd1406
[tx-robot] updated from transifex 2018-03-09 01:12:37 +00:00
Robin Appelman 9342f97a28
emit pre-hooks earlier when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:09 +01:00
Roeland Jago Douma d7a70aba84
Merge pull request #8686 from nextcloud/backport/8298/fix-activities-for-end2end-encryption
[stable13] Fix activities for end2end encryption
2018-03-06 22:44:54 +01:00
Morris Jobke ed8e4cc785
Merge pull request #8667 from nextcloud/8158_13
[stable13] Use a more widely available method to test s3 settings
2018-03-06 13:38:23 +01:00
Morris Jobke 16fa18ab49
Merge pull request #8678 from nextcloud/7707_13
[stable13] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:37:21 +01:00
Joas Schilling d16aa27516
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:12 +01:00
Joas Schilling 8f8d7cf9d3
Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:04 +01:00
Joas Schilling 5d8aaf9696
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:57 +01:00
Joas Schilling 7c15b99a49
Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:51 +01:00
Joas Schilling f1e01dbbbc
Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:45 +01:00
Joas Schilling 737af44b63
Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:36 +01:00
Joas Schilling 0911f3bde1
Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:13 +01:00
Roeland Jago Douma 242f0c0b5a
Merge pull request #8676 from nextcloud/8297_13
[stable13] Fix example regex for user agent matching
2018-03-06 11:54:27 +01:00
Morris Jobke 0667a32c83
Merge pull request #8673 from nextcloud/stable13-8634
[stable13] do not create empty userid when attribute does not have allowed chars
2018-03-06 11:30:48 +01:00
Georg Ehrke 6171940717
generate different UIDs for Birthday, Anniversary and Death event
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:20:53 +01:00
Joas Schilling 02af9b2f6f
Fix example regex for user agent matching
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:16:41 +01:00
Julius Härtl 80842e1611
Remove to restrict check for background image/color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-06 09:08:49 +01:00
Nextcloud bot d3d0d9e11d
[tx-robot] updated from transifex 2018-03-06 01:12:41 +00:00
Arthur Schiwon 6e3c05f513
do not create empty userid when attribute does not have allowed chars
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 23:14:36 +01:00
Robin Appelman 3036fb95ae
Use a more widely available method to test s3 settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-05 19:41:56 +01:00
Roeland Jago Douma 655e39ffcd
Merge pull request #8610 from nextcloud/stable13-8588-fix-breadcrumbs-width-calculation
[stable13] Fix breadcrumbs width calculation
2018-03-05 19:37:53 +01:00
Arthur Schiwon 962b046ab5
use hash algo that's robust against collisions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 13:20:22 +01:00
Nextcloud bot d74bad2dc1
[tx-robot] updated from transifex 2018-03-05 01:12:36 +00:00
Nextcloud bot 7717dbbe30
[tx-robot] updated from transifex 2018-03-04 01:13:07 +00:00
Nextcloud bot e23f06561a
[tx-robot] updated from transifex 2018-03-03 01:12:39 +00:00
rakekniven cbba3e2432
Update commentstabview.js
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-02 10:41:26 +01:00
Morris Jobke 59d6f45c41
Merge pull request #8615 from nextcloud/stable13-8355
[stable13] Fix comments (and systemtags) when involving users with numerical ids
2018-03-02 10:35:40 +01:00
Nextcloud bot 369b3b28c7
[tx-robot] updated from transifex 2018-03-02 01:12:43 +00:00
Arthur Schiwon 7bd1aac209
backport of #8355 to stable13
test creating comments with numeric user ids

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix creating comments when file is accessible to users with numeric ids

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

tests for systemtags related to numeric user ids

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

fix systemtags event with numeric user ids

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-02 00:28:20 +01:00
Daniel Calviño Sánchez 22f9d0519a Update comments in tests
Menu and home are not always visible; home is always visible, but menu
is shown only when needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 21551d7884 Improve documentation of "getTotalWidth"
"getTotalWidth" is not more accurate; it is simply not clamped.
Moreover, "width/outerWidth" could be used in tests too, and also even
if "getTotalWidth" could be used in tests while others not that would
not be something to be stated in the API documentation, but in a
comment.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 23559b2eda Do not show the crumbs again after hiding them
After the changes in the previous commit "_showCrumb" no longer shows
the menu, only the same crumb that was hidden by the last call to
"_hideCrumb". Therefore, if the crumb was hidden because it did not fit
there is no need to try to show it again, as it will still not fit.

Moreover, the calculated width for a hidden element is not always
accurate; in some cases the calculated width is lower than the actual
width (it happens, for example, when using a background image like the
"Share" icon), which causea the crumb to be shown even if there is not
enough room, which in the end causes the siblings to overflow the
contents.

No unit tests for this one, though; you will have to trust me on this,
sorry ;-)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez a1af18fa35 Fix menu visibility
The crumb for the menu was shown like any other crumb when calling
"_showCrumb", but it was also shown when other crumbs were hidden
without taking into account the available width. This caused several
related problems, like the breadcrumbs taking too much space when the
menu was sometimes shown after the rest of the crumbs were adjusted to
the available width, or the menu being shown instead of the last crumb
even if there was room for it when the available width was increased.

Now the menu is always hidden before starting the resizing of the crumbs
to ensure that whether it was previously shown or not does not affect
the result. In a similar way, the menu will no longer be shown by
"_showCrumb", as it is not a regular crumb that has to be shown simply
if there is enough room. The menu is now shown as soon as any other
crumb is hidden; this ensures that the menu width will be taken into
account in further width checks. As when _updateMenu" is called it no
longer needs to take care of showing the menu this fixes the issue
revealed when fixing the test setup in the previous commit.

Finally, this implicitly fixes the failure in the breadcrumbs tests when
run on Firefox, as it was caused by the menu interfering in the
calculations of the other crumbs when increasing the width.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez e33a9693f7 Fix setup to test the breadcrumbs menu
The "Shows only items not in the breadcrumb" test was failing when run
on Firefox, but not on PhantomJS. This was caused by the differences in
the starting width between both browsers and an incorrect setup of the
test (the width set for the crumbs was overriden when the breadcrumbs
were rendered again, and the breadcrumb was resized to 300 from an
indeterminate initial width).

Now the crumbs are rendered and then its width, padding and margin are
set to a known value. Then it is resized to 1000px, which ensures that
there will be enough room for all the crumbs and thus the menu will be
hidden, and finally it is resized to 300, which causes the middle crumb
to be hidden and the menu to be shown.

Note, however, that the test now always fails, no matter if it is run on
PhantomJS or on Firefox; if the menu crumb is hidden when "_updateMenu"
is called it will show it, but it will also wrongly try to add the menu
itself to the menu. As the "crumb-id" of the menu crumb is "-1" this
causes the last regular crumb to be added to the menu. This will be
fixed with other related issues in the next commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 83b50690a8 Take padding and margins of crumbs into account
When calculating the total width of the crumbs only its padding was
taken into account; now the margin is too. In a similar way, before
showing a crumb only its width was taken into account; now its padding
and margin are taken into account too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 89c0a0733f Use hard-coded values for paddings and margins
This ensures that the resize tests do not depend on the values set in
the CSS files.

Note that this change causes a test to fail with Firefox, but not with
PhantomJS. This is due to a difference in the starting width used by
Firefox and by PhantomJS, and it will be fixed in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez d9405a2b02 Compress siblings before calculating the available width for crumbs
When the parent element of the breadcrumbs was resized to a larger width
and the siblings of the breadcrumbs expanded to fill all the available
width some crumbs could be hidden even if there was enough room for
them. The reason was that the width of the siblings being used to
calculate the available width for the breadcrumbs was the expanded width
of the siblings. Now as many crumbs as possible (that is, fitting in the
parent, no matter the siblings) are first shown so the expanding
siblings are compressed before calculating the available width.

Due to the lack of support for flexboxes in PhantomJS the related unit
test is skipped; it has to be run in other browser, like Firefox.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez a93dac6a9c Take all visible siblings into account
Other apps could add elements to the controls outside the creatable
actions div (for example, the button to switch to the gallery), so the
widths of all the visible siblings of the breadcrumbs have to be taken
into account in the size calculations.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez bb85084c3d Take padding and margin of the creatable actions div into account
There are some differences in width handling between the browsers used
to run the tests, most likely due to their support (or lack of) of
certain CSS features: PhantomJS requires "width" to be set (probably
because it does not handle flex displays and treats it like a block, so
"min-width" does not matter in this case), while Firefox requires
"min-width" to be set (otherwise the children of "#controls" could be
compressed due to its use of flex display and the elements would end
with a different width than the one needed for the tests). Due to all
that the width of the breadcrumb siblings must be specified in the tests
using both "width" and "min-width".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 1da92fd5da Do not render the breadcrumbs again in resize tests
There is no need to call "setDirectory" again in resize tests; it is
enough to simply resize them (and isolates them better to just test the
resizing behaviour).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00