Commit Graph

42927 Commits

Author SHA1 Message Date
Morris Jobke 57489f1013
Remove a check for an unused variable
Left over from a refactoring

https://github.com/nextcloud/server/pull/1940

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:13:57 +02:00
Morris Jobke 6a4a7c868c
Fix undefined variable - found by Phan
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:12:10 +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
blizzz af2ecbbd5a
Merge pull request #9647 from nextcloud/release/noid/theming-1.4.5-translations
[stable13] prepare another theming release including translations for recently added imprint and privacy policy strings
2018-05-29 14:37:23 +02:00
Morris Jobke b03752b1d9
Merge pull request #9620 from nextcloud/backport/9576/stable13
[stable13] Emit event when running ./occ db:add-missing-indices
2018-05-29 14:30:27 +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
Roeland Jago Douma c07f23ca72
Merge pull request #9629 from nextcloud/backport/9627/stable13
[stable13] Limit Sinon version to 5.0.7 at most
2018-05-28 13:27:34 +02: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
Daniel Calviño Sánchez fe93f0935b
Limit Sinon version to 5.0.7 at most
When using fake servers with Sinon.JS, the JavaScript test framework,
the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of
XMLHttpRequest was modified to normalize the header values (as requested
by the spec), but since then only string values are accepted; null or
integer values can no longer be passed to "setRequestHeader", as it
expects the "replace" function to be available in the object. However,
in the tests null and integer values are passed to "setRequestHeader",
which causes them to fail.

Both Firefox and Chromium accept passing non-string values to their
"setRequestHeader" implementation, and it is done, for example, in
davclient.js; it is not clear yet whether Sinon got too restrictive or
the code calling "setRequestHeader" was too loose. Given that
davclient.js is an external dependency, as a temporary measure Sinon
version is forced to be 5.0.7 at most until either Sinon or davclient.js
are updated.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-28 11:07:11 +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
Roeland Jago Douma dd5995a2f8
Emit event when running ./occ db:add-missing-indices
This allows apps to listen to this event in order to also update
indecies there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-28 09:04:59 +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 7249f73832
Merge pull request #9621 from nextcloud/backport/9418/stable13
[stable13] Add PHP missing message to index.php
2018-05-26 20:37:51 +02: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
Marius Blüm 5b846d0e48
Add PHP missing message to index.php
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-05-26 13:29:42 +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
Morris Jobke e2133ae2d8
Merge pull request #9590 from nextcloud/bug/9514/fix-settings-menu
[stable13] Fix settings menu
2018-05-24 18:14:12 +02:00
Morris Jobke 866568d4d2
Merge pull request #9579 from nextcloud/bugfix_stable13/noid/fix_force_language_html_attr
[stable13] make sure force language is reflected in html lang attribute
2018-05-24 17:59:58 +02:00
Morris Jobke cef2e190a1
Merge pull request #9586 from nextcloud/feature/9577/privacy-link
[stable13] add privacy link to theming and fix scrollbars
2018-05-24 17:57:25 +02:00
Julius Härtl d6bde6a281
Fix scope of nav css rule
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 16:43:38 +02: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 930c11a6cd
Always set the request language to the force language
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:08:10 +02:00
Georg Ehrke 0493d0e3fb
make sure force language is reflected in html lang attribute
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:07:54 +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
Morris Jobke fe20bb4b27
Merge pull request #9566 from nextcloud/backport/9395/stable13
[stable13] cleanup locks in scanner on error
2018-05-23 22:57:42 +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
Robin Appelman 874e312980
cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:05:54 +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
Morris Jobke 04ff701090
Merge pull request #9548 from remyj38/stable13
[stable13] Fix translation bug on lost password page
2018-05-22 21:58:53 +02:00
Julius Härtl c628b613b9
Merge pull request #9547 from nextcloud/bump/noid/theming
[stable13] bump theming version for extraordinary release
2018-05-22 21:44:43 +02:00
Rémy Jacquin 0b8908b8df
Fix translation bug on lost password page
Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin <remy@remyj.fr>
2018-05-22 18:43:27 +02: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
Morris Jobke bae5ec5cb0
Merge pull request #9525 from nextcloud/backport/8504/stable13
[stable13] Dont use $info as array when its not an array
2018-05-22 16:33:04 +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