Compare commits

...

4311 Commits

Author SHA1 Message Date
Morris Jobke b604bf2835 Merge pull request #10933 from nextcloud/version/noid/12.0.11
12.0.11
2018-08-30 13:18:21 +02:00
Morris Jobke bf470f5790 12.0.11
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-30 10:52:08 +02:00
Nextcloud bot 7f3b07657b [tx-robot] updated from transifex 2018-08-30 00:12:27 +00:00
Nextcloud bot 2c6e30b0e5 [tx-robot] updated from transifex 2018-08-29 00:12:25 +00:00
Nextcloud bot 2cadfc2933 [tx-robot] updated from transifex 2018-08-28 00:13:26 +00:00
Nextcloud bot 487dc0bf00 [tx-robot] updated from transifex 2018-08-27 00:12:32 +00:00
Nextcloud bot d57cccdb01 [tx-robot] updated from transifex 2018-08-26 00:12:51 +00:00
Nextcloud bot 29631a6386 [tx-robot] updated from transifex 2018-08-25 00:12:52 +00:00
Morris Jobke 6775889682 Merge pull request #10792 from nextcloud/version/noid/12.0.11RC1
12.0.11 RC 1
2018-08-24 10:47:46 +02:00
Morris Jobke 6f083c1428 12.0.11 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-24 10:17:50 +02:00
Morris Jobke 437aff40ec Update composer autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-24 10:17:50 +02:00
Nextcloud bot 8d0abdea76 [tx-robot] updated from transifex 2018-08-24 00:12:41 +00:00
Nextcloud bot 88ece8d11b [tx-robot] updated from transifex 2018-08-23 00:13:21 +00:00
Nextcloud bot 071271641f [tx-robot] updated from transifex 2018-08-22 00:12:32 +00:00
Nextcloud bot 30ef8768c4 [tx-robot] updated from transifex 2018-08-21 00:12:40 +00:00
Morris Jobke da6cacb951 Merge pull request #10566 from nextcloud/stable12-10348-fix-transfering-ownership-of-a-share-to-user-with-same-id-as-receiver
[stable12] Fix transfering ownership of a share to user with same id as receiver
2018-08-20 14:53:41 +02:00
Nextcloud bot af495122c1 [tx-robot] updated from transifex 2018-08-20 00:12:44 +00:00
Nextcloud bot 8603753d27 [tx-robot] updated from transifex 2018-08-18 00:12:53 +00:00
Nextcloud bot 041e0f0418 [tx-robot] updated from transifex 2018-08-16 00:12:42 +00:00
Nextcloud bot cfbe5bd92a [tx-robot] updated from transifex 2018-08-15 00:13:56 +00:00
Roeland Jago Douma dfe25bd081 Merge pull request #10683 from nextcloud/backport/10680/stable12
[stable12] Update the scope of the lockdownmanager
2018-08-14 14:29:58 +02:00
Roeland Jago Douma df9193a073 Update the scope of the lockdownmanager
We have the token anyway. So better the scope as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-14 13:16:45 +02:00
Nextcloud bot ee7802b54c [tx-robot] updated from transifex 2018-08-14 00:12:23 +00:00
Nextcloud bot 8e511713f5 [tx-robot] updated from transifex 2018-08-13 00:12:26 +00:00
Nextcloud bot e78d63a07d [tx-robot] updated from transifex 2018-08-11 00:12:46 +00:00
Nextcloud bot a057928869 [tx-robot] updated from transifex 2018-08-10 00:12:44 +00:00
Nextcloud bot 1124775dfd [tx-robot] updated from transifex 2018-08-08 00:13:35 +00:00
Daniel Calviño Sánchez ae90f3eb17 Fix transfering ownership of a share to user with same id as receiver
When the ownership of a user share is transfered to the receiver the
share is removed, as the receiver now owns the original file. However,
due to a missing condition, any share with a group, link or remote with
the same id as the user was removed, not only the user shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-07 09:30:08 +02:00
Nextcloud bot ae0473bff0 [tx-robot] updated from transifex 2018-08-07 00:12:22 +00:00
Nextcloud bot 0785eb5103 [tx-robot] updated from transifex 2018-08-06 00:12:37 +00:00
Nextcloud bot 72721a9e3d [tx-robot] updated from transifex 2018-08-05 00:12:45 +00:00
Nextcloud bot d66cd4eed3 [tx-robot] updated from transifex 2018-08-04 00:12:54 +00:00
Nextcloud bot de5d593656 [tx-robot] updated from transifex 2018-08-03 00:12:41 +00:00
Nextcloud bot 859c613515 [tx-robot] updated from transifex 2018-08-02 00:12:54 +00:00
Nextcloud bot 51412d7185 [tx-robot] updated from transifex 2018-08-01 00:12:17 +00:00
Nextcloud bot eb81891da6 [tx-robot] updated from transifex 2018-07-31 00:12:28 +00:00
Nextcloud bot 25e65b4135 [tx-robot] updated from transifex 2018-07-30 00:12:24 +00:00
Nextcloud bot 9f4303f9b1 [tx-robot] updated from transifex 2018-07-28 00:12:25 +00:00
Nextcloud bot 9a4cb41407 [tx-robot] updated from transifex 2018-07-27 00:12:37 +00:00
Nextcloud bot 00881853f2 [tx-robot] updated from transifex 2018-07-26 00:12:23 +00:00
Nextcloud bot 07508dcc39 [tx-robot] updated from transifex 2018-07-25 00:12:54 +00:00
Nextcloud bot 9366f6e4a3 [tx-robot] updated from transifex 2018-07-24 00:12:21 +00:00
Morris Jobke 1e935d7431 Merge pull request #10351 from nextcloud/version/noid/12.0.10
12.0.10
2018-07-23 13:01:20 +02:00
Morris Jobke 372d0d7a7e 12.0.10
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-23 10:54:25 +02:00
Nextcloud bot 85dbd7836a [tx-robot] updated from transifex 2018-07-23 00:12:22 +00:00
Nextcloud bot 5b76e832a3 [tx-robot] updated from transifex 2018-07-22 00:12:59 +00:00
Nextcloud bot 026ea6a8a6 [tx-robot] updated from transifex 2018-07-21 00:12:21 +00:00
Nextcloud bot 216a6c9c83 [tx-robot] updated from transifex 2018-07-20 00:12:26 +00:00
Nextcloud bot 1c8e32ba4e [tx-robot] updated from transifex 2018-07-19 00:12:22 +00:00
Nextcloud bot c87c91075c [tx-robot] updated from transifex 2018-07-18 00:12:23 +00:00
Nextcloud bot 1a053cc0bf [tx-robot] updated from transifex 2018-07-17 00:12:26 +00:00
Nextcloud bot 08a232a9c2 [tx-robot] updated from transifex 2018-07-16 00:12:28 +00:00
Nextcloud bot eaba32ebe0 [tx-robot] updated from transifex 2018-07-15 00:12:23 +00:00
Nextcloud bot 87e8b62ad5 [tx-robot] updated from transifex 2018-07-14 00:12:32 +00:00
Nextcloud bot 9de320171c [tx-robot] updated from transifex 2018-07-13 00:12:22 +00:00
Morris Jobke 3cbbc8f90f Merge pull request #10173 from nextcloud/version/noid/12.0.10RC1
12.0.10 RC 1
2018-07-12 13:37:05 +02:00
Morris Jobke ced87feafd 12.0.10 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-12 12:22:35 +02:00
Nextcloud bot 85733377f0 [tx-robot] updated from transifex 2018-07-12 00:13:00 +00:00
Morris Jobke 2e954f328b Merge pull request #10196 from nextcloud/backport/10193/sanitize-parameter-12
[stable12] Sanitize parameters in createSessionToken() while logging
2018-07-11 16:30:33 +02:00
Morris Jobke 87db9f8eab Sanitize parameters in createSessionToken() while logging
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 14:47:49 +02:00
Morris Jobke 080ed76433 Merge pull request #10187 from nextcloud/backport/10156/behat-3.3-12
[stable12] Fix the behat version to 3.3.*
2018-07-11 11:42:08 +02:00
Joas Schilling 14995483c1 Fix the behat version to 3.3.*
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:39:21 +02:00
Nextcloud bot 48649b9023 [tx-robot] updated from transifex 2018-07-11 00:12:33 +00:00
Nextcloud bot 9e9de18565 [tx-robot] updated from transifex 2018-07-10 08:21:38 +00:00
Morris Jobke fe945c91c7 Merge pull request #10167 from nextcloud/backport/10039/codecov-disabling-12
[stable12] Disable codecov status and comment
2018-07-09 15:51:21 +02:00
Morris Jobke 64e0a831e8 Disable codecov status and comment
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 15:31:23 +02:00
Nextcloud bot 25cab4971c [tx-robot] updated from transifex 2018-06-29 00:12:46 +00:00
Nextcloud bot 4db8b7175e [tx-robot] updated from transifex 2018-06-28 00:12:58 +00:00
Nextcloud bot 5db867efb0 [tx-robot] updated from transifex 2018-06-27 10:06:53 +00:00
Nextcloud bot c7e06af8e1 [tx-robot] updated from transifex 2018-06-27 00:12:29 +00:00
Nextcloud bot e94f404010 [tx-robot] updated from transifex 2018-06-26 00:12:47 +00:00
Nextcloud bot 470a8d97f5 [tx-robot] updated from transifex 2018-06-25 00:12:26 +00:00
Nextcloud bot 16698d81bd [tx-robot] updated from transifex 2018-06-24 00:12:44 +00:00
Nextcloud bot b42b1f82aa [tx-robot] updated from transifex 2018-06-23 00:13:24 +00:00
Nextcloud bot 97ee2875f6 [tx-robot] updated from transifex 2018-06-22 00:12:49 +00:00
Nextcloud bot 354519d93a [tx-robot] updated from transifex 2018-06-21 00:13:25 +00:00
Nextcloud bot bfd15ce2e9 [tx-robot] updated from transifex 2018-06-20 00:13:05 +00:00
Nextcloud bot 05838390de [tx-robot] updated from transifex 2018-06-19 00:13:34 +00:00
Nextcloud bot 7fd30dfc1d [tx-robot] updated from transifex 2018-06-18 00:13:12 +00:00
Nextcloud bot 01ef830645 [tx-robot] updated from transifex 2018-06-17 00:13:26 +00:00
Nextcloud bot bd6f9629a9 [tx-robot] updated from transifex 2018-06-16 00:13:52 +00:00
Nextcloud bot c40c558f4a [tx-robot] updated from transifex 2018-06-15 00:13:29 +00:00
Nextcloud bot 6b9ed20ea4 [tx-robot] updated from transifex 2018-06-14 00:13:46 +00:00
Nextcloud bot a17744b2a6 [tx-robot] updated from transifex 2018-06-13 00:13:41 +00:00
blizzz e95435bf0d Merge pull request #9845 from nextcloud/backport/9276/remove-unused-config-sample-12
[stable12] Remove unused config option
2018-06-12 23:34:23 +02:00
Morris Jobke 9170222034 Remove unused config option
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-12 22:29:06 +02:00
Morris Jobke 00db9ec05c Merge pull request #9842 from nextcloud/backport/9814/stable12
[stable12] Make the DELETION of groups match greedy on the groupID
2018-06-12 22:17:47 +02:00
Roeland Jago Douma da38f4a497 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-12 20:58:41 +02:00
Nextcloud bot 73ba8d4e15 [tx-robot] updated from transifex 2018-06-12 00:13:25 +00:00
Morris Jobke 94270e9332 Merge pull request #9822 from nextcloud/version/noid/12.0.9
12.0.9
2018-06-11 10:31:25 +02:00
Morris Jobke 434607a65b 12.0.9
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-11 09:48:08 +02:00
John Molakvoæ 07f5a2d448 Merge pull request #9804 from nextcloud/backport/9802/stable12
[stable12] Make the token expiration also work for autocasting 0
2018-06-11 09:17:29 +02:00
Nextcloud bot 2dc7696dda [tx-robot] updated from transifex 2018-06-11 00:13:19 +00:00
Nextcloud bot 489ce6b97b [tx-robot] updated from transifex 2018-06-10 00:13:39 +00:00
Nextcloud bot 8d65871083 [tx-robot] updated from transifex 2018-06-09 00:13:46 +00:00
Roeland Jago Douma a5a272e5d4 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:27:07 +02:00
Nextcloud bot 877bae5fdb [tx-robot] updated from transifex 2018-06-08 00:13:36 +00:00
Morris Jobke 42d3169e27 Merge pull request #9779 from nextcloud/version/noid/12.0.8
12.0.8
2018-06-07 11:52:24 +02:00
Morris Jobke 9414f401e4 12.0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-07 11:26:25 +02:00
Nextcloud bot 09cdf936d3 [tx-robot] updated from transifex 2018-06-07 00:13:26 +00:00
Nextcloud bot 7f3bc2bae3 [tx-robot] updated from transifex 2018-06-06 00:13:18 +00:00
Nextcloud bot 8ac01bb037 [tx-robot] updated from transifex 2018-06-04 00:13:08 +00:00
Nextcloud bot 785ed869b3 [tx-robot] updated from transifex 2018-06-03 00:13:30 +00:00
Nextcloud bot 78a494027a [tx-robot] updated from transifex 2018-06-02 00:13:11 +00:00
Morris Jobke 13920ec3df Merge pull request #9702 from nextcloud/version/noid/12.0.8RC1
12.0.8 RC 1
2018-06-01 14:08:32 +02:00
Morris Jobke b383c61eba Ping mysql version in CI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 13:47:13 +02:00
Morris Jobke 1e5f1bb6a3 12.0.8 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 12:38:02 +02:00
Morris Jobke da21b2a7ab Merge pull request #9611 from nextcloud/bugfix-stable12/3830/invitations_for_shared_calendars
[stable12] send invitations for shared calendars
2018-06-01 12:37:37 +02:00
Morris Jobke a55241cfe6 Merge pull request #9695 from nextcloud/backport/9692/stable12
[stable12] Make sure the log doesn't try to read from PUT if it can't
2018-06-01 12:17:23 +02:00
Nextcloud bot 3742d927ec [tx-robot] updated from transifex 2018-06-01 00:13:10 +00:00
Nextcloud bot 44524eeb13 [tx-robot] updated from transifex 2018-05-31 00:13:27 +00:00
Roeland Jago Douma c27722520c Make sure the log doesn't try to read from PUT if it can't
If a PUT request comes in that is not JSON or from encoded. Then we can
only read it (exactly) once. If that is the case we must assume no
shared secret is set.

If we don't then we either are the first to read it, thus causing the
real read of the data to fail.

Or we are later and then it throws an exception (also failing the
request).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 20:27:30 +02:00
Morris Jobke 475d9e15b6 Merge pull request #9660 from nextcloud/backport/9653/stable12
[stable12] The OAuth endpoint needs to support Basic Auth
2018-05-30 15:03:54 +02:00
Morris Jobke a98bfa8d87 Merge pull request #9669 from nextcloud/backport/9666/stable12
[stable12] Make sure the file is readable before attempting to create a preview
2018-05-30 11:42:24 +02:00
Morris Jobke 752b5d589b Merge pull request #9671 from nextcloud/drone-mysqlmb4-fix-stable12
[stable12] Fix drone mysqlmb4 tests
2018-05-30 09:14:28 +02:00
John Molakvoæ (skjnldsv) 9fde163fb5 Fix drone mysqlmb4 tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-30 08:58:18 +02:00
Nextcloud bot 158c577749 [tx-robot] updated from transifex 2018-05-30 00:12:51 +00:00
Roeland Jago Douma 8d596461d5 Make sure the file is readable before attempting to create a preview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 22:04:17 +02:00
Roeland Jago Douma e824973786 The OAuth endpoint needs to support Basic Auth
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 16:02:26 +02:00
Nextcloud bot 9fe202a811 [tx-robot] updated from transifex 2018-05-29 00:13:01 +00:00
Roeland Jago Douma 46a694513f Merge pull request #9630 from nextcloud/backport/9627/stable12
[stable12] Limit Sinon version to 5.0.7 at most
2018-05-28 13:28:13 +02:00
Daniel Calviño Sánchez f2385ae038 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:08:43 +02:00
Roeland Jago Douma 7a121f81b5 Merge pull request #9618 from nextcloud/backport/9515/stable12
[stable12] Regenerate session id after public share auth
2018-05-28 09:05:29 +02:00
Nextcloud bot fcabe26492 [tx-robot] updated from transifex 2018-05-28 00:13:23 +00:00
Nextcloud bot 550d100435 [tx-robot] updated from transifex 2018-05-27 00:13:51 +00:00
Roeland Jago Douma cb211f0434 Regenerate session id after public share auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-26 13:21:39 +02:00
Nextcloud bot 84988e4f89 [tx-robot] updated from transifex 2018-05-26 00:13:45 +00:00
Georg Ehrke cf3590f085 send invitations for shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-25 21:08:36 +02:00
Nextcloud bot 8cb7ce7b6e [tx-robot] updated from transifex 2018-05-25 00:15:36 +00:00
Morris Jobke e10c13271c Merge pull request #9580 from nextcloud/bugfix_stable12/noid/fix_force_language_html_attr
[stable12] make sure force language is reflected in html lang attribute
2018-05-24 18:00:39 +02:00
Roeland Jago Douma 4b8a9a37d6 Always set the request language to the force language
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:09:21 +02:00
Georg Ehrke 0dc1b3e741 make sure force language is reflected in html lang attribute
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:09:15 +02:00
Nextcloud bot b9584e1b25 [tx-robot] updated from transifex 2018-05-24 00:14:24 +00:00
Roeland Jago Douma 3ebed2b9e6 Merge pull request #9567 from nextcloud/backport/9395/stable12
[stable12] cleanup locks in scanner on error
2018-05-23 23:04:06 +02:00
Roeland Jago Douma 71bee1b3bd Merge pull request #9493 from nextcloud/upgrade-from-oc-10.0.8
Allow upgrades from ownCloud 10.0.8
2018-05-23 20:30:52 +02:00
Robin Appelman 7c8e34f8fd cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:06:34 +02:00
Morris Jobke 6b5fea40eb Merge pull request #9546 from nextcloud/backport/9517/stable12
[stable12] Improve OAuth
2018-05-23 19:03:38 +02:00
Roeland Jago Douma 3e57666093 Properly set expires to NULL when creating a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma c2f09e4395 Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 44735dedd1 Don't use special chars to avoid confusion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 335f4efa83 Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma c2a21ea464 Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma aa78c30666 Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 1525cc286c Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma f2a3115157 Certain tokens can expire
However due to the nature of what we store in the token (encrypted
passwords etc). We can't just delete the tokens because that would make
the oauth refresh useless.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Roeland Jago Douma 0885bd4ee5 Allow the rotation of tokens
This for example will allow rotating the apptoken for oauth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 17:02:15 +02:00
Nextcloud bot 9e657d0577 [tx-robot] updated from transifex 2018-05-23 00:16:27 +00:00
Morris Jobke 2c64557629 Merge pull request #9549 from remyj38/stable12
[stable12] Fix translation bug on lost password page
2018-05-22 21:58:27 +02:00
Rémy Jacquin 4130f279b2 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:47:16 +02:00
Nextcloud bot dc585de355 [tx-robot] updated from transifex 2018-05-22 00:14:15 +00:00
Nextcloud bot 114dc57233 [tx-robot] updated from transifex 2018-05-21 00:14:27 +00:00
Nextcloud bot 5a9e54ad59 [tx-robot] updated from transifex 2018-05-20 00:14:07 +00:00
Nextcloud bot d71fe374d3 [tx-robot] updated from transifex 2018-05-19 00:14:25 +00:00
Nextcloud bot 1bb9d3386a [tx-robot] updated from transifex 2018-05-18 00:14:33 +00:00
Nextcloud bot 1ee313e495 [tx-robot] updated from transifex 2018-05-17 00:14:31 +00:00
Morris Jobke cd303d8f05 Allow upgrades from ownCloud 10.0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-16 14:42:00 +02:00
Nextcloud bot ecef73b273 [tx-robot] updated from transifex 2018-05-14 00:14:12 +00:00
Nextcloud bot ce60ec91ff [tx-robot] updated from transifex 2018-05-13 00:13:45 +00:00
Nextcloud bot f777018ee7 [tx-robot] updated from transifex 2018-05-12 00:13:49 +00:00
Nextcloud bot b1d2ac5930 [tx-robot] updated from transifex 2018-05-11 00:13:45 +00:00
Nextcloud bot 5cfba894a2 [tx-robot] updated from transifex 2018-05-10 00:13:52 +00:00
Morris Jobke 7197e9f3b6 Merge pull request #9431 from nextcloud/stable12-9407
[12] Fix jsunit tests
2018-05-09 09:14:08 +02:00
Julius Härtl 32f24d5911 Fix jsunit tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-09 08:21:50 +02:00
Nextcloud bot 1ee5e9fec5 [tx-robot] updated from transifex 2018-05-09 00:12:12 +00:00
Nextcloud bot 8cf92eb099 [tx-robot] updated from transifex 2018-05-08 00:12:17 +00:00
Nextcloud bot 4b59182db1 [tx-robot] updated from transifex 2018-05-07 00:12:22 +00:00
Nextcloud bot 50ed772037 [tx-robot] updated from transifex 2018-05-06 00:12:26 +00:00
Nextcloud bot 81aaa585f8 [tx-robot] updated from transifex 2018-05-05 00:12:34 +00:00
Nextcloud bot ac5d083e8d [tx-robot] updated from transifex 2018-05-04 00:12:41 +00:00
Nextcloud bot 72cafdb9e2 [tx-robot] updated from transifex 2018-05-03 00:12:43 +00:00
John Molakvoæ 056f62d232 Merge pull request #9359 from nextcloud/stable12-9348
[stable12] Replace deprecated sinon reset() call with resetHistory()
2018-05-02 10:24:44 +02:00
Julius Härtl 02b0a32987 Replace deprecated sinon reset() call with resetHistory()
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-02 08:53:00 +02:00
Nextcloud bot 4234e0e09b [tx-robot] updated from transifex 2018-05-01 00:12:39 +00:00
Nextcloud bot df458d57d1 [tx-robot] updated from transifex 2018-04-30 00:12:32 +00:00
Nextcloud bot 0e56e05347 [tx-robot] updated from transifex 2018-04-29 00:12:34 +00:00
Nextcloud bot 90ac8542e1 [tx-robot] updated from transifex 2018-04-28 00:12:42 +00:00
Nextcloud bot f84eaa66dd [tx-robot] updated from transifex 2018-04-27 00:12:37 +00:00
Morris Jobke 67c057d8c8 Merge pull request #9301 from nextcloud/final-12.0.7
12.0.7
2018-04-26 09:33:12 +02:00
Nextcloud bot df3f4a7c00 [tx-robot] updated from transifex 2018-04-26 00:12:57 +00:00
Morris Jobke 997b120b26 12.0.7
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-25 15:21:22 +02:00
Nextcloud bot 3811ad589d [tx-robot] updated from transifex 2018-04-25 00:12:37 +00:00
Nextcloud bot 7f68966431 [tx-robot] updated from transifex 2018-04-24 00:12:42 +00:00
Nextcloud bot 26d92b3ffb [tx-robot] updated from transifex 2018-04-23 00:12:32 +00:00
Nextcloud bot b97eaf2291 [tx-robot] updated from transifex 2018-04-22 00:12:37 +00:00
Nextcloud bot a376ca0b00 [tx-robot] updated from transifex 2018-04-21 00:12:27 +00:00
Nextcloud bot 27abcbc4ec [tx-robot] updated from transifex 2018-04-20 00:12:49 +00:00
Morris Jobke 6435721b1d Merge pull request #9229 from nextcloud/12.0.7-RC1
12.0.7 RC 1
2018-04-19 11:09:50 +02:00
Nextcloud bot 8f259b3162 [tx-robot] updated from transifex 2018-04-19 00:12:40 +00:00
Morris Jobke b4d24aaaf8 12.0.7 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-19 00:45:48 +02:00
Roeland Jago Douma 1b1397b2eb Merge pull request #9232 from nextcloud/12-9205
[stable12] Provide an option to disable HTML emails
2018-04-19 00:34:59 +02:00
Morris Jobke 7f454fea8e Provide an option to disable HTML emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-18 22:53:37 +02:00
Roeland Jago Douma d39f00a1ed Merge pull request #8987 from nextcloud/backport/8821/show-eol-warning-12
[stable12] Show EOL warning in the update section
2018-04-18 21:12:57 +02:00
Roeland Jago Douma c433b3cf66 Merge pull request #9235 from nextcloud/12-9159
[stable12] Use multibyte substring
2018-04-18 21:12:33 +02:00
Roeland Jago Douma 5c6f916009 Use multibyte substring
Fixes #7661

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-18 17:36:57 +02:00
Joas Schilling 5f1f6330c9 Show EOL warning in the update section
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 13:50:29 +02:00
Nextcloud bot f7d6eb9ab6 [tx-robot] updated from transifex 2018-04-18 00:14:17 +00:00
blizzz 39da8e03b9 Merge pull request #9214 from nextcloud/12-update-crl
[stable12] Update CRL to include old quicknotes cert
2018-04-17 14:36:38 +02:00
Morris Jobke 99531bbc3d Update CRL to include old quicknotes cert
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-17 11:48:30 +02:00
Nextcloud bot 30bbfafec6 [tx-robot] updated from transifex 2018-04-17 00:13:52 +00:00
Nextcloud bot 42744b19fd [tx-robot] updated from transifex 2018-04-16 00:12:30 +00:00
Nextcloud bot 51fee9c2b5 [tx-robot] updated from transifex 2018-04-14 00:12:31 +00:00
Nextcloud bot 2d624ac2ae [tx-robot] updated from transifex 2018-04-13 00:12:33 +00:00
Nextcloud bot 8b5f49fd96 [tx-robot] updated from transifex 2018-04-12 00:20:08 +00:00
Nextcloud bot d2d17d8874 [tx-robot] updated from transifex 2018-04-11 00:22:19 +00:00
Nextcloud bot f88db01425 [tx-robot] updated from transifex 2018-04-10 00:12:56 +00:00
Nextcloud bot 8149add33d [tx-robot] updated from transifex 2018-04-09 00:12:47 +00:00
Nextcloud bot 3e11e98978 [tx-robot] updated from transifex 2018-04-08 00:12:47 +00:00
Nextcloud bot ede1fefdc8 [tx-robot] updated from transifex 2018-04-07 00:12:36 +00:00
Nextcloud bot 60d7087bb9 [tx-robot] updated from transifex 2018-04-06 00:15:10 +00:00
Roeland Jago Douma 5d698d5c38 Merge pull request #9088 from nextcloud/backport/9087/windows10_webdav_netdrive-12
[stable12] Allow usage of Windows 10 WebDav Netdrive
2018-04-05 14:51:28 +02:00
Roeland Jago Douma 2e6dc4240b Allow usage of Windows 10 WebDav Netdrive
Fixes #3523

As long as we don't have #8123 lets not leave our Window10 netdrive
users hanging.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-05 13:51:48 +02:00
Nextcloud bot 228811c24e [tx-robot] updated from transifex 2018-04-05 00:12:38 +00:00
Morris Jobke feda3dfd26 Merge pull request #9078 from nextcloud/autocomplet-new-password-for-links-12
[stable12] Set new-password as autocomplete on the link password
2018-04-04 22:04:40 +02:00
Roeland Jago Douma 959b2f753a Set new-password as autocomplete on the link password
Should fix #9049

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 20:53:38 +02:00
Morris Jobke c8602921b2 Merge pull request #9016 from nextcloud/smb-2.0.5-12
[12] update icewind/smb to 2.0.5
2018-04-04 14:17:55 +02:00
Nextcloud bot 4886e4c43a [tx-robot] updated from transifex 2018-04-04 00:14:15 +00:00
Nextcloud bot 604771a45d [tx-robot] updated from transifex 2018-04-03 00:12:35 +00:00
Nextcloud bot 560f878a2b [tx-robot] updated from transifex 2018-04-02 00:12:39 +00:00
Nextcloud bot 1c7adce900 [tx-robot] updated from transifex 2018-04-01 00:12:35 +00:00
Nextcloud bot ec0ceaaa05 [tx-robot] updated from transifex 2018-03-31 00:14:41 +00:00
Nextcloud bot 9216c0ba75 [tx-robot] updated from transifex 2018-03-30 00:12:27 +00:00
Nextcloud bot b6785ec686 [tx-robot] updated from transifex 2018-03-29 00:14:25 +00:00
Robin Appelman 83cd4ca3b4 update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:13:07 +02:00
Nextcloud bot 2adc67f00b [tx-robot] updated from transifex 2018-03-28 00:22:02 +00:00
Nextcloud bot 52d53cae43 [tx-robot] updated from transifex 2018-03-27 00:12:29 +00:00
Nextcloud bot af88431dec [tx-robot] updated from transifex 2018-03-26 00:14:05 +00:00
Nextcloud bot 874a928c13 [tx-robot] updated from transifex 2018-03-25 01:10:49 +00:00
Nextcloud bot ea46750111 [tx-robot] updated from transifex 2018-03-24 01:13:08 +00:00
Nextcloud bot 3477c22016 [tx-robot] updated from transifex 2018-03-23 01:12:18 +00:00
Nextcloud bot 580a5f7378 [tx-robot] updated from transifex 2018-03-22 01:12:32 +00:00
Nextcloud bot 38649198a4 [tx-robot] updated from transifex 2018-03-21 01:12:45 +00:00
Roeland Jago Douma 969d36f698 Merge pull request #8893 from nextcloud/8693_12
[stable12] Fix undefined index problem
2018-03-20 10:15:27 +01:00
michaelletzgus e1762998b3 Fix undefined index problem
Nextcloud 13RC4, error in logfile, triggered by "occ config:list":

Invalid argument supplied for foreach() at lib/private/AppConfig.php#297
PHP	Undefined index: workflowengine at lib/private/AppConfig.php#297

Fix: Check if index exists in array before using it.
2018-03-20 09:18:36 +01:00
Nextcloud bot ca162e71d7 [tx-robot] updated from transifex 2018-03-20 01:12:25 +00:00
Nextcloud bot 62846c3856 [tx-robot] updated from transifex 2018-03-19 01:12:26 +00:00
Nextcloud bot 7bbe429fe7 [tx-robot] updated from transifex 2018-03-18 01:12:36 +00:00
Nextcloud bot 86124f3a5d [tx-robot] updated from transifex 2018-03-17 01:12:15 +00:00
Roeland Jago Douma 0c501a89db Merge pull request #8850 from nextcloud/backport/8835/stable12
[stable12] group existence check works without attribute (like with users)
2018-03-16 14:25:01 +01:00
Arthur Schiwon c0ee3cdcc5 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:30:49 +01:00
Nextcloud bot e8dbfc1b08 [tx-robot] updated from transifex 2018-03-16 01:12:17 +00:00
Nextcloud bot 93b8a486dc [tx-robot] updated from transifex 2018-03-15 01:12:29 +00:00
Nextcloud bot 03a2ff6055 [tx-robot] updated from transifex 2018-03-14 01:12:18 +00:00
Morris Jobke b5e7676355 Merge pull request #8808 from nextcloud/final-12.0.6
[stable12] 12.0.6
2018-03-13 20:01:15 +01:00
Morris Jobke d4d6e38122 12.0.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 18:23:52 +01:00
Nextcloud bot 5ee08e8b7e [tx-robot] updated from transifex 2018-03-13 01:12:53 +00:00
Nextcloud bot 0601eaaf4d [tx-robot] updated from transifex 2018-03-12 01:13:11 +00:00
Morris Jobke 62ece696d6 Merge pull request #8772 from nextcloud/stable12-8594-add-acceptance-tests-for-permissions-on-public-shared-folders
[stable12] Add acceptance tests for permissions on public shared folders
2018-03-11 19:34:38 +01:00
Daniel Calviño Sánchez 1218cee069 Add acceptance tests for creation of subfolders in public shared folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 13:04:54 +01:00
Daniel Calviño Sánchez 6e41e0bda5 Extract common "wait for" functions to a helper class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 13:04:53 +01:00
Daniel Calviño Sánchez d757a19b9c Generalize file list steps so a specific ancestor can be used
The "FileListContext" provides steps to interact with and check the
behaviour of a file list. However, the "FileListContext" does not know
the right file list ancestor that has to be used by the file list steps,
so until now the file list steps were explicitly wired to the Files app
and they could be used only in that case.

Instead of duplicating the steps with a slightly different name (for
example, "I rename :fileName1 to :fileName2 in the public shared folder"
instead of "I rename :fileName1 to :fileName2") the steps were
generalized; now contexts that "know" that certain file list ancestor
has to be used by the FileListContext steps performed by certain actor
from that point on (until changed again) set it explicitly. For example,
when the current page is the Files app then the ancestor of the file
list is the main view of the current section of the Files app, but when
the current page is a shared link then the ancestor is set to null
(because there will be just one file list, and thus its ancestor is not
relevant to differentiate between instances)

A helper trait, "FileListAncestorSetter", was introduced to reduce the
boilerplate needed to set the file list ancestor from other contexts.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 12:58:13 +01:00
Daniel Calviño Sánchez 3c6a269138 Generalize file list locators so a specific ancestor can be used
The file list is used in other places besides the Files app (for
example, the File sharing app); in those cases the locators for the file
list elements are the same, but not for the ancestor of the file list.
To make possible to reuse the file list locators in those cases too now
they receive the ancestor to use.

Note that the locators for the file actions menu were not using an
ancestor locator because it is expected that there is only one file
actions menu at a time in the whole page; that may change in the future,
but for the time being it is a valid assumption and thus the ancestor
was not added to those locators in this commit.

Although the locators were generalized the steps themselves still use
the "FilesAppContext::currentSectionMainView" locator as ancestor; the
steps will be generalized in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 12:58:05 +01:00
Daniel Calviño Sánchez 292e95566e Store the name of the actor in the Actor object
This is needed to be able to easily use the actor as a key in an array.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 12:18:26 +01:00
Daniel Calviño Sánchez c62c7dda82 Extract file list locators and steps to its own class
Besides the extraction some minor adjustments (moving parametrized
locators like "fileActionsMenuItemFor" above the locators that use them
and placing "descendantOf" calls always in a new line) were made too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-11 12:17:18 +01:00
Nextcloud bot 0641a32443 [tx-robot] updated from transifex 2018-03-11 01:13:01 +00:00
Nextcloud bot 21aa8344d5 [tx-robot] updated from transifex 2018-03-10 01:12:46 +00:00
Morris Jobke 921a5ff3e6 Merge pull request #8750 from nextcloud/12.0.6-rc1
12.0.6 RC 1
2018-03-09 21:10:07 +01:00
Nextcloud bot 4943e15795 [tx-robot] updated from transifex 2018-03-09 13:32:21 +00:00
Morris Jobke 49b6e630b7 12.0.6 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 14:14:37 +01:00
Morris Jobke aee8381f21 Merge pull request #8726 from nextcloud/objectstore-no-part-files-12
[12]  disable part files for object stores
2018-03-09 14:06:52 +01:00
Roeland Jago Douma 6bd630d2ea Merge pull request #8739 from nextcloud/stable12-8728-better-handling-of-invisible-elements-in-acceptance-tests
[stable12] Better handling of invisible elements in acceptance tests
2018-03-09 08:32:03 +01:00
Daniel Calviño Sánchez a24b22e5a2 Add automatic handling of NoSuchElement exceptions
NoSuchElement exceptions are sometimes thrown instead of
StaleElementReference exceptions. This can happen when the Selenium2
driver for Mink performs an action on an element through the WebDriver
session instead of directly through the WebDriver element. In that case,
if the element with the given ID does not exist, a NoSuchElement
exception would be thrown instead of a StaleElementReference exception,
so those cases are handled like StaleElementReference exceptions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 02:24:58 +01:00
Daniel Calviño Sánchez 3da9c2067c Add automatic handling of MoveTargetOutOfBounds exceptions
MoveTargetOutOfBounds exceptions are sometimes thrown instead of
ElementNotVisible exceptions. This can happen when the Selenium2 driver
for Mink moves the cursor on an element using the "moveto" method of the
Webdriver session, for example, before clicking on an element. In that
case, if the element is not visible, "moveto" would throw a
MoveTargetOutOfBounds exception instead of an ElementNotVisible
exception, so those cases are handled like ElementNotVisible exceptions.

Note that MoveTargetOutOfBounds exceptions could be thrown too if the
element was visible but "out of reach"; there is no problem in handling
those cases as if the element was not visible, as the exception will be
thrown again anyway once it is verified that the element is indeed
visible.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 02:24:58 +01:00
Nextcloud bot c4a97a2144 [tx-robot] updated from transifex 2018-03-09 01:13:00 +00:00
Robin Appelman 550f9cafc8 emit pre-hooks earlier when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:43 +01:00
Robin Appelman 50162e619c disable part files for object stores
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:37 +01:00
Morris Jobke d0500f0b5b Merge pull request #8692 from nextcloud/stable12-add-missing-import
[stable12] Add missing import
2018-03-06 18:35:52 +01:00
Morris Jobke 36c9b12fd8 Merge pull request #8689 from nextcloud/12-7449
[stable12] Fix 500 on setup page
2018-03-06 18:00:40 +01:00
Daniel Calviño Sánchez a0d2d0c272 Add missing import
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-06 17:20:11 +01:00
Morris Jobke 6acc307aa3 Merge pull request #8679 from nextcloud/7707_12
[stable12] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:38:10 +01:00
Morris Jobke 95f067a613 Merge pull request #8682 from nextcloud/8474_12
[stable12] Log exceptions that happen when writing the app store reply to storage
2018-03-06 13:36:38 +01:00
Morris Jobke 51b79a5df4 Fix 500 on setup page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 13:28:31 +01:00
Morris Jobke 3d1730537a Merge pull request #8681 from nextcloud/8391_12
[stable12] Don't use double quotes in MySQL queries
2018-03-06 13:19:18 +01:00
Morris Jobke bcd01da517 Merge pull request #8677 from nextcloud/8297_12
[stable12] Fix example regex for user agent matching
2018-03-06 12:14:56 +01:00
Morris Jobke 72dc7520a4 Merge pull request #8674 from nextcloud/stable12-8634
[stable12] do not create empty userid when attribute does not have allowed chars
2018-03-06 12:03:27 +01:00
Joas Schilling 22b98ddd41 Log exceptions that happen when writing the app store reply to storage
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:28:40 +01:00
Robin Müller e359640899 Don't use double quotes in MySQL queries
MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier
quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes).
So for such databases the 'occ upgrade' fails with an error message like this:
... unknown column 'oc_*' in where clause.

This fix replaces the doulbe quotes with single quotes that should be always
used in MySQL queries to quote literal strings.

Signed-off-by: Robin Müller <robin.mueller@1und1.de>
2018-03-06 11:25:37 +01:00
Georg Ehrke 8b28e91dcb generate different UIDs for Birthday, Anniversary and Death event
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:21:16 +01:00
Joas Schilling 23f37cd741 Fix example regex for user agent matching
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:18:22 +01:00
Nextcloud bot ac8d572102 [tx-robot] updated from transifex 2018-03-06 01:13:03 +00:00
Arthur Schiwon 763a7c114f 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:20:09 +01:00
Morris Jobke 66cba3e01b Merge pull request #8611 from nextcloud/css-file-suffix-with-apps-versions-backport
[stable12] Use apps versions to generate suffix when possible
2018-03-05 15:05:14 +01:00
Roeland Jago Douma 2dc82d49e3 Merge pull request #8655 from nextcloud/stable12-8630
[stable12] use hash algo that's robust against collisions
2018-03-05 15:02:02 +01:00
Arthur Schiwon 9db6c7d9c2 use hash algo that's robust against collisions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 13:22:41 +01:00
Joas Schilling af8d300bd2 Merge pull request #8632 from nextcloud/stable12-8372
[12] Properly encapsulate require_once for app.php
2018-03-05 12:35:38 +01:00
Nextcloud bot d2283aaf17 [tx-robot] updated from transifex 2018-03-05 01:12:58 +00:00
Nextcloud bot 665e8fa6fa [tx-robot] updated from transifex 2018-03-04 01:13:33 +00:00
Nextcloud bot 18beec8ad8 [tx-robot] updated from transifex 2018-03-03 01:13:05 +00:00
Julius Härtl 251b21bb74 Add throws annotation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
Julius Härtl 4bd0a3fe4d Properly encapsulate require_once for app.php
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:17:44 +01:00
Joas Schilling c2db0f9d04 Merge pull request #8622 from nextcloud/12-8612
[stable12] Update commentstabview.js
2018-03-02 11:24:07 +01:00
rakekniven 829589b6ea 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:45:10 +01:00
Morris Jobke b031ead04b Merge pull request #8616 from nextcloud/stable12-8355
[stable12] Fix comments (and systemtags) when involving users with numerical ids
2018-03-02 10:35:18 +01:00
Nextcloud bot e225f9548b [tx-robot] updated from transifex 2018-03-02 01:13:08 +00:00
Arthur Schiwon 586e4c1340 backport of #8355 to stable12
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:32:48 +01:00
John Molakvoæ (skjnldsv) a7e7b874e4 Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-01 20:43:12 +01:00
Nextcloud bot ec18b5ee33 [tx-robot] updated from transifex 2018-03-01 01:13:01 +00:00
Nextcloud bot 22e9568664 [tx-robot] updated from transifex 2018-02-28 01:13:25 +00:00
Morris Jobke 6f4b6bea1c Merge pull request #8130 from nextcloud/fix-own-avatar-not-updated-when-display-name-is-changed
[stable12] Fix own avatar not updated when display name is changed
2018-02-27 18:40:42 +01:00
Julius Härtl 7c6b7b40ae Merge pull request #8549 from kyrofa/backport_12/8462/theming_app_outside_root
[stable12] theming: handle not being in the serverroot
2018-02-27 11:59:49 +01:00
Morris Jobke 710d1bba24 Merge pull request #8544 from nextcloud/allow-oc-upgrading
[stable12] Allow upgrading from OC 10.0.6 & 10.0.7
2018-02-27 09:07:20 +01:00
Nextcloud bot 73dd68802a [tx-robot] updated from transifex 2018-02-27 01:15:16 +00:00
Kyle Fazzari 401a2692e8 theming: handle not being in the serverroot
Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.

Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.

Fix #8462

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2018-02-26 10:14:57 -08:00
Morris Jobke bf2fb8f23b Allow upgrading from OC 10.0.6 & 10.0.7
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-26 16:43:33 +01:00
Morris Jobke ee010687ea Merge pull request #8537 from nextcloud/8522-stable12
[stable12] Fix retrieval of group members with numerical uids from LDAP
2018-02-26 15:09:54 +01:00
Arthur Schiwon 0b51ce66b3 fix retrieving group members with numerical uids from LDAP
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:39:48 +01:00
Arthur Schiwon 90a70fb4f5 tests for retrieving group members with numerical uids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:38:47 +01:00
Morris Jobke 1489474ee5 Merge pull request #8533 from nextcloud/8499-stable12
[stable12] don't try login with the same name that just failed
2018-02-26 12:28:01 +01:00
Arthur Schiwon cef195fc48 don't try login with the same name that just failed
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 11:01:07 +01:00
Roeland Jago Douma 4bf292b112 Merge pull request #8520 from nextcloud/stable12-8507
Add some whitespace around change.svg icon (stable12)
2018-02-24 16:26:06 +01:00
Roeland Jago Douma 4ca227577f Merge pull request #8516 from nextcloud/12-8502
[stable12] Show hint in OCS API for user creation
2018-02-24 16:25:17 +01:00
Nextcloud bot 730a68402d [tx-robot] updated from transifex 2018-02-24 01:13:07 +00:00
Marin Treselj 2692243460 Add some whitespace around change.svg icon (stable12)
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2018-02-23 11:19:08 +01:00
Morris Jobke 366ffb74dc Show hint in OCS API for user creation
* adds a 107 error code together with the hint of the exception
* logs the exception as warning
* fixes #7946

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-23 10:25:56 +01:00
Nextcloud bot 8687f809f3 [tx-robot] updated from transifex 2018-02-23 01:13:07 +00:00
Nextcloud bot 260cbfe36f [tx-robot] updated from transifex 2018-02-22 01:13:16 +00:00
Morris Jobke 0b21cabf10 Merge pull request #8205 from nextcloud/bugfix/noid/fix-result-size-when-searching-for-sharees
[stable12] Better result handling of email search
2018-02-21 15:44:41 +01:00
Nextcloud bot 5cbbf9c9b7 [tx-robot] updated from transifex 2018-02-21 01:12:58 +00:00
Nextcloud bot c635602809 [tx-robot] updated from transifex 2018-02-20 01:12:44 +00:00
Nextcloud bot 82d077df32 [tx-robot] updated from transifex 2018-02-19 01:12:43 +00:00
Nextcloud bot c07be4414e [tx-robot] updated from transifex 2018-02-18 01:12:53 +00:00
Morris Jobke 3ab9919cb5 Merge pull request #8408 from nextcloud/stable12-8376-devgals
[stable12] Fix edit tag textbox size
2018-02-17 15:38:27 +01:00
Aastha Gupta 39a5136929 Fix edit tag textbox size
Fixes #7586

Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
2018-02-17 16:02:14 +05:30
Nextcloud bot 245ededfb4 [tx-robot] updated from transifex 2018-02-17 01:12:55 +00:00
Nextcloud bot 14a36e3a2c [tx-robot] updated from transifex 2018-02-16 01:12:53 +00:00
Nextcloud bot 48c4328b06 [tx-robot] updated from transifex 2018-02-14 21:38:20 +00:00
Joas Schilling 7b31703407 Limit the number of results when searching for remotes and emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-14 16:48:39 +01:00
Nextcloud bot 363b1da044 [tx-robot] updated from transifex 2018-02-14 01:12:43 +00:00
Nextcloud bot b4c492ad07 [tx-robot] updated from transifex 2018-02-13 10:49:21 +00:00
Roeland Jago Douma 74bc89fc4d Merge pull request #8262 from nextcloud/s3-folder-delete-12
[12] Fix deleting folders when using s3 external storage
2018-02-13 07:45:14 +01:00
Nextcloud bot deeed1664f [tx-robot] updated from transifex 2018-02-12 21:34:26 +00:00
Robin Appelman 4c903e6b0d fix invalidating folder cache for s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-12 20:22:48 +01:00
Robin Appelman c84b290a17 adjust s3 bulk delete to new sdk syntax
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-12 20:22:48 +01:00
Nextcloud bot 966010f87f [tx-robot] updated from transifex 2018-02-09 15:29:41 +00:00
Morris Jobke 3b3a2c5bfd Merge pull request #8146 from nextcloud/12-unperl-l10n
[stable12] Remove old perl script to update l10n files
2018-02-09 09:58:35 +01:00
Morris Jobke 163bddb962 Merge pull request #8272 from nextcloud/12-8270
[stable12] Update CRL to revoke files_rightclick
2018-02-09 09:57:45 +01:00
Morris Jobke 77db2f102c Update CRL to revoke files_rightclick
See https://github.com/nextcloud/app-certificate-requests/pull/134

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-09 09:45:12 +01:00
Nextcloud bot 2b1e759ef4 [tx-robot] updated from transifex 2018-02-09 01:11:18 +00:00
Morris Jobke e4cd73554a Remove old perl script to update l10n files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 18:22:42 +01:00
Morris Jobke 08a13dde4a Merge pull request #8101 from nextcloud/s3-uploader-12
[12] Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:31:36 +01:00
Morris Jobke e328ced179 Merge pull request #8184 from robert-scheck/pki-validation-stable12
[stable12] Handle SSL certificate verifications for others than Let's Encrypt
2018-02-08 11:02:56 +01:00
Joas Schilling 3cfde4969f Merge pull request #8254 from nextcloud/12-8252
[stable12] Remove invalid link to documentation
2018-02-08 10:20:56 +01:00
Morris Jobke 2be70b1a65 Merge pull request #8216 from nextcloud/6830_12
Nextcloud 12 is not compatible with newer than php 7.1
2018-02-08 09:17:56 +01:00
Roeland Jago Douma 80bb01c26f Merge pull request #8251 from nextcloud/8233_12
[stable12] actually return stream from swift
2018-02-08 09:10:59 +01:00
Morris Jobke 342142cecb Remove invalid link to documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 08:48:30 +01:00
Robin Appelman ce4f74bec2 actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 08:12:51 +01:00
Nextcloud bot d36b9c7479 [tx-robot] updated from transifex 2018-02-08 01:10:51 +00:00
Joas Schilling c1165f6037 Merge pull request #8229 from nextcloud/dav-dir-exception-previous-12
[12] keep previous exception when transforming to dav exception
2018-02-07 17:07:47 +01:00
Robin Appelman dbc99e47ef keep previous exception when transforming to dav exception
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 14:44:32 +01:00
Roeland Jago Douma 88e4da2a83 Nextcloud 12 is not compatible with newer than php 7.1
Just to avoid users from trying this with a to new (untested) php version

* Moved the check logic to 1 place
* All directly callable scripts just require this on top
* exit hard (-1) so we know scripts won't continue
* Return status 500 so no sync clients will try fancy stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-07 13:38:37 +01:00
Nextcloud bot e2fddd29d1 [tx-robot] updated from transifex 2018-02-07 11:32:21 +00:00
Nextcloud bot 1a6f21d6d3 [tx-robot] updated from transifex 2018-02-07 01:10:47 +00:00
Morris Jobke 7e72a26dc7 Merge pull request #8196 from nextcloud/8160_12
[stable 12] Do not try to get the jailed path if we can't find the id
2018-02-06 14:21:11 +01:00
Roeland Jago Douma 10efe528ed Do not try to get the jailed path if we can't find the id
Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 12:21:27 +01:00
Nextcloud bot 3df8021406 [tx-robot] updated from transifex 2018-02-06 01:10:45 +00:00
Robert Scheck 38c12ca764 Handle SSL certificate verifications for others than Let's Encrypt
Do no longer (wrongly) rewrite URLs like

  * http://example.net/.well-known/pki-validation/file.txt (Comodo)
  * http://example.net/.well-known/pki-validation/fileauth.txt (DigiCert, Thawte, GeoTrust)
  * http://example.net/.well-known/pki-validation/gsdv.txt (GlobalSign)
  * http://example.net/.well-known/pki-validation/starfield.htm (Starfield, GoDaddy)
  * http://example.net/.well-known/pki-validation/swisssign-check.txt (SwissSign)

for automated SSL certificate verifications. All (common commercial)
certificate authorities (CA) except Let's Encrypt (via ACME) seem to
use "pki-validation" rather "acme-challenge" for their domain control
validation (DCV).

Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2018-02-05 15:39:13 +01:00
Nextcloud bot 6b4ddfd8b4 [tx-robot] updated from transifex 2018-02-05 01:10:41 +00:00
Nextcloud bot 2a7e629ca5 [tx-robot] updated from transifex 2018-02-04 01:10:51 +00:00
Nextcloud bot b63c93367f [tx-robot] updated from transifex 2018-02-03 01:10:55 +00:00
Morris Jobke 02fba904f4 Merge pull request #8152 from nextcloud/12-8150
[stable12] Update CRL because user_sql cert was lost
2018-02-02 13:34:47 +01:00
Morris Jobke f2e83c2999 Update CRL because user_sql cert was lost
* see https://github.com/nextcloud/app-certificate-requests/pull/129

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-02 12:01:29 +01:00
Nextcloud bot 26beb5b7f3 [tx-robot] updated from transifex 2018-02-02 01:10:40 +00:00
Nextcloud bot 6fe9d1b57b [tx-robot] updated from transifex 2018-02-01 18:28:32 +00:00
Nextcloud bot 4620eb8515 [tx-robot] updated from transifex 2018-02-01 17:20:21 +00:00
Nextcloud bot e6fef3b529 [tx-robot] updated from transifex 2018-02-01 01:11:19 +00:00
Daniel Calviño Sánchez 16b0b3f418 Fix own avatar not updated when display name is changed
The avatar endpoint returns the avatar image or, if the user has no
avatar, the display name. In that later case the avatar is generated on
the browser based on the display name. The avatar endpoint response is
cached, so when the display name changes and the avatar is got again the
browser could use the cached value, in which case it would use the same
display name as before and the avatar would not change.

When the avatar is an image the cache is invalidated with the use of
the "version" parameter, which is increased when the image changes. When
the avatar cache was first introduced only the image avatars were
cached, but it was later changed to cache all avatar responses to limit
the requests made to the server. Thus, now the cache of the display name
is invalidated too by increasing the version of the avatar if the
display name changes and there is no explicit avatar set.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-31 18:32:36 +01:00
Nextcloud bot 0809f2ad87 [tx-robot] updated from transifex 2018-01-31 01:11:16 +00:00
Nextcloud bot 2d04a1e1a9 [tx-robot] updated from transifex 2018-01-30 01:11:32 +00:00
Robin Appelman 8d5b86c159 Use S3Client::upload instead of splitting single/multipart upload ourselves
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 16:11:23 +01:00
Nextcloud bot 9eddb015c1 [tx-robot] updated from transifex 2018-01-29 01:11:18 +00:00
Morris Jobke bae874c9b6 Merge pull request #8074 from nextcloud/stable12-8069
[stable12] do not catch and ignore ServerNotAvailable in the wrong spot
2018-01-27 13:46:17 +01:00
Nextcloud bot 15551aafd1 [tx-robot] updated from transifex 2018-01-27 01:11:17 +00:00
Arthur Schiwon 23ffae497e do not catch ServerNotAvailable
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-26 15:38:48 +01:00
Nextcloud bot 355bc845ee [tx-robot] updated from transifex 2018-01-26 01:11:18 +00:00
Nextcloud bot c3aa2fcacc [tx-robot] updated from transifex 2018-01-25 01:11:30 +00:00
Morris Jobke 59a8cd3efc Merge pull request #8022 from nextcloud/fix-jquery-ui-theming
[stable12] Fix jquery-ui theming
2018-01-24 15:41:17 +01:00
Morris Jobke b42d8ca77d Merge pull request #7797 from nextcloud/stable12-7709-fix-password-displayed-as-username-in-password-manager
[stable12] Fix password displayed as username in Firefox password manager dialog
2018-01-24 15:33:04 +01:00
Morris Jobke f8da92d8fa Merge pull request #8006 from nextcloud/stable12-7292
[stable12] Fix #4789: Group admins cannot see disabled users
2018-01-24 14:19:33 +01:00
Julius Härtl add38859eb Fix jquery-ui theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-24 14:03:59 +01:00
Morris Jobke 42633b4d02 Merge pull request #8015 from nextcloud/final-12.0.5
Final 12.0.5
2018-01-24 10:35:25 +01:00
Morris Jobke 4e4f27b9a9 Final 12.0.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-24 09:59:05 +01:00
Nextcloud bot ef41c07543 [tx-robot] updated from transifex 2018-01-24 01:11:16 +00:00
Neraste 308891f9bd Fix #4789: Group admins cannot see disabled users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-23 16:07:23 +01:00
Robin Appelman 0e30a0dd01 increase the time we wait for smb notifications in the test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-23 09:55:02 +01:00
Nextcloud bot dd03cc577c [tx-robot] updated from transifex 2018-01-23 01:11:16 +00:00
Morris Jobke 74ee895cc7 Merge pull request #7981 from nextcloud/12.0.5-rc3-prep
12.0.5 RC3
2018-01-22 13:48:41 +01:00
Morris Jobke d095de5710 12.0.5 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-22 11:27:33 +01:00
Nextcloud bot c0806e5445 [tx-robot] updated from transifex 2018-01-22 01:11:06 +00:00
Nextcloud bot ae0641fccc [tx-robot] updated from transifex 2018-01-21 01:11:18 +00:00
Nextcloud bot ac4b9b745d [tx-robot] updated from transifex 2018-01-20 01:11:22 +00:00
Roeland Jago Douma e869828562 Merge pull request #7962 from nextcloud/smb-2.0.4-12
[12] update icewind/smb to 2.0.4
2018-01-19 20:23:51 +01:00
Robin Appelman 4803bd1f3f update icewind/smb to 2.0.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-19 16:30:26 +01:00
Nextcloud bot 8b8c796a31 [tx-robot] updated from transifex 2018-01-19 01:11:20 +00:00
Morris Jobke 533e59f1d5 Merge pull request #7937 from nextcloud/12.0.5-rc2-prep
12.0.5 RC2
2018-01-18 17:31:29 +01:00
Morris Jobke 4b707b5512 12.0.5 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 14:25:26 +01:00
Nextcloud bot 49aa99de7f [tx-robot] updated from transifex 2018-01-18 01:11:05 +00:00
Nextcloud bot 1e8a1a9400 [tx-robot] updated from transifex 2018-01-17 01:11:24 +00:00
Roeland Jago Douma 60fa75d2ec Merge pull request #7888 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors-12
[stable12] Keep all shipped apps enabled because they should be okay
2018-01-16 20:19:32 +01:00
Roeland Jago Douma 7a7e756b0e Merge pull request #7817 from nextcloud/stable12-7767
[stable12] Fix preview when theming changes invertion of icons
2018-01-16 19:18:56 +01:00
Joas Schilling c7485fa1ad Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 13:41:33 +01:00
Nextcloud bot a3059d0f1f [tx-robot] updated from transifex 2018-01-16 01:11:18 +00:00
Nextcloud bot cdbf584d37 [tx-robot] updated from transifex 2018-01-15 01:10:56 +00:00
Nextcloud bot 5e1d580010 [tx-robot] updated from transifex 2018-01-14 01:10:56 +00:00
Roeland Jago Douma 392cdd8cad Merge pull request #7821 from nextcloud/12-7818
[stable12] Log full exception in cron instead of only the message
2018-01-12 22:40:05 +01:00
Morris Jobke b61b357196 Log full exception in cron instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 15:34:16 +01:00
Julius Härtl 394f1d89d3 Fix appmenu svg double invert
This fixes a regression caused by 9b668d0, where the css filters to
preview color inversion of the app menu was applied by default. This
commit makes the css filters sensitive on what the current state of the
app menu is.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-12 14:35:44 +01:00
Nextcloud bot 0ce9a66920 [tx-robot] updated from transifex 2018-01-12 01:11:48 +00:00
Daniel Calviño Sánchez a99489d602 Add strengthify bar after plain text input clone of password input
To show the password in plain text "showPassword" adds a text input
after the password input and swaps their visibility depending on whether
the password has to be shown in plain text or not. In a similar way,
"strengthify" by default adds the strength bar after the input element
it was called on. Due to this, if "showPassword" is called before
"strengthify" on the same password input then the strength bar ends
between the password input and the text input, and when the text input
is shown it appears below the strength bar.

To fix this now the strength bar is added after the text input in those
places in which "strengthify" was called after "showPassword" on the
same element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 16:33:39 +01:00
Roeland Jago Douma 33c55fe5b4 Bump strengthify to 0.5.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-11 16:33:38 +01:00
Daniel Calviño Sánchez 43c8a2128f Fix password displayed as username in Firefox password manager dialog
When finishing the setup of Nextcloud through the WebUI (setting admin
user and database) Firefox offers to save the username and password.
However, the password was shown in both the username and password fields
of the Firefox password manager dialog.

The problem was that the password input element (in the HTML form) is
cloned in a text input element, which is used to show the password in
plain text when clicking on the "Show password" button. As it was a text
input immediately followed by a password input Firefox seemed to assume
that it had to be the username and ignored the real username field, no
matter the value set for the "autocomplete" attribute. Now the cloned
text input is added after the password input, so Firefox no longer
thinks that the cloned text input is the username field and the password
manager dialog shows the proper username instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 16:33:38 +01:00
Morris Jobke 2fa5466b6c Merge pull request #7792 from nextcloud/stable12-7783-fix-empty-details-view-after-renaming-a-file
[stable12] Fix empty details view after renaming a file
2018-01-11 15:07:21 +01:00
Daniel Calviño Sánchez a2ae7a52e9 Add acceptance test for renaming a file with the details view open
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 13:30:04 +01:00
Daniel Calviño Sánchez 217b711dbb Fix empty details view after renaming a file
"FileList._updateDetailsView" expects either a file name (as a string)
or a file model (as an "OCA.File.FileInfoModel"), but when called
through "updateInList" an "OC.Files.FileInfo" object was given instead.
As the given attribute was not a model "_updateDetailsView" treated it
as a file name and tried to get the model for that file, which failed
and caused the details view to be emptied.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 13:25:41 +01:00
Daniel Calviño Sánchez 65bba286b6 Move adding test files to "beforeEach()"
All the tests in the "Renaming files" section added the test files,
although those calling "doRename()" added them by setting a path for the
file too. However, the path is ignored in the other tests, so adding the
files can be unified and moved to "beforeEach()".

This would be needed, for example, to show the details view for a file
before calling "doRename()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-11 13:25:41 +01:00
Roeland Jago Douma 1fb3e38574 Merge pull request #7779 from nextcloud/12-7778
[stable12] Improve zip support
2018-01-11 12:43:03 +01:00
Roeland Jago Douma 505e60e74b Merge pull request #7786 from nextcloud/mount-type-federated-shares-stable12
return correct mount type for federated shares
2018-01-11 11:45:43 +01:00
Bjoern Schiessle 6634266946 return correct mount type for federated shares
fix https://github.com/nextcloud/server/issues/6584

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-11 10:22:04 +01:00
Nextcloud bot 5738662032 [tx-robot] updated from transifex 2018-01-11 01:11:50 +00:00
Morris Jobke 8d25bdea4c Improve zip support
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-10 16:25:39 +01:00
Morris Jobke cdb1894422 Merge pull request #7774 from nextcloud/smb-2.0.3-12
[12] update icewind/smb to 2.0.3
2018-01-10 15:58:26 +01:00
Morris Jobke af1fb350c6 Merge pull request #7770 from nextcloud/stable12-7756
[stable12] Fix SCSS processing when undoing theming values
2018-01-10 14:58:23 +01:00
Morris Jobke ea86250564 Merge pull request #7777 from nextcloud/stable12-7769
[stable12] Set height for sidebar icons
2018-01-10 14:43:28 +01:00
Julius Härtl 8df48d5ee5 Set height for sidebar icons
This makes sure they are properly scaled in IE11

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 13:57:37 +01:00
Robin Appelman d37e2d4507 update icewind/smb to 2.0.3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-10 12:18:35 +01:00
Julius Härtl 2cc2f31f30 Fix SCSS processing when undoing theming values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 10:25:13 +01:00
Nextcloud bot 02543c3650 [tx-robot] updated from transifex 2018-01-10 01:11:34 +00:00
Roeland Jago Douma 323dc4acb1 Merge pull request #7758 from nextcloud/12-7570
[stable12] add option to use legacy v2 auth with s3
2018-01-09 21:19:24 +01:00
Roeland Jago Douma e1e06bf38f Merge pull request #7759 from nextcloud/7712_12
[stable12] Use correct L10N files for jsconfig
2018-01-09 19:28:19 +01:00
Robin Appelman 4ec4a7df93 add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-09 18:21:47 +01:00
Morris Jobke e6f8869c2c Merge pull request #7757 from nextcloud/12-7605
[stable12] Wait for the shared link to be set in the acceptance tests
2018-01-09 18:10:31 +01:00
Roeland Jago Douma e2c77e46ab Use correct L10N files for jsconfig
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 16:09:57 +01:00
Daniel Calviño Sánchez fd9710bb44 Add missing timeout multiplier
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-09 15:58:24 +01:00
Roeland Jago Douma 4c92d096b8 Merge pull request #7740 from nextcloud/12.0.5-rc1-prep
12.0.5 RC1
2018-01-09 15:58:02 +01:00
Daniel Calviño Sánchez eb6a945332 Wait for the shared link to be set in the acceptance tests
When clicking on "Share link" in the "Sharing" tab of the Files app an
input field with the link appears. That input field already exists in
the DOM, although empty, before clicking on "Share link", and when that
is done the proper value is set and then the input field is shown.

In the acceptance tests "getValue()" can return the value of hidden
elements too, so as long as an element exists its value is returned
without waiting for the field to be visible. Due to this if the test
code runs too fast the "I write down the shared link" step could be
executed before the proper value was set, so the shared link got in that
case would be an empty value, and this would lead to failures when the
following steps were executed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-09 15:57:27 +01:00
Daniel Calviño Sánchez 41a52064c0 Fix typo in callback name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-09 15:57:23 +01:00
Morris Jobke f5a5be201c 12.0.5 RC1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-09 11:47:44 +01:00
Morris Jobke 1b43184aeb Merge pull request #7747 from nextcloud/composer_up_12
Update of composer
2018-01-09 11:45:37 +01:00
Morris Jobke 607f699259 Properly catch InvalidTokenException for better error response
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-09 11:44:52 +01:00
Morris Jobke db6b9fdb6a Merge pull request #7745 from nextcloud/7692_12
[stable12] Don't lie about preview types
2018-01-09 11:27:53 +01:00
Morris Jobke b089199141 Merge pull request #7708 from nextcloud/stable12-7599
[stable12] don't show recurring msg when pages result was turned off
2018-01-09 11:23:36 +01:00
Morris Jobke 25ba9cbe71 Merge pull request #7684 from nextcloud/backport-ie-fix-invert
[stable12] Fix inverted app icons on IE11
2018-01-09 11:22:54 +01:00
Morris Jobke 2f9d59535d Merge pull request #7674 from nextcloud/12_7644
[stable12] Do no run SyncJob in cron
2018-01-09 11:14:16 +01:00
Morris Jobke bbaa765d51 Merge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen
[stable12] Fix drag shadow not visible when dragging a file on a narrow screen
2018-01-09 11:12:15 +01:00
Morris Jobke 2df3864878 Merge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available
[stable12] Hide favourite icon in details view if favourite action is not available
2018-01-09 11:08:53 +01:00
Roeland Jago Douma 0a880e67cc Update of composer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 11:00:22 +01:00
Nextcloud bot e059e1d9d5 [tx-robot] updated from transifex 2018-01-09 01:11:29 +00:00
Roeland Jago Douma 1f875eca3c Merge pull request #7694 from nextcloud/stable12-7611
[stable12] Don't attempt to translate login names to uids when uids are provided
2018-01-08 21:10:11 +01:00
Roeland Jago Douma 87e99651f5 Only return 1 type
Throw proper exception if we can't get the mimetype for a preview. Catch
it later on so we can just return a not found for the preview.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 20:39:48 +01:00
Roeland Jago Douma 50b880edeb Don't lie about the preview mimetype
For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.

This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.

Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 20:39:39 +01:00
Daniel Calviño Sánchez 436ffaecb4 Hide favourite icon in details view if favourite action is not available
When the favourite icon in the details view is clicked the "Favorite"
action is triggered. However, if the action name given to
"triggerAction" is not found then the "Download" action is triggered
instead. As the "Favorite" action is not available in some file lists
(like "Recents") the "Download" action was executed instead in those
cases, which was a strange behaviour. Now the favourite icon is
hidden if its action is not available.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-08 17:44:55 +01:00
Nextcloud bot e23491dc42 [tx-robot] updated from transifex 2018-01-08 01:11:31 +00:00
Roeland Jago Douma 116e4e415e Merge pull request #7717 from nextcloud/stable12-7662
[stable12] throw ServerNotAvailableException when LDAP is caught shutting down
2018-01-07 11:40:18 +01:00
Nextcloud bot ea70bac9fb [tx-robot] updated from transifex 2018-01-07 01:11:25 +00:00
Nextcloud bot 27a4a8247c [tx-robot] updated from transifex 2018-01-06 01:11:22 +00:00
Arthur Schiwon 37c0352249 throw ServerNotAvailableException when LDAP is caught shutting down
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 20:36:30 +01:00
Morris Jobke 28d77efe80 Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
[Stable12] fix scss webroot and url rewrite
2018-01-05 17:29:08 +01:00
John Molakvoæ (skjnldsv) b95d18b85e Revert rebaseurl function edit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:35:38 +01:00
John Molakvoæ (skjnldsv) 7a282dee89 Rollback caching fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:34:32 +01:00
Julius Härtl 7bc63f6135 Fix faulty path in theming scss generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 08:17:39 +01:00
Nextcloud bot a3933b99fe [tx-robot] updated from transifex 2018-01-05 01:11:32 +00:00
Arthur Schiwon 0941781d1e don't show recurring msg when pages result was turned off
and only as debug level otherwise.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:29:22 +01:00
Arthur Schiwon 32597f8966 test adoption for stable12
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:10:10 +01:00
John Molakvoæ (skjnldsv) 1f2437e2c5 Fixup! Proberly detect variable changes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:11:41 +01:00
John Molakvoæ (skjnldsv) cf53560218 Proberly detect variable changes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:10:27 +01:00
John Molakvoæ (skjnldsv) fa95733b0d Fixed url rebase with theming
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 13:24:21 +01:00
Arthur Schiwon 7f0e4a5357 update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 13:16:05 +01:00
Arthur Schiwon e489a1a7c8 removes invalid tests, adapts another one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:49:29 +01:00
Arthur Schiwon 776d9e6805 never translate login names when requiring with a user id
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:31 +01:00
Arthur Schiwon c94c2c48a6 extend tests for status quo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:21 +01:00
Nextcloud bot 233fd16049 [tx-robot] updated from transifex 2018-01-04 09:48:45 +00:00
John Molakvoæ (skjnldsv) 51cc76b80d Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 08:35:38 +01:00
John Molakvoæ (skjnldsv) 1ae126a781 Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv) 9fa49c7f24 Correctly remove temp test directory tree
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv) 87b1839cd1 Added tests for various installations types
- With root installation
 - Core css
 - App inside server root
 - Secondary apps directory outside server root
- With an installation in a sub directory
 - Core css
 - App inside server root
 - Secondary apps directory outside server root

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) a46d45a652 Fixup! getWebdir return
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 89b6bc9424 Use OC_Util function for app web path
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 5008eb8f85 getWebDir function
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv) 00412d1c8c Fixed webroot for scss files
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:59 +01:00
John Molakvoæ (skjnldsv) f13b3b6651 Fixed scss url rewriting
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:08 +01:00
Julius Härtl 1d47410021 Fix height of table rows in apps management on IE11
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 17:12:16 +01:00
Julius Härtl b96278f855 Remove css invert since we are using svg filters for now
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:24:35 +01:00
Julius Härtl 630d5db2cd Fix icon rendering in apps management for IE11
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:22:58 +01:00
Julius Härtl a3b6f05722 Invert app icons on IE11 as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 15:22:54 +01:00
Roeland Jago Douma f9490505ad Merge pull request #7672 from nextcloud/backport/6977/log-censor
[stable12] Added additional methods for removal of sensitive info
2018-01-03 12:54:56 +01:00
Roeland Jago Douma ed5f66f11a Do no run SyncJob in cron
Fixes #7184

The SyncJob can be very resource intensive. Since it requests all users
on the system to create the system addressbook. In order to do this it
creates a vcard for every user and updates the addressbook.

There is no need for this job since the proper signals are emitted and
handled in the carddav backend to update the addressbook live.

Worst comes to worst there is always the occ command to bring the
address book in sync again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-03 10:58:16 +01:00
Joas Schilling 903d7fcd6a Unit tests for #6977
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-03 10:46:30 +01:00
Johannes Schlichenmaier a7e67a6ce2 Added additional methods for removal of sensitive info
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2018-01-03 10:46:04 +01:00
Daniel Calviño Sánchez 4d194b41f9 Fix drag shadow not visible when dragging a file on a narrow screen
When a file from the file list is dragged a drag shadow (a copy of the
file row that follows the cursor position) is created. The drag shadow
element is created as a direct child of the body element, so it needs a
higher "z-index" than the one used for the file list to be visible.

In narrow screens the "#app-content" uses a "z-index" of 1000 in order
to be visible over the "#navigation-bar" when they overlap, so the
"z-index" of the drag shadow must be at least 1000 to be visible over
the file list.

Instead of updating the hardcoded "z-index" it was removed and replaced
by CSS rules for ".dragshadow" elements to ease theming.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-02 16:12:47 +01:00
Morris Jobke 9ed0f50c25 Merge pull request #7567 from nextcloud/stable-12_fix7428
Respect sharing options when searching for Sharees
2017-12-20 14:18:33 +01:00
Roeland Jago Douma 4ed99dd54b Merge pull request #7577 from nextcloud/7361_12
[stable12] check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-19 15:51:32 +01:00
Arthur Schiwon e788ae0cf6 check userExists later, saves lookups for appData_INSTANCEID userids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-19 14:13:37 +01:00
Roeland Jago Douma fe9f100a1b Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token
[stable12] Fix duplicate session token after remembered login
2017-12-19 13:33:35 +01:00
Christoph Wurst 85c18f5980 Fix duplicate session token after remembered login
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-12-19 09:17:06 +01:00
Tobia De Koninck 7f18a8d19f Don't show users which e-mail address match if they belong to a group we may not share with
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-19 08:43:08 +01:00
Morris Jobke 6859e5a22a Merge pull request #7558 from nextcloud/12-7427
[stable12] Fix email buttons for white theme
2017-12-18 21:19:51 +01:00
Morris Jobke e726d191f1 Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 17:03:01 +01:00
Morris Jobke 3a99ef5286 Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12
[12] Allow getting the filepath when getting cached mounts by fileid
2017-12-13 13:28:25 +01:00
Morris Jobke 93797b2e5d Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12
allow 'Nextcloud' in the user agent string of Android
2017-12-12 15:44:55 +01:00
Bjoern Schiessle 1a4eab744e fix dav unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:49 +01:00
Bjoern Schiessle 003c709d25 allow 'Nextcloud' in the user agent string of Android
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:36 +01:00
Robin Appelman 3ec1bbbde8 Allow getting the filepath when getting cached mounts by fileid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:11:40 +01:00
Morris Jobke f44d5bde56 Merge pull request #7456 from nextcloud/12_7342
[stable12] CardDAV convertor check should not be to wide
2017-12-12 10:04:40 +01:00
Roeland Jago Douma 4b60ada694 Merge pull request #7457 from nextcloud/stable12-7271
[stable12] Fix loading icon position in the app menu
2017-12-12 07:50:40 +01:00
Morris Jobke 77b58aeb16 Merge pull request #7455 from nextcloud/12_7230
[stable12] Remove wrong entry in admin_settings that causes 500
2017-12-11 22:45:25 +01:00
Julius Härtl c023486845 Fix loading icon position in the app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-11 22:00:20 +01:00
Roeland Jago Douma dfed58e947 CardDAV convertor check should not be to wide
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 21:14:33 +01:00
Morris Jobke d41971184b Remove wrong entry in admin_settings that causes 500
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 21:04:56 +01:00
Morris Jobke 2bd2835526 Merge pull request #7451 from nextcloud/12-7433
[stable12] Fix constructor spy in unit test with Sinon 4.1.3
2017-12-11 17:25:36 +01:00
Daniel Calviño Sánchez 26cf16d67f Fix constructor spy in unit test with Sinon 4.1.3
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-11 16:49:39 +01:00
Nextcloud bot e4bf23ce7b [tx-robot] updated from transifex 2017-12-11 01:10:34 +00:00
Nextcloud bot 0ff717c600 [tx-robot] updated from transifex 2017-12-10 01:10:38 +00:00
Nextcloud bot 0c272f2121 [tx-robot] updated from transifex 2017-12-09 01:10:36 +00:00
Roeland Jago Douma ac29608db6 Merge pull request #7409 from nextcloud/swift-retry-12
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
Morris Jobke c9318ddd1b Merge pull request #7407 from nextcloud/12_7348
[stable12] Check if owner of share exists
2017-12-08 09:22:07 +01:00
Morris Jobke 5dd15c4a7d Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
Nextcloud bot 53fa7fb3c6 [tx-robot] updated from transifex 2017-12-08 01:10:26 +00:00
Nextcloud bot 8d89ec3c30 [tx-robot] updated from transifex 2017-12-07 01:10:49 +00:00
Robin Appelman 0519ca5893 add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
Roeland Jago Douma aedc59c636 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:49 +01:00
Roeland Jago Douma 7e6dd02441 A failed storage is a not available storage
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:43 +01:00
Nextcloud bot f3b9b213eb [tx-robot] updated from transifex 2017-12-06 01:10:37 +00:00
Nextcloud bot e04dd40516 [tx-robot] updated from transifex 2017-12-05 01:10:33 +00:00
Robin Appelman 4144580167 delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Morris Jobke 1cd5ba3e90 Merge pull request #7144 from nextcloud/rename-locks-stable12
Unlock files even if an exception occurs (stable12)
2017-12-04 11:13:19 +01:00
Morris Jobke b1b02d3b3a Merge pull request #7322 from nextcloud/12-6303
[stable12] Set primary action button color to same as theming color
2017-12-04 11:12:51 +01:00
Morris Jobke 18b464ac9f Merge pull request #7353 from nextcloud/12-7346
[stable12] Fix translation of federation scope menu
2017-12-04 11:12:32 +01:00
Morris Jobke ad08c1e76b Merge pull request #7362 from nextcloud/12-7347
[stable12] Allow to skip data dir permission checks by config
2017-12-04 11:06:01 +01:00
Morris Jobke c772810eca Merge pull request #7355 from nextcloud/12.0.4-final
Release 12.0.4
2017-12-04 08:17:45 +01:00
Nextcloud bot 8054f862a3 [tx-robot] updated from transifex 2017-12-04 01:10:42 +00:00
Nextcloud bot e87c35837f [tx-robot] updated from transifex 2017-12-03 01:10:35 +00:00
Nextcloud bot 26f8c3adfa [tx-robot] updated from transifex 2017-12-02 01:10:44 +00:00
Arthur Schiwon 17c13e4436 Allow to skip data dir permission checks by config
Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:55:29 +01:00
Nextcloud bot 3ee749d37f [tx-robot] updated from transifex 2017-12-01 01:10:32 +00:00
Morris Jobke d10ba72163 Release 12.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 16:25:04 +01:00
Morris Jobke 4b19c7a851 Fix translation of federation scope menu
* l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter
* we need to change the translation pool from `core` to `settings` then
* fixes #7345

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 13:25:28 +01:00
Nextcloud bot 8656462edb [tx-robot] updated from transifex 2017-11-30 01:13:31 +00:00
Nextcloud bot 0ba10fa5f9 [tx-robot] updated from transifex 2017-11-29 01:10:26 +00:00
Morris Jobke aeae9aefe9 Merge pull request #7330 from nextcloud/1204-rc3
12.0.4 RC3
2017-11-28 20:21:47 +01:00
Morris Jobke b931987cb8 12.0.4 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-28 20:19:23 +01:00
Morris Jobke 90feccf4be Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss
[stable12]  Only in case of $currentAccess the array uses the id as index
2017-11-28 20:16:32 +01:00
Joas Schilling 76a2fb0231 Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:19 +01:00
Joas Schilling 3cbd6509e0 Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:12 +01:00
Robin Appelman 6d8de960c9 Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
Jan-Christoph Borchardt 1a18b48037 Set primary action button color to same as theming color
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-28 13:50:57 +01:00
Nextcloud bot 036eae6956 [tx-robot] updated from transifex 2017-11-28 01:10:05 +00:00
Roeland Jago Douma ee69dc128a Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2
Prepare 12.0.4 RC2
2017-11-27 10:09:30 +01:00
Roeland Jago Douma 7e1ca611f8 Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
[stable12] CSSResourceLocator: handle SCSS in apps outside root
2017-11-27 10:08:27 +01:00
Nextcloud bot 298b0d67d8 [tx-robot] updated from transifex 2017-11-27 01:10:03 +00:00
Nextcloud bot a6b3fcae8f [tx-robot] updated from transifex 2017-11-25 01:10:10 +00:00
Lukas Reschke 62b7378331 Merge pull request #7277 from nextcloud/12-7268
[stable12] Update CRL due to files_frommail
2017-11-24 14:40:36 +01:00
Morris Jobke a1c76cc8bf Update CRL due to files_frommail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:11:09 +01:00
Nextcloud bot e94ba32255 [tx-robot] updated from transifex 2017-11-24 01:10:06 +00:00
Morris Jobke b901f8b0c8 Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid
[stable12] Fix accesslist when a user has an ID only containting 0-9
2017-11-23 13:54:46 +01:00
Morris Jobke 59657542ca Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup-oc-release
Allow migration from upcoming 10.0.4 ownCloud release
2017-11-23 13:46:08 +01:00
Joas Schilling 6978128b48 Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-23 13:19:55 +01:00
Morris Jobke 8019afb9d5 Prepare 12.0.4 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 13:02:20 +01:00
Morris Jobke 4a4cf2613c Merge pull request #7259 from nextcloud/7211-stable12
[stable12] only replace permission popupmenu
2017-11-23 13:00:37 +01:00
Arthur Schiwon 9383889314 only replace permission popupmenu
the contacts popovermenu is also present and is being replaces, ending
up in two permission popupmenus with checkboxes duplicating the id,
breaking further permission changes.

plus, fixing a selector

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 12:08:29 +01:00
Kyle Fazzari 7f8f3dc21b CSSResourceLocator: handle SCSS in apps outside root
Currently static CSS files work fine in apps outside of the root.
However, as soon as an app uses SCSS, Nextcloud starts being unable to
find the web root.

Fix this problem by backporting select snippets from master
specifically targeting this issue, and add a test to ensure it doesn't
regress.

Fix #5289

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-22 21:41:40 -08:00
Nextcloud bot fd46475f6e [tx-robot] updated from transifex 2017-11-23 01:09:59 +00:00
Joas Schilling 2c11d62adf Allow migration from upcoming 10.0.4 ownCloud release
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-22 14:06:07 +01:00
Nextcloud bot 44d6fe99ef [tx-robot] updated from transifex 2017-11-22 01:10:22 +00:00
Nextcloud bot 6b189ba1ee [tx-robot] updated from transifex 2017-11-21 01:10:20 +00:00
Roeland Jago Douma b8d3577b92 Merge pull request #7225 from nextcloud/12.0.4RC-version
12.0.4 RC
2017-11-20 12:59:47 +01:00
Roeland Jago Douma 6bfeec049e Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath
[stable12] {J,CS}SResourceLocator: account for symlinks in app path
2017-11-20 12:58:10 +01:00
Morris Jobke f6573ca72e 12.0.4 RC
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 12:14:12 +01:00
Nextcloud bot 9583910104 [tx-robot] updated from transifex 2017-11-20 01:09:53 +00:00
Nextcloud bot 54dcd70dae [tx-robot] updated from transifex 2017-11-19 01:10:04 +00:00
Nextcloud bot ccf4f87441 [tx-robot] updated from transifex 2017-11-18 01:10:56 +00:00
Björn Schießle d9cea2fb61 Merge pull request #7207 from nextcloud/fix-object-storage-touch-12
[stable12] touch opertation on object storage, don't create the file cache entry to early
2017-11-17 14:48:53 +01:00
Bjoern Schiessle 83ef3d2411 only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-17 12:46:52 +01:00
Björn Schießle 031bde5c88 Merge pull request #7186 from nextcloud/s3-download-stream-fix-12
[12] Fix s3 download and touch
2017-11-17 12:44:40 +01:00
Nextcloud bot 9942c39e64 [tx-robot] updated from transifex 2017-11-17 01:10:03 +00:00
Nextcloud bot fec4e3947e [tx-robot] updated from transifex 2017-11-16 01:10:03 +00:00
Robin Appelman e041c7a92f Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:47 +01:00
Robin Appelman a21f2c2813 Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:43 +01:00
Nextcloud bot 2d8d248d28 [tx-robot] updated from transifex 2017-11-15 01:10:00 +00:00
Kyle Fazzari 697774112f {J,CS}SResourceLocator: account for symlinks in app path
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-14 09:22:33 -08:00
Nextcloud bot 82e4d9b9cc [tx-robot] updated from transifex 2017-11-14 01:09:59 +00:00
Nextcloud bot b1ac0b6198 [tx-robot] updated from transifex 2017-11-13 01:10:31 +00:00
Nextcloud bot faabc3594d [tx-robot] updated from transifex 2017-11-12 01:10:15 +00:00
korelstar f907cdc09d Unlock files even if an exception occurs
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-11 13:25:28 +01:00
Nextcloud bot 097e8a4994 [tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
blizzz 14986e0f5c Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
[stable12] Improve text: 'you have now' -> 'you now have'
2017-11-10 15:48:37 +01:00
Nextcloud bot 5e14b64c55 [tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Morris Jobke 20e5220103 Merge pull request #7120 from nextcloud/12-6988
[stable12] Improve performance of UserMountCache with external storage folders
2017-11-09 17:16:00 +01:00
Roeland Jago Douma ab69cea7b2 Merge pull request #7116 from nextcloud/12-fix-6033
[stable12] Fix icon for security settings
2017-11-09 11:37:38 +01:00
Roeland Jago Douma 531ab6f8aa Merge pull request #7118 from nextcloud/12-7109
[stable12]  If for some reason the json can't be decoded it is not cached
2017-11-09 11:02:25 +01:00
Nextcloud bot 656ea773e1 [tx-robot] updated from transifex 2017-11-09 09:12:53 +00:00
Dariusz Olszewski b9898c5b87 Improve performance of UserMountCache with external storage folders
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:07:27 +01:00
Roeland Jago Douma 9cbb39511f If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-09 09:50:57 +01:00
Morris Jobke c91515cfed Merge pull request #6847 from nextcloud/filelist-confict-path-12
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
Morris Jobke d8cf19b258 Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:28:29 +01:00
Morris Jobke 4bea740775 Fix icon for security settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:13:31 +01:00
Nextcloud bot 69e61b2892 [tx-robot] updated from transifex 2017-11-09 01:09:28 +00:00
Morris Jobke a90db1d325 Merge pull request #7114 from nextcloud/12-7110
[stable12] theme flow redirection page
2017-11-08 22:35:19 +01:00
Julius Härtl fa380c0b53 Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 21:20:26 +01:00
Morris Jobke 7e92bcdbb4 Merge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons-for-ipv6
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
2017-11-08 10:33:35 +01:00
Nextcloud bot 98b012d545 [tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Morris Jobke e97a58793d Revert "[stable12] Only allow colons in db host for IPv6 addresses" 2017-11-08 00:42:34 +01:00
Lukas Reschke 4d117a5e23 Merge pull request #7096 from nextcloud/backport-stable12-7042
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
Robin Appelman fe6b4d432b never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
Robin Appelman e51acfc717 still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
Morris Jobke 70e20727e5 Merge pull request #6699 from nextcloud/backport-6522-stable12
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
Morris Jobke 103bc3ea5d Merge pull request #7095 from nextcloud/12-7059
[stable12] hide spinner for initial install
2017-11-07 13:51:20 +01:00
Georg Ehrke 3059191444 ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
Kyle Fazzari 653c385d62 core: hide spinner for initial install
core/js/setup.js has logic to show the spinner upon form submission, but
ever since v12 was released the spinner was never hidden in the first
place.

Modify core/css/guest.css to hide it, which allows core/js/setup.js to
do its thing.

Fix #5532

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 13:07:07 +01:00
Nextcloud bot 0756fc0893 [tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Morris Jobke 3cc7c03ddb Merge pull request #7082 from nextcloud/12-6974
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
Morris Jobke 8a8e76561b Merge pull request #7081 from nextcloud/12-6958
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
Morris Jobke d459351ce2 Fix seeking on object storage
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:28:39 +01:00
Morris Jobke f9e29d09b5 Merge pull request #7079 from nextcloud/s3-read-object-fopen-stable12
use fopen directly when reading objects from s3
2017-11-06 15:26:16 +01:00
Morris Jobke 21b8399e88 Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 15:23:35 +01:00
Robin Appelman 1ed9a25ae8 use fopen directly when reading objects from s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-06 10:39:52 +01:00
Nextcloud bot e873b1a3d1 [tx-robot] updated from transifex 2017-11-06 01:09:19 +00:00
Nextcloud bot 0b25217ba6 [tx-robot] updated from transifex 2017-11-05 01:09:07 +00:00
Nextcloud bot 270b16a4a2 [tx-robot] updated from transifex 2017-11-04 01:09:10 +00:00
Nextcloud bot 43341833fd [tx-robot] updated from transifex 2017-11-03 01:09:18 +00:00
Nextcloud bot 8b1417a269 [tx-robot] updated from transifex 2017-11-02 01:11:03 +00:00
Joas Schilling c04576ab1b Merge pull request #7040 from nextcloud/7039_12
[stable12] Translate Grant Access
2017-11-01 21:30:55 +01:00
Roeland Jago Douma 1ff6f67474 Translate Grant Access
Fixes #7038

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-01 20:48:49 +01:00
Nextcloud bot 52b31a09ef [tx-robot] updated from transifex 2017-11-01 01:08:55 +00:00
Jan-Christoph Borchardt 2bf0c70d63 Merge pull request #7028 from nextcloud/stable12-login-readability
[stable12] Better readability for text on log in page which is directly on backgrounds
2017-10-31 18:15:20 +01:00
Joas Schilling 2857d784e9 Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3
Allow to migrate from 10.0.3.3
2017-10-31 14:47:34 +01:00
Jan-Christoph Borchardt 1f280bd59f Better readability for text on log in page which is directly on backgrounds
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-31 14:17:24 +01:00
Nextcloud bot 00ffed5a19 [tx-robot] updated from transifex 2017-10-31 01:08:41 +00:00
Morris Jobke 0ce718796e Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
#6307 fix page title not changed (stable12)
2017-10-30 12:58:17 +01:00
Nextcloud bot 76ede89b6b [tx-robot] updated from transifex 2017-10-30 01:08:44 +00:00
Nextcloud bot e20c4c6a71 [tx-robot] updated from transifex 2017-10-29 00:08:41 +00:00
Nextcloud bot 09a0048f77 [tx-robot] updated from transifex 2017-10-28 00:08:41 +00:00
Bernd Stellwag 8eb47de969 bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Bernd Stellwag bf3f86f1ff bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
Nextcloud bot 85f612c819 [tx-robot] updated from transifex 2017-10-27 00:08:39 +00:00
Nextcloud bot f7ac152a6c [tx-robot] updated from transifex 2017-10-26 00:08:49 +00:00
Morris Jobke 7ec5689d0e Merge pull request #6935 from nextcloud/12-5780
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
Morris Jobke 5097e698e1 Merge vendor/core.js
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 14:42:20 +02:00
Morris Jobke 9c3f6a7ca0 Merge pull request #6944 from nextcloud/12-6433
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
Morris Jobke aab0c3f18e Merge pull request #6946 from nextcloud/12-6574
[stable12] Fix undefined offset warning when using '/' as external storage root
2017-10-25 14:33:20 +02:00
Joas Schilling aef69efe2e Merge pull request #6942 from nextcloud/12-6826
[stable12] Fix class name in exception logger plugin
2017-10-25 11:51:24 +02:00
blizzz 469285a505 Merge pull request #6943 from nextcloud/12-6758
[stable12] Allow quota of 0 again
2017-10-25 11:41:39 +02:00
Roeland Jago Douma 27e8352ef1 Merge pull request #6945 from nextcloud/12-6633
[stable12] Don't add a LIKE condition when it's not needed
2017-10-25 08:53:37 +02:00
Nextcloud bot 5bd0bde89d [tx-robot] updated from transifex 2017-10-25 00:08:56 +00:00
Robin Appelman f301b12c7b Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-25 01:45:25 +02:00
Thomas Citharel 8c56f93124 Don't add a LIKE condition when it's not needed
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-10-25 01:42:51 +02:00
William Pain cfbc0c8141 Fix uninitialized variable $this->params
Signed-off-by: William Pain <pain.william@gmail.com>
2017-10-25 01:32:59 +02:00
Joas Schilling 968a1bf9ae Allow quota of 0 again
Regression from f1fccaca06

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:30:26 +02:00
Joas Schilling 89d4e1f2ab Use ::class to avoid errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:59 +02:00
Joas Schilling 572f246b78 Fix class name, regression from 44cf67accd
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 01:23:55 +02:00
Morris Jobke d3916b2170 Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:11:05 +02:00
rakekniven 59fc88650c Update file-upload.js
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-24 17:34:49 +02:00
Morris Jobke 293a3d578f Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:34:31 +02:00
Nextcloud bot 895336a3f3 [tx-robot] updated from transifex 2017-10-24 00:08:57 +00:00
Morris Jobke ad66244bdf Merge pull request #6910 from nextcloud/backport-6677-s12
[stable12]  don't reset quota
2017-10-23 07:46:49 -07:00
Morris Jobke aaad2ab6b0 Merge pull request #6896 from nextcloud/12-timespan-check
[12] timespan check
2017-10-23 07:45:53 -07:00
Morris Jobke 9b41236d4a Provide tests for future timestamp formatting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 15:42:14 +02:00
Morris Jobke 35c1540984 Merge pull request #6908 from nextcloud/6132-12
[stable12] Do not log WebDAV maintenance mode exception
2017-10-23 03:41:11 -07:00
Arthur Schiwon 791fa6905f and add missing whitespaces to log outout
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:32 +02:00
Juan Pablo Villafáñez b8afb84b18 Adjust unittest
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:27 +02:00
Juan Pablo Villafáñez 18c35a7ab0 Keep the current quota if no suitable quota is found
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 12:28:19 +02:00
Morris Jobke 5c53b162ed Do not log WebDAV maintenance mode exception
Log the maintenance mode exception only in debug level. Fixes #6124

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 11:24:07 +02:00
Nextcloud bot e70135bcbf [tx-robot] updated from transifex 2017-10-23 00:08:49 +00:00
dartcafe 58f900f380 Correction
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:46:18 +02:00
dartcafe 917e996dda Fix future time spans
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-22 07:26:52 +02:00
Nextcloud bot bc19a8b193 [tx-robot] updated from transifex 2017-10-22 00:08:45 +00:00
Nextcloud bot 1c488aae8a [tx-robot] updated from transifex 2017-10-21 00:08:36 +00:00
Nextcloud bot 5d2c6233a9 [tx-robot] updated from transifex 2017-10-20 00:08:44 +00:00
Joas Schilling 2d1929cb1e Allow to migrate from 10.0.3.3
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 16:59:54 +02:00
Nextcloud bot e8c217ed4f [tx-robot] updated from transifex 2017-10-19 00:08:38 +00:00
Nextcloud bot 8b0842f020 [tx-robot] updated from transifex 2017-10-18 00:08:33 +00:00
Roeland Jago Douma 4419aee908 Merge pull request #6855 from nextcloud/s3-multipart-propagate-exception-12
[12] propagate multipart upload exception when aborting upload
2017-10-17 20:42:30 +02:00
Robin Appelman 74b43f1d7d propagate multipart upload exception when aborting upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:19:40 +02:00
Bjoern Schiessle 7aaf12b37d fix url
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-10-17 11:27:06 +02:00
Nextcloud bot ea269db6d6 [tx-robot] updated from transifex 2017-10-17 00:08:33 +00:00
Nextcloud bot e6000abdd6 [tx-robot] updated from transifex 2017-10-16 00:08:36 +00:00
Roeland Jago Douma 51ed66fb26 Merge pull request #6814 from nextcloud/upload-cache-path-12
[12] also use configured 'cache_path' for new chunking
2017-10-15 21:43:03 +02:00
Roeland Jago Douma d57557774e Merge pull request #6815 from nextcloud/s3-multipart-upload-part-size-12
[12] set s3 part size to 500mb
2017-10-15 21:41:15 +02:00
Roeland Jago Douma 6e3ec7d911 Merge pull request #6774 from nextcloud/backport-6645-only-colons-for-ipv6
[stable12] Only allow colons in db host for IPv6 addresses
2017-10-15 21:40:04 +02:00
Nextcloud bot 95bd9d4c64 [tx-robot] updated from transifex 2017-10-14 02:29:15 +00:00
Roeland Jago Douma 21f5f0267f Merge pull request #6823 from nextcloud/stable12-fix/contactsmenu-ie11
[stable12] Fix contacts menu for IE11
2017-10-13 19:54:05 +02:00
Nextcloud bot 7762130869 [tx-robot] updated from transifex 2017-10-13 00:08:37 +00:00
Christoph Wurst 0c7d745074 Fix contacts menu for IE11
IE11 triggers an 'input' event whenever an input is focussed
or loses focus. Thus this causes an endless loading loop as soon
as the view is re-rendered. To prevent this, this remembers the
previous search term and ignores events where the term has not
changed.

Fixes https://github.com/nextcloud/server/issues/5281

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-10-12 16:26:01 +02:00
Nextcloud bot 513432f966 [tx-robot] updated from transifex 2017-10-12 00:08:38 +00:00
Robin Appelman e2a25d5caf set s3 part size to 500mb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 16:01:04 +02:00
Robin Appelman 1c315a2a8a also use configured 'cache_path' for new chunking
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:27:02 +02:00
Nextcloud bot 980ba0e904 [tx-robot] updated from transifex 2017-10-11 00:08:40 +00:00
Nextcloud bot c14beb8ee5 [tx-robot] updated from transifex 2017-10-10 00:08:41 +00:00
Robin Appelman 8f88755f57 update 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 18:11:30 +02:00
Robin Appelman df2fa2fce2 Merge pull request #6737 from nextcloud/aws-sdk-12
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
Robin Appelman 239f561ab2 Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:44 +02:00
Robin Appelman 6fee4232ee only do multipart upload for large files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:40 +02:00
Robin Appelman d3a57a7568 multipart upload for s3 object storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-09 15:29:34 +02:00
Joas Schilling 0577336105 Merge pull request #6792 from nextcloud/6790-bp-s12
[stable12] fix postgresql tests
2017-10-09 14:11:57 +02:00
blizzz be97297c96 fix postgresql tests
we don't support pgsql 10 yet. because Doctrine does not either.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-09 13:20:29 +02:00
Nextcloud bot 35641b54a0 [tx-robot] updated from transifex 2017-10-09 00:08:42 +00:00
Nextcloud bot 7a583c400e [tx-robot] updated from transifex 2017-10-08 00:08:32 +00:00
Nextcloud bot adea68e218 [tx-robot] updated from transifex 2017-10-07 00:08:40 +00:00
Joas Schilling 8f41e8ee60 Only allow colons in db host for IPv6 addresses
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-06 09:43:35 +02:00
Nextcloud bot 037376b4ce [tx-robot] updated from transifex 2017-10-06 00:08:40 +00:00
Joas Schilling 76faefd980 Merge pull request #6751 from nextcloud/backport-6750-fix-language-when-setting-password
[stable12] Fix language when trying to change password
2017-10-05 09:36:09 +02:00
Nextcloud bot ceec594cc0 [tx-robot] updated from transifex 2017-10-05 00:08:34 +00:00
Robin Appelman 6aa25b9f1e Merge pull request #6743 from nextcloud/invalid-path-repair-from11-12
[12] dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:34 +02:00
Joas Schilling 0782072bde Fix language when trying to change password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-04 09:49:26 +02:00
Nextcloud bot 1c30c72909 [tx-robot] updated from transifex 2017-10-04 00:08:37 +00:00
Robin Appelman 95dc9a89b3 dont run invalid path repair step when upgrading from 11.0.5.2 and later
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:28:54 +02:00
Robin Appelman d2b8bfc915 show diff in autoload checker
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:37 +02:00
Robin Appelman 5b82e2e4d5 update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:31 +02:00
Robin Appelman 82a3a8be06 fix undefined constants
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:28 +02:00
Robin Appelman 869e06fe69 merge vendor js
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:25 +02:00
Robin Appelman d26951beb4 fix path style
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:21 +02:00
Robin Appelman d97f66454c disable part files for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:16 +02:00
Robin Appelman 83ef030ea6 add stat cache for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:12 +02:00
Robin Appelman e42b950521 more efficient is_dir
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:09 +02:00
Robin Appelman a0848ba202 more efficient permissions for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:05 +02:00
Robin Appelman f45a7a43df more efficient write only fopen
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:11:01 +02:00
Robin Appelman 474c8aff29 reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:10:57 +02:00
Robin Appelman f62e0a33f3 update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:09:59 +02:00
Robin Appelman 14d94abf06 remove non composer aws sdk
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 14:04:20 +02:00
Nextcloud bot 4a21eb1c7d [tx-robot] updated from transifex 2017-10-03 00:08:30 +00:00
Nextcloud bot 77931505d3 [tx-robot] updated from transifex 2017-10-02 00:08:33 +00:00
Nextcloud bot 05fe73ef5d [tx-robot] updated from transifex 2017-10-01 00:08:35 +00:00
Nextcloud bot 489fc55e1d [tx-robot] updated from transifex 2017-09-30 00:08:35 +00:00
Arthur Schiwon 38f84b369c Backport of #6522
fix LDAP User deletion (cleanup)

discovered a bug in the integration test which lead to following a
different code path and giving a false-positive  success feedback.

Also listens now to the evendispatcher instead of old hook system

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

fix test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 14:36:48 +02:00
Nextcloud bot cae4a1956b [tx-robot] updated from transifex 2017-09-29 00:08:31 +00:00
Morris Jobke edade19263 Merge pull request #6689 from nextcloud/filelist-show-navigate-12
[12] navigate to the root directory when showing the main filelist
2017-09-28 18:07:20 +02:00
Robin Appelman ac31b67f42 navigate to the root directory when showing the main filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 16:37:47 +02:00
Nextcloud bot df00dc89d1 [tx-robot] updated from transifex 2017-09-28 00:08:46 +00:00
blizzz b1d5acd15f Merge pull request #6674 from nextcloud/backport-6549-stable12
[stable12] don't pass User object when uid string is expected
2017-09-28 01:39:46 +02:00
Arthur Schiwon 499da044b6 don't pass User object when uid string is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 17:51:22 +02:00
Morris Jobke f6ccc1e0a1 Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
John Molakvoæ 898fb1663a Merge pull request #6661 from nextcloud/no-take-only-throw
Do not stop on scss compilation failure
2017-09-27 10:43:31 +02:00
John Molakvoæ (skjnldsv) 892a427807 Do not stop on scss compilation failure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 08:35:02 +02:00
Nextcloud bot af923601b9 [tx-robot] updated from transifex 2017-09-27 00:08:33 +00:00
Morris Jobke 98da7848b5 Merge pull request #6649 from nextcloud/color-border-variable
Add color-border variable
2017-09-26 19:53:45 +02:00
John Molakvoæ (skjnldsv) e9c3c4f310 Add color-border variable
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-26 15:38:45 +02:00
Nextcloud bot 0f39ea5830 [tx-robot] updated from transifex 2017-09-26 00:08:36 +00:00
Nextcloud bot 06ca365ccd [tx-robot] updated from transifex 2017-09-25 00:08:12 +00:00
Nextcloud bot 29e4c10517 [tx-robot] updated from transifex 2017-09-23 00:08:06 +00:00
Nextcloud bot c1aa80afe8 [tx-robot] updated from transifex 2017-09-22 00:08:32 +00:00
Nextcloud bot cb212712f6 [tx-robot] updated from transifex 2017-09-21 00:08:36 +00:00
Roeland Jago Douma 9945d2f039 Merge pull request #6509 from nextcloud/backport-5689
[stable12] LDAP: simplify returning the homePath and fixing #4117
2017-09-20 20:11:30 +02:00
Morris Jobke ac0cd59a20 Merge pull request #6502 from nextcloud/backport-6453-stable12
[stable12] Fix initializing paged search under some circumstances
2017-09-20 16:07:28 +02:00
Morris Jobke 7d4fda5c85 Merge pull request #6524 from nextcloud/12-6506
[stable12] Fix sharer name overlap with filename
2017-09-20 16:06:09 +02:00
Morris Jobke aa586331ea Merge pull request #6525 from nextcloud/12-6499
[stable12] Allow to close sidebar for text files
2017-09-20 16:05:59 +02:00
Morris Jobke 2062c2ada6 Merge pull request #6528 from nextcloud/fix_4654_3375-12
[stable12] Pass new value to triggerChange
2017-09-20 16:05:49 +02:00
Morris Jobke 6a52cda551 Merge pull request #6547 from nextcloud/backport-6545-stable12
[stable12] throw 101 when an empty group string is provided
2017-09-20 16:05:41 +02:00
Joas Schilling 3c449c88be Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12
[stable12] Fix quota new endpoint 12
2017-09-20 09:19:06 +02:00
Nextcloud bot 2bac01daad [tx-robot] updated from transifex 2017-09-20 00:08:36 +00:00
Roeland Jago Douma 343a69569d Merge pull request #6572 from nextcloud/bump-version-another-time
[stable12] Bump version to 12.0.3.3
2017-09-19 20:18:36 +02:00
Lukas Reschke f438ad5d1e Bump version to 12.0.3.3
For a build with https://github.com/nextcloud/server/pull/6570

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-19 16:48:11 +02:00
Lukas Reschke 5e47b07b21 Merge pull request #6570 from nextcloud/fix-comments-activity-error-12
[stable12] Use the wrapper to get the parameters which was added in #6369
2017-09-19 16:07:44 +02:00
Joas Schilling 4ca0223f37 Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:06:22 +02:00
Nextcloud bot db56ea3e70 [tx-robot] updated from transifex 2017-09-19 00:08:39 +00:00
Roeland Jago Douma 3488a2099f Merge pull request #6556 from nextcloud/stable12-bump-version-to-final
[stable12] Bump version to 12.0.3
2017-09-18 20:01:51 +02:00
Lukas Reschke 7dc2ffaf00 Bump version to 12.0.3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 18:22:09 +02:00
Lukas Reschke 44ae66e7d2 Add filter for shareapi_allow_share_dialog_user_enumeration
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.

Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-18 17:28:07 +02:00
Lukas Reschke 96e3e0788a Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
This reverts commit 56a9084dd2.
2017-09-18 17:27:57 +02:00
Tobia De Koninck 005cd8ae42 Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:51 +02:00
Tobia De Koninck 21e903cb31 Improve code style
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:47 +02:00
Tobia De Koninck 3409c364fe Some code improvements
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:41 +02:00
Tobia De Koninck d2d6ed5c97 Add tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:33 +02:00
Tobia De Koninck 88ccbef546 Fix tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:28 +02:00
Tobia De Koninck 6f4976fd4d Privacy enhancements for contacts menu
- Groups, which are excluded from sharing should not see local users at all
 - If sharing is restricted to users own groups, he should only see contacts from his groups:

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-18 17:27:24 +02:00
Arthur Schiwon 713ce42fdf throw 101 when an empty group string is provided
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:10:23 +02:00
Nextcloud bot c854665b0c [tx-robot] updated from transifex 2017-09-18 00:08:41 +00:00
Nextcloud bot bc88484e7f [tx-robot] updated from transifex 2017-09-17 00:08:34 +00:00
Nextcloud bot 18a258c531 [tx-robot] updated from transifex 2017-09-16 00:08:34 +00:00
Roeland Jago Douma 71fdc43125 Pass new value to triggerChange
it is not used. but pass in the empty string (on delete) and the new
file (on create)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:23:45 +02:00
Roeland Jago Douma 76cd70aed7 Fix quota calculation on new dav upload endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 20:21:37 +02:00
Morris Jobke efec52ebeb Allow to close sidebar for text files
* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-15 17:00:14 +02:00
Jan-Christoph Borchardt f987347b83 Correctly ellipsize file names, fix #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:53:01 +02:00
Jan-Christoph Borchardt 64dd1f6833 Ellipsize sharer name, ref #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-15 16:52:52 +02:00
Nextcloud bot 99916a9bda [tx-robot] updated from transifex 2017-09-15 00:08:17 +00:00
Arthur Schiwon 90ebeae512 listen to deletion hooks for proper handling, adjust and add tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:12 +02:00
Arthur Schiwon 5933c0c55f simplify returning the homePath and fixing #4117
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 17:04:01 +02:00
Arthur Schiwon 9d5fd7cd92 adapted integration tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:23 +02:00
Arthur Schiwon 9fb8f1fcd3 fix counting found results in search op
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:16 +02:00
Arthur Schiwon 51e4b49ee9 improve and extend paging integration test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:10 +02:00
Arthur Schiwon 30bf1c158d replace hard-coded attribute with the corresponding settings option
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:14:04 +02:00
Arthur Schiwon de8626694f fix limit-flaw in search on paged results
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 14:13:49 +02:00
Nextcloud bot a7f3fadd37 [tx-robot] updated from transifex 2017-09-14 00:08:21 +00:00
Nextcloud bot 51c110dd66 [tx-robot] updated from transifex 2017-09-13 00:08:21 +00:00
Roeland Jago Douma c3924068aa Merge pull request #6472 from nextcloud/rc2
v12.0.3RC2
2017-09-12 23:24:47 +02:00
Roeland Jago Douma 2e30eab8c7 Merge pull request #6474 from nextcloud/2fa_apppasword_auth_12
[stable12] Fix AppPassword 2FA auth
2017-09-12 23:23:46 +02:00
Roeland Jago Douma ab50f0b1de Fix AppPassword 2FA auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:35:16 +02:00
Lukas Reschke 48372f9108 v12.0.3RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-12 22:11:17 +02:00
Morris Jobke 499699f37b Merge pull request #6466 from nextcloud/12-0-3-rc1
12.0.3 RC1
2017-09-12 16:12:06 +02:00
Lukas Reschke 9dbb77b5e6 12.0.3 RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-12 14:46:18 +02:00
Leon Klingele 33ae6a4e9e Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-12 14:11:52 +02:00
Morris Jobke cb6178b828 Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update
[stable12] Still throw a locked exception when the path is not relative to $user/files/
2017-09-12 10:03:29 +02:00
Morris Jobke c1690da20b Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav
[stable12] not to backquote LIMIT on CalDavBackend.php
2017-09-12 09:43:24 +02:00
Morris Jobke 5981027f82 Merge pull request #6359 from nextcloud/12-6082
[stable12] Use separate element color in theming
2017-09-12 09:41:10 +02:00
Morris Jobke 3aae3a54e5 Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language
[stable12] Use the language of the recipient for the share notification
2017-09-12 09:40:19 +02:00
Nextcloud bot c58fdad3de [tx-robot] updated from transifex 2017-09-12 00:08:34 +00:00
Morris Jobke 0c43183ac9 Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content
[stable12] Ask the schema whether the table and column exist
2017-09-11 23:20:58 +02:00
Morris Jobke c81829fd74 Merge pull request #6427 from nextcloud/backport-to-fix-popover-hovering
[stable12] Fix hovering on all popover types
2017-09-11 23:11:40 +02:00
Morris Jobke 0c3c145b90 Merge pull request #6441 from nextcloud/backport-6369-missing-translations-of-comment-activity-in-email
[stable12] Allow translations of the comments activity in the emails too
2017-09-11 23:09:56 +02:00
Morris Jobke 9d7b21efb8 Merge pull request #6440 from nextcloud/stable12-session-timeout-refresh-csrf-token
[stable12] Fix failing csp/nonce check due to timed out session
2017-09-11 22:34:37 +02:00
Joas Schilling 2a6855a76d Use the language of the recipient for the share notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:28:20 +02:00
nhirokinet 2eaee586c7 not to backquote LIMIT on CalDavBackend.php 2017-09-11 11:21:43 +02:00
Joas Schilling d25ea6ae1c Don't lock in the appdata_ directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:56 +02:00
Joas Schilling 9cae892974 Still throw a locked exception when the path is not relative to $user/files/
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:18:47 +02:00
Joas Schilling e88a4a0b3d Fix Nextcloud 12 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:14:33 +02:00
Joas Schilling 6fd01c3993 Ask the schema whether the table and column exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:08:58 +02:00
Joas Schilling 206c4da149 Allow translations of the comments activity in the emails too
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-11 11:05:06 +02:00
Christoph Wurst 55c7aa674c Fix failing csp/nonce check due to timed out session
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-11 10:08:06 +02:00
Nextcloud bot b7768ac11d [tx-robot] updated from transifex 2017-09-11 00:08:28 +00:00
Nextcloud bot 985cbc6b33 [tx-robot] updated from transifex 2017-09-10 00:08:33 +00:00
John Molakvoæ (skjnldsv) 4baae80d98 Fix hovering on all popover types
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-09 14:05:51 +02:00
Nextcloud bot 79c0d69844 [tx-robot] updated from transifex 2017-09-09 00:08:30 +00:00
Morris Jobke 85633784d3 Merge pull request #6421 from nextcloud/12-6419
[stable12] Use tmpfs for mysql CI containers
2017-09-08 16:58:49 +02:00
Morris Jobke ff94640c4f Use tmpfs for mysql CI containers
Should improve performance

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-08 15:57:15 +02:00
Nextcloud bot ac96dc80de [tx-robot] updated from transifex 2017-09-08 00:08:25 +00:00
Joas Schilling 27ea0bd9e1 Merge pull request #6396 from nextcloud/12-6329
[stable12] Don't log LDAP password when server is not available
2017-09-07 12:48:13 +02:00
Morris Jobke 7c3148f1aa Merge pull request #6386 from nextcloud/12-6247
[stable12] Fix undefined index oauthState
2017-09-07 09:32:45 +02:00
Joas Schilling 287ebb52d5 Don't log LDAP password when server is not available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-07 09:26:40 +02:00
Nextcloud bot 9071f60605 [tx-robot] updated from transifex 2017-09-07 00:08:32 +00:00
Roeland Jago Douma ef1c81188b Merge pull request #6319 from nextcloud/improve_2fa-12
[stable12] Improve 2FA
2017-09-06 20:07:46 +02:00
Morris Jobke 04583a7587 Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 19:48:12 +02:00
Morris Jobke 6375d7ef7f Fix undefined index oauthState
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 19:48:08 +02:00
Lukas Reschke ad96c58e8b Merge pull request #6368 from nextcloud/backport-5436-fix-group-check
[stable12] Fix group check on share provider
2017-09-06 17:19:15 +02:00
Lukas Reschke e1e248aeb8 Merge pull request #6357 from nextcloud/swift-tmpfiles-12
[12] Remove tmpFiles Array in Swift.php
2017-09-06 17:17:36 +02:00
Roeland Jago Douma dbcd549e35 Fix login with basic auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-06 17:07:11 +02:00
Nextcloud bot ba71df12cc [tx-robot] updated from transifex 2017-09-06 00:08:30 +00:00
Morris Jobke f1bbef392f Merge pull request #6366 from nextcloud/backport-6358-email-update
Backport email update
2017-09-05 20:57:06 +02:00
Jan-Philipp Litza b35c039b77 Fix 500 Internal Server Error on writing
In some not yet completely determined configurations, the following error could occur while writing a file:

Error: Call to a member function getUsers() on null
    /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
    /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
    /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
    /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
    /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
    /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
    [...]

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
2017-09-05 17:31:39 +02:00
Morris Jobke c0692abee7 Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 16:04:29 +02:00
Joas Schilling 6428359820 Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:17 +02:00
Joas Schilling 6e7c37cbd3 Merge setMetaData into constructor
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:04:09 +02:00
Joas Schilling 54faa09b4d Set the meta data before everything
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:03:57 +02:00
Joas Schilling 6aa707de42 Fix naming of user id in email meta data
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 16:03:50 +02:00
Morris Jobke ec00e4b001 Implement metadata for email templates of remaining emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 16:03:40 +02:00
Nextcloud bot 42b46ead67 [tx-robot] updated from transifex 2017-09-05 00:08:33 +00:00
Julius Härtl 9bcf90adc8 Cleanup theming styles to fit the new login page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:46 +02:00
Julius Härtl ed11c0d6e2 Fix tests for primary element color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:59:40 +02:00
Julius Härtl 0f2f19c65f Use separate element color in theming
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 15:50:33 +02:00
Christopher Bartz 222ec97f5f Remove tmpFiles Array in Swift.php
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
2017-09-04 14:54:13 +02:00
blizzz ebadf2f21d Merge pull request #6355 from nextcloud/6221-12
[stable12] Correctly format OCS response with favorites
2017-09-04 12:52:44 +02:00
Morris Jobke 274b72f223 Merge pull request #6333 from nextcloud/new-dav-event-stable12
[stable12] add a new dav event to allow apps to register their own sabredav plugins
2017-09-04 11:57:22 +02:00
Roeland Jago Douma 38548a7006 Correctly format OCS response with favorites
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-04 11:49:19 +02:00
Nextcloud bot c5950bd8f8 [tx-robot] updated from transifex 2017-09-03 00:08:24 +00:00
Nextcloud bot fe2f9ac7ce [tx-robot] updated from transifex 2017-09-02 00:08:39 +00:00
Bjoern Schiessle 38a60e44db also allow to register additional plugins if the old endpoint is used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:07:05 +02:00
Bjoern Schiessle 8e1d33369b add a new dav event to allow apps to register their own sabredav plugins
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-01 12:06:55 +02:00
Nextcloud bot a8f4b1ee52 [tx-robot] updated from transifex 2017-09-01 00:08:36 +00:00
Roeland Jago Douma faffebc718 Improve 2FA
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-31 10:54:10 +02:00
Nextcloud bot 0ba7914d0c [tx-robot] updated from transifex 2017-08-31 00:08:40 +00:00
Morris Jobke 8bc95d3449 Merge pull request #6285 from nextcloud/generate-system-wide-key-pair-12
Generate system wide key pair
2017-08-30 21:31:31 +02:00
Morris Jobke 6704e89c5a Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_for_past_events
[stable12] dont send invitations for past events
2017-08-30 21:01:32 +02:00
Bjoern Schiessle b53587cf8d update autoloader
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:48 +02:00
Bjoern Schiessle 181c77ca87 move repair step to stable12
because we decided to backport it the repair step needs to be executed
already on stable12

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:47 +02:00
Roeland Jago Douma 52833704d5 Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-30 20:36:47 +02:00
Bjoern Schiessle 3e6833f5a6 add prefix to user and system keys to avoid name collisions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Bjoern Schiessle 5f49398e13 extend the identity proof manager to allow system wide key pairs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 20:36:10 +02:00
Morris Jobke bf720056c2 Merge pull request #6311 from nextcloud/stable12-specify-slo-url
[Stable12] specify slo url
2017-08-30 20:29:16 +02:00
Lukas Reschke 5755897712 Inject \OCP\IURLGenerator to make tests work
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:50 +02:00
Lukas Reschke 245080e647 Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-30 14:42:46 +02:00
Nextcloud bot c13a06b7a5 [tx-robot] updated from transifex 2017-08-30 00:08:36 +00:00
Morris Jobke 0433b31d74 Merge pull request #6300 from nextcloud/add-share-with
[stable12] Add shareWith to email template metadata
2017-08-29 17:56:42 +02:00
Morris Jobke 7fd3068184 Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:05:12 +02:00
Morris Jobke eb1a8a1934 Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-js
[stable12] Fixes in files_drop.js
2017-08-29 14:49:05 +02:00
Björn Schießle 1f7ea1f295 Merge pull request #6284 from nextcloud/add-new-propfind-stable12
add propfind to detect encryption status
2017-08-29 10:48:30 +02:00
Nextcloud bot a6ea872b1f [tx-robot] updated from transifex 2017-08-29 00:08:37 +00:00
Morris Jobke 1af39e8734 Merge pull request #6287 from nextcloud/12-6255
[stable12] Add meta information to emails for better customisation
2017-08-28 18:34:30 +02:00
Morris Jobke 6f9c3ab8a6 Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:47:51 +02:00
Morris Jobke d0bb5c298d Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:33:43 +02:00
Joas Schilling 485dbc8d6c Also for reset password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:38 +02:00
Joas Schilling 7df1ddcf2c Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-28 17:33:35 +02:00
Bjoern Schiessle 9128786d09 add propfind to detect encryption status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:03:21 +02:00
Nextcloud bot eb71c1288d [tx-robot] updated from transifex 2017-08-28 00:08:33 +00:00
Daniel Calviño Sánchez 575f0c8421 Do not iterate over the files
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:44 +02:00
Daniel Calviño Sánchez 03c6c5bd93 Replace fileName variable with data.files[0].name
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez b68bad45dc Update the whole file item instead of only its contents
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez 8a1850f6b1 Remove "errorThrown" parameter
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-27 18:37:43 +02:00
Roeland Jago Douma ad283e40b4 Merge pull request #6270 from nextcloud/6252-12
[stable12] Don't try the actual file upload if the checks already error out
2017-08-26 18:32:03 +02:00
Roeland Jago Douma 0ec858f7e9 Merge pull request #6269 from nextcloud/6251-12
[stable12] Don't fetch the translation from core but from files
2017-08-26 16:26:40 +02:00
Roeland Jago Douma 0228dd7d50 Merge pull request #6268 from nextcloud/smb-2.0.2-12
[12]  update icewind/smb to 2.0.2
2017-08-26 13:50:53 +02:00
Roeland Jago Douma f29384a057 Merge pull request #6243 from nextcloud/stable12-circles-token
using CircleProvider on token
2017-08-26 13:49:25 +02:00
Roeland Jago Douma 99b102e15d Don't try the actual file upload if the checks already error out
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:34:29 +02:00
Roeland Jago Douma 7338f7aa21 Don't fetch the translation from core but from files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:33:34 +02:00
Robin Appelman 6f06426bd4 update icewind/smb to 2.0.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 12:14:43 +02:00
Nextcloud bot 2c6bc236cb [tx-robot] updated from transifex 2017-08-26 00:08:36 +00:00
Roeland Jago Douma 8c0042c30c Merge pull request #6258 from nextcloud/stable12_6244
[stable12] [drone] Give redis a change to fireup
2017-08-25 11:29:21 +02:00
Roeland Jago Douma a9ee70b688 [drone] Give redis a change to fireup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-25 10:40:02 +02:00
Nextcloud bot 992c91e288 [tx-robot] updated from transifex 2017-08-25 00:09:08 +00:00
Morris Jobke 4c2f194589 Merge pull request #6114 from nextcloud/stable12_5852
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Morris Jobke 5fab554bd2 Merge pull request #6108 from nextcloud/backport-6080-12
[stable12] Add buttom border for header
2017-08-24 02:58:03 +02:00
Morris Jobke 1928863ee7 Merge pull request #6233 from nextcloud/stable12_6218
[stable12] [3rdparty] Fix sabre/xml empty prop parsing
2017-08-24 02:56:28 +02:00
Nextcloud bot 9baf03d28c [tx-robot] updated from transifex 2017-08-24 00:09:00 +00:00
Roeland Jago Douma 81acf70bca Merge pull request #6240 from nextcloud/12-6239
[stable12] Show "Uploading..." in web UI for long uploads
2017-08-23 19:16:50 +02:00
Maxence Lange 0d4803e6dc using CircleProvider on token
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-23 16:58:32 +02:00
Morris Jobke 4cf7c351ea Merge pull request #6237 from nextcloud/12-drone-ci-images
[stable12] Use docker images without XDebug and with Opcache
2017-08-23 16:48:26 +02:00
Morris Jobke 618014130e Merge pull request #6166 from nextcloud/stable12-bump-dompurify
[Stable12] Bump dompurify
2017-08-23 16:43:33 +02:00
Roeland Jago Douma 9b3e70f554 Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Roeland Jago Douma a62620feeb Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns
[stable12] Use indexed column path_hash to find the parent
2017-08-23 15:58:59 +02:00
Morris Jobke 47f87bbf8c Show "Uploading..." in web UI for long uploads
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:53:48 +02:00
Morris Jobke b1e268e2c1 Use docker images without XDebug and with Opcache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:28:25 +02:00
Roeland Jago Douma 96509ae621 [3rdparty] Fix sabre/xml empty prop parsing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-23 14:33:14 +02:00
Nextcloud bot 8f20b4566a [tx-robot] updated from transifex 2017-08-23 00:09:04 +00:00
Roeland Jago Douma efdf1a4bb5 Merge pull request #6197 from nextcloud/stable12-check-encoding-log
[Stable12] check encoding log
2017-08-22 09:09:35 +02:00
Nextcloud bot 8e8af07e79 [tx-robot] updated from transifex 2017-08-22 00:08:29 +00:00
Morris Jobke 4617f5f656 Merge pull request #6207 from nextcloud/12-6201
[stable12] Increase contrast of dropdown menu text, fix accessibility & visibility issues
2017-08-21 22:10:14 +02:00
Jan-Christoph Borchardt 599398e4a0 Increase contrast of dropdown menu text, fix accessibility & visibility issues
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-21 16:34:53 +02:00
Morris Jobke a90d6090a7 Merge pull request #6195 from nextcloud/12-6194
[stable12] Use correct l10n for app password menu
2017-08-21 12:24:31 +02:00
Lukas Reschke 179b850e4d Ensure log message is UTF-8 encoded
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.

Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-21 10:21:54 +02:00
Morris Jobke 296f71dd9a Use correct l10n for app password menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-21 09:22:52 +02:00
Nextcloud bot de8fe9cbd9 [tx-robot] updated from transifex 2017-08-21 00:08:22 +00:00
Nextcloud bot 6ea56593a7 [tx-robot] updated from transifex 2017-08-20 00:08:24 +00:00
Nextcloud bot 366c73a185 [tx-robot] updated from transifex 2017-08-19 00:08:36 +00:00
Morris Jobke ddf7e0629c Merge pull request #6173 from nextcloud/12-6161
[stable12] Enable object storage tests again
2017-08-18 23:02:10 +02:00
Nextcloud bot 7e0c00b576 [tx-robot] updated from transifex 2017-08-18 00:08:25 +00:00
Morris Jobke 37bc43c19c Enable object storage tests again
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 19:35:26 +02:00
Lukas Reschke b88072d336 Build merged JS
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:36:32 +02:00
Lukas Reschke 8cb3624aab Bump DOMPurify to 1.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:36:16 +02:00
Roeland Jago Douma 73e7560655 Merge pull request #6127 from nextcloud/12-6126
[stable12] Trigger search after re-focus
2017-08-17 09:16:28 +02:00
Nextcloud bot 948d6742ce [tx-robot] updated from transifex 2017-08-17 00:08:23 +00:00
Morris Jobke 3326118bdc Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities
[stable12] Add the primary font color to the capabilities as well
2017-08-16 21:51:57 +02:00
Joas Schilling 8f68e0a153 Document that it throws
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:45 +02:00
Joas Schilling bd80121fc6 Catch exceptions on error of cloud id resolution
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 13:57:30 +02:00
Joas Schilling 5474e298a1 Add the primary font color to the capabilities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 11:51:15 +02:00
Morris Jobke 669c82afea Merge pull request #6111 from nextcloud/backport-6098-12
[stable12] Fix federation scope dropdown
2017-08-16 11:25:11 +02:00
Joas Schilling fa8e202e65 Merge pull request #6112 from nextcloud/backport-5920-12
[stable12] Top bar buttons in share view are wrong positioned
2017-08-16 11:12:53 +02:00
Joas Schilling ccb758ade3 Use indexed column path_hash to find the parent
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-16 10:49:30 +02:00
Nextcloud bot 7913d33de9 [tx-robot] updated from transifex 2017-08-16 00:08:42 +00:00
Morris Jobke faa83c3250 Trigger search after re-focus
If the share input field is unfocused, the autocomplete list is closed. Once
the field was focused again it was not properly opened again. This adds a
trigger to redo the search and show the results again.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 13:40:35 +02:00
Roeland Jago Douma 32b69cd40b Delete trash using node API to trigger preview deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-15 08:52:13 +02:00
Nextcloud bot cd2d5b0b27 [tx-robot] updated from transifex 2017-08-15 00:08:25 +00:00
Marin Treselj 83616aea4f Make sure this still works in other apps.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:09 +02:00
Marin Treselj eaa00ea2c8 Change id to class in the main share template
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:24:00 +02:00
Marin Treselj 84b0790b99 Fixes nextcloud/gallery#269
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-14 22:21:42 +02:00
Morris Jobke b31dfec9b8 Fix federation scope dropdown
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 22:15:49 +02:00
Morris Jobke cafce87a78 Add buttom border for header
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 18:00:36 +02:00
Robin Appelman 5d2b6b8240 Merge pull request #6103 from nextcloud/swift-filter-dot-12
[12] Filter magic dot object when swift directory
2017-08-14 17:30:24 +02:00
Robin Appelman e3166a601d Filter magic dot object when swift directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-14 15:40:25 +02:00
Nextcloud bot 99cef14c31 [tx-robot] updated from transifex 2017-08-14 00:08:31 +00:00
Nextcloud bot 4a140398a9 [tx-robot] updated from transifex 2017-08-13 00:08:23 +00:00
Nextcloud bot ee73ddd8a9 [tx-robot] updated from transifex 2017-08-12 00:08:28 +00:00
Nextcloud bot aa51202d98 [tx-robot] updated from transifex 2017-08-11 00:08:30 +00:00
Morris Jobke 27f44b4600 Merge pull request #6067 from nextcloud/stable12-5981-fix-preview-of-theming
[stable12] Fix preview of theming
2017-08-10 21:01:01 +02:00
Morris Jobke 36d6a24402 Merge pull request #6061 from nextcloud/stable12_6052
[stable12] Fix copy from jailed storage
2017-08-10 13:57:18 +02:00
Daniel Calviño Sánchez 0b1dab14ca Fix preview of theming
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez 364b1b4a20 Refactor reloadStylesheets to receive absolute URLs
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez 5b0d7056e8 Provide "server.css" URL in ThemingController response
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:44:49 +02:00
Daniel Calviño Sánchez e883061f58 Split updateStylesheet tests for success and error
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:42 +02:00
Daniel Calviño Sánchez 8d93a0db8a Unify DataResponse format with its uses in the rest of the file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:42 +02:00
Daniel Calviño Sánchez 0b00d770fe Add acceptance tests for setting the color in the Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:42:29 +02:00
Daniel Calviño Sánchez 340a774fe2 Add getter for the timeout multiplier
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:34:38 +02:00
Roeland Jago Douma 745ad2f323 Fix copy from jailed storage
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 08:07:00 +02:00
Nextcloud bot 79f4b8566b [tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Morris Jobke d9301a5b07 Fix redis-cluster support on drone
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:04:29 +02:00
Morris Jobke 2e115921a0 Update syntax to drone 0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 12:30:25 +02:00
Nextcloud bot 72029627fc [tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke cd095bb0b8 Merge pull request #5978 from nextcloud/12-5908
[stable12] Add css class for toogle preview icon
2017-08-08 19:23:35 +02:00
Morris Jobke c78a209e72 Merge pull request #5979 from nextcloud/12-5738
[stable12] Improve spelling in LDAP
2017-08-08 19:23:12 +02:00
Morris Jobke 39d1428ab3 Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
[stable12] Fix vertical alignment of loading icon and status message in Theming app
2017-08-08 18:42:31 +02:00
Morris Jobke 3f8e3fbb6b Merge pull request #5946 from nextcloud/12-5897
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Morris Jobke e11dcfcf9e Merge pull request #5966 from nextcloud/backport-oracle
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
Morris Jobke c119f66e75 Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes
display error icon on non-success
2017-08-08 16:18:56 +02:00
Morris Jobke 2abc49968e Merge pull request #5914 from nextcloud/12-5913
[stable12] Fix anchor name for federated sharing settings
2017-08-08 10:41:47 +02:00
Morris Jobke bf4283bce8 Merge pull request #5945 from nextcloud/stable12_5836
[stable12] Empty search no longer works
2017-08-08 10:41:05 +02:00
Morris Jobke bcea6a041f Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
[stable12] Use same lightness calculation as the SCSS compiler for theming
2017-08-08 10:40:37 +02:00
Morris Jobke 3313c682bf Merge pull request #5925 from derkostka/patch-1
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
Joas Schilling cb4c37498d Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing
[stable12] Don't throw an error when the table doesn't exist
2017-08-08 10:30:45 +02:00
Nextcloud bot 75d5989a8b [tx-robot] updated from transifex 2017-08-08 00:08:19 +00:00
Daniel Calviño Sánchez c91e39a4ca Fix code style
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:06 +02:00
Daniel Calviño Sánchez bb96c79bc7 Remove superfluous selector part
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 6fe6c0545e Align vertically loading icon and status message
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 21ad25465d Do not use the same rules for loading icon than for upload icon
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case; in general the loading icon is
used in a totally different way than the upload icon and thus it should
not share its CSS rules.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:58:05 +02:00
Daniel Calviño Sánchez 4dd8c4b538 Remove ignored rules
The removed rules were either always overriden by other rules or never
used due to not matching any element.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:43:57 +02:00
Joas Schilling 0476de0674 Don't throw an error when the table doesn't exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-07 09:43:45 +02:00
Lukas Reschke bfca9fbf11 Merge pull request #5989 from nextcloud/final-version-bump-stable12
Bump version to 12.0.1.5
2017-08-06 20:25:21 +02:00
Nextcloud bot 06a9357a49 [tx-robot] updated from transifex 2017-08-06 00:08:33 +00:00
Lukas Reschke 3640898e80 Bump version to 12.0.5
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-05 12:59:53 +02:00
Nextcloud bot b521ef1bf0 [tx-robot] updated from transifex 2017-08-05 00:08:19 +00:00
Julius Härtl e0ce8a7640 Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 15:39:56 +02:00
Lukas Reschke b500f8fbe9 Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction
Revert "[stable12] theming lightness correction"
2017-08-04 15:39:15 +02:00
Lukas Reschke 3474d73cae Revert "[stable12] theming lightness correction" 2017-08-04 15:38:56 +02:00
Lukas Reschke 9b57d33631 Merge pull request #5977 from nextcloud/stable12-theming-lightness-correction
[stable12] theming lightness correction
2017-08-04 15:38:08 +02:00
Lukas Reschke 0fabfaba69 Merge pull request #5976 from nextcloud/12.0.1rc5
v12.0.1RC5
2017-08-04 15:35:57 +02:00
Allan Nordhøy ac977dd3a1 Improve spelling in LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:17:04 +02:00
Morris Jobke 1f189d6769 Add css class for toogle preview icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:15:51 +02:00
Julius Härtl 796f0f9333 Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 12:13:33 +02:00
Lukas Reschke 4805ea24ad v12.0.1RC5
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-04 11:11:10 +02:00
Nextcloud bot 91b6d903f7 [tx-robot] updated from transifex 2017-08-04 00:08:27 +00:00
Joas Schilling 3a111adc33 Add a method to compare empty strings with an expression
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:41:03 +02:00
Joas Schilling 4f31860fd6 Fix repair step for oracle...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:54 +02:00
Joas Schilling d6e902fd03 Fix last failures with oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:46 +02:00
Joas Schilling ae55fefcf6 Fix querybuilder and functionbuilder tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:35 +02:00
Joas Schilling bb30b876ae Fix ILIKE regex for oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:26 +02:00
Joas Schilling c9430fbb77 Fix auth provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:17 +02:00
Joas Schilling 54a4aa9315 Use selectAlias()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:10 +02:00
Joas Schilling d6b888461d Can not insert auto increment on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:00 +02:00
Joas Schilling 18ba973c13 Fix missing escape on column and table name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:51 +02:00
Joas Schilling 5d7cab245f Fix clob comparison
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:41 +02:00
Joas Schilling ee51c49bd7 Allow to specify the table space on occ
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:33 +02:00
Joas Schilling 5eef54c636 Quote aliases as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:21 +02:00
Joas Schilling daa3cfcb70 Oracle does not support PDO::FETCH_KEY_PAIR
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:37:06 +02:00
Nextcloud bot 690ef25928 [tx-robot] updated from transifex 2017-08-03 00:08:15 +00:00
Morris Jobke cf16087585 Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
Nextcloud bot ecc82fc1e6 [tx-robot] updated from transifex 2017-08-02 00:08:21 +00:00
Morris Jobke 1ef19bb0ec Send an email once a file/folder is shared with a user
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 15:17:32 +02:00
Roeland Jago Douma e73f46e344 Empty search no longer works
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 13:29:17 +02:00
Maxence Lange e34114072e now, with less CSS
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-08-01 03:23:58 +02:00
Nextcloud bot 9f346fecf1 [tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Maxence Lange e62363275d display error icon on non-success
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-31 15:22:25 +02:00
Nextcloud bot b3e2f57f98 [tx-robot] updated from transifex 2017-07-31 00:08:12 +00:00
Lukas Reschke 0a369747a0 Merge pull request #5924 from nextcloud/12.0.1rc4
12.0.1RC4
2017-07-30 15:39:19 +02:00
Nextcloud bot a6499afb5b [tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Sebastian Kostka 09b120c6da [Stable 12] Removed cast to integer in getSize
Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744

Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
2017-07-29 07:40:13 +02:00
Nextcloud bot 820a74e71b [tx-robot] updated from transifex 2017-07-29 00:08:40 +00:00
Lukas Reschke 4b325da037 12.0.1RC4
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-28 16:03:36 +02:00
Lukas Reschke 7425316b29 Merge pull request #5919 from nextcloud/add-brackets-on-concat-method
Add brackets around concat statements so comparing the result works a…
2017-07-28 15:35:49 +02:00
Joas Schilling b8bd5808e8 Add brackets around concat statements so comparing the result works as intended
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-28 11:34:35 +02:00
Morris Jobke 635dc7e08c Fix anchor name for federated sharing settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:23:06 +02:00
Nextcloud bot ee4804b1da [tx-robot] updated from transifex 2017-07-28 00:08:14 +00:00
Morris Jobke 2476a5f0e3 Merge pull request #5902 from nextcloud/oc-migration
Add a repair step to drop the account_terms table on oc migration
2017-07-27 17:25:21 +02:00
Morris Jobke 2f153fe4e6 Merge pull request #5896 from nextcloud/12-5895
[stable12] Fix show password button for password change
2017-07-27 13:26:17 +02:00
Joas Schilling 690efbd4eb Use the existing array of OC versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 12:30:24 +02:00
Lukas Reschke 4b58eccf61 This is RC3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-27 11:49:16 +02:00
Joas Schilling d06d86a719 Add a repair step to drop the account_terms table on oc migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 11:38:55 +02:00
Nextcloud bot 569892d3c0 [tx-robot] updated from transifex 2017-07-27 00:08:13 +00:00
Morris Jobke 1f82223883 Fix show password button for password change
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 22:57:56 +02:00
Morris Jobke 2290255bb2 Merge pull request #5883 from nextcloud/12-5871
[stable12] Enable postgres on drone again
2017-07-26 22:31:20 +02:00
Lukas Reschke 7c0e1c4860 Merge pull request #5889 from nextcloud/stable12-overlay-on-show-password
fix overlay on show password
2017-07-26 16:55:34 +02:00
Morris Jobke c929e3ad26 Merge pull request #5875 from nextcloud/stable12-edu-edition
[stable12] Add new bundle
2017-07-26 16:47:32 +02:00
Maxence Lange c87002105d fix overlay on show password
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-26 16:18:57 +02:00
Morris Jobke 6b79d77dd2 Enable postgres on drone again
* use proper password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 14:17:53 +02:00
Lukas Reschke 7568b04705 Add new bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 11:47:15 +02:00
Nextcloud bot 2902677ccf [tx-robot] updated from transifex 2017-07-26 00:08:14 +00:00
Lukas Reschke f386fbfe1e Merge pull request #5851 from nextcloud/make-it-rc2
v12.0.1 RC2
2017-07-25 10:28:17 +02:00
Nextcloud bot 79522f4078 [tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Lukas Reschke 886a8d12c3 v12.0.1 RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 16:16:57 +02:00
Morris Jobke aea95e48f8 Merge pull request #5858 from nextcloud/12-5850
[stable12] proper logo height in emails for Outlook
2017-07-24 16:16:16 +02:00
Morris Jobke f45e4471f0 Remove unneeded styles
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 13:46:17 +02:00
Lukas Reschke 3353dbfab4 Adjust to height=120
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 13:46:09 +02:00
Nextcloud bot 65dba8a558 [tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Roeland Jago Douma 4ec8cac3ec Merge pull request #5830 from nextcloud/12-5812
[stable12] Fix for mb strlen
2017-07-23 14:05:17 +02:00
Georg Ehrke 7b113bb18a Sabre/VObject returns DateTimeImmutable, not a simple DateTime
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:35 +02:00
Georg Ehrke 702d13cc79 don't send invitation emails for past events
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-07-23 09:36:24 +02:00
Nextcloud bot 12590bf3d8 [tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00
Robin Appelman 13831085c3 add tests for renaming paths with multibyte utf8 characters
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-22 11:10:37 +02:00
Artem Kochnev 3d54cef078 Fix for mb strlen
Error with moving files with long names in UTF-8
2017-07-22 11:10:25 +02:00
Nextcloud bot f91d6624cd [tx-robot] updated from transifex 2017-07-22 00:08:16 +00:00
Morris Jobke 2663aa253e Merge pull request #5826 from nextcloud/12-backport-5821
[stable12] Fix error message on untrusted domain error page
2017-07-21 23:35:46 +02:00
Morris Jobke 816f1e63e9 Merge pull request #5757 from nextcloud/mount-rename-12
[12]  Fix renaming of non-renamble mounts
2017-07-21 23:30:42 +02:00
Morris Jobke 111844e7b1 Fix error message on untrusted domain error page
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 16:16:48 +02:00
Morris Jobke c6e3368af7 Merge pull request #5786 from nextcloud/path-repair-steps-storage-12
[12] Also repair storage id's when repairing invalid entries
2017-07-21 14:03:38 +02:00
Roeland Jago Douma 73b293fa6a Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
[12] still remove the federated share even if we cant notify the remote
2017-07-21 12:46:31 +02:00
Roeland Jago Douma 4165d5bca6 Merge pull request #5792 from nextcloud/stable12-prevent-php7.2-usage
[stable12] Show warning if PHP 7.2 is used
2017-07-21 12:38:34 +02:00
Roeland Jago Douma d338869257 Merge pull request #5805 from nextcloud/fix-public-links-stable12
[stable12] fix preview for public links
2017-07-21 11:02:02 +02:00
Lukas Reschke 091cba8374 Show warning if PHP 7.2 is used
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-21 09:40:47 +02:00
Nextcloud bot 9fe53e2649 [tx-robot] updated from transifex 2017-07-21 00:08:16 +00:00
Morris Jobke fd25265849 Merge pull request #5807 from nextcloud/12-backport-5790
[stable12] Fix config.sample.php documentation
2017-07-20 22:38:15 +02:00
Björn Schießle c9624d2695 Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-stable12
[stable12] Add recovery key on public upload
2017-07-20 14:27:57 +02:00
Roeland Jago Douma 07ebc7b1c3 Merge pull request #5759 from nextcloud/backport-translations-stuff-12
[stable12] Backport translation fixes
2017-07-20 14:25:11 +02:00
Morris Jobke ad1c6a0fc2 Merge pull request #5804 from nextcloud/12-backport-5800
[stable12] Enable acceptance tests again on Drone 0.7
2017-07-20 13:07:59 +02:00
Morris Jobke bf79293e13 Fix config.sample.php documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-20 12:32:46 +02:00
Bjoern Schiessle fff804c39e make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle f7a2b96507 Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Daniel Calviño Sánchez 6602455efc Enable acceptance tests again on Drone 0.7
Running the acceptance tests on Drone relied on the pod-style networking
used by services (service containers were available at 127.0.0.1 from
the build containers). However, in Drone 0.7 service and build
containers must be accessed from each other using their domain name
instead. Thus, acceptance tests had to be disabled on Drone.

Now that the acceptance test system supports setting a different domain
for the Selenium server and for the Nextcloud test server the acceptance
tests can be enabled again on Drone.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:33:03 +02:00
Daniel Calviño Sánchez fcc1570789 Add option to acceptance test runner to set the Selenium server
By default "127.0.0.1:4444" is used, so nothing needs to be set when the
acceptance tests and the Selenium server share the same network (like
when called by "run.sh").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:58 +02:00
Daniel Calviño Sánchez 140b23f85f Add option to acceptance test runner to set the Nextcloud server domain
By default "127.0.0.1" is used, so nothing needs to be set when the
Selenium server and the Nextcloud test server share the same network
(like when called by "run.sh").

Besides passing the domain to the acceptance tests the Nextcloud test
server configuration must be modified to see the given domain as a
trusted domain; otherwise the access would be forbidden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:54 +02:00
Daniel Calviño Sánchez 9722291454 Make possible to configure the domain for the Nextcloud test server
The NextcloudTestServerLocalHelper started the PHP built-in web server
for the Nextcloud test server at 127.0.0.1; as the Selenium server has
to access the Nextcloud test server they were forced to share the same
network. Now, the domain at which the PHP built-in web server is started
can be specified when the NextcloudTestServerLocalHelper is created,
which removes the need of sharing the same network, as the Selenium
server now can access the Nextcloud test server at an arbitrary domain.
However, by default "127.0.0.1" is still used if no domain is given.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:50 +02:00
Bjoern Schiessle 2634f77741 fix preview for public links
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:31:31 +02:00
Lukas Reschke cd6afb6957 Merge pull request #5796 from nextcloud/backport-allow-to-theme-emails
[stable12] Backport allow to theme emails
2017-07-20 10:20:30 +02:00
Nextcloud bot 9cbdca60d2 [tx-robot] updated from transifex 2017-07-20 00:08:13 +00:00
Joas Schilling c6f57fe22d Allow to overwrite the email template again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-19 17:59:12 +02:00
Joas Schilling 336ce139ae Merge pull request #5777 from nextcloud/app-menu-ellipsis-stable12
[stable 12] Add ellipsis for app titles in the app menu popover
2017-07-19 16:21:30 +02:00
Joas Schilling fef3c61378 Merge pull request #5784 from nextcloud/backport-5745-12
[stable12] Fix emitting of legacy hook post_unshare
2017-07-19 15:06:16 +02:00
Morris Jobke 3e4685b851 Merge pull request #5782 from nextcloud/backport-5781-stable12
[stable12] Allow overwriting of IOS theming values
2017-07-19 12:37:29 +02:00
Robin Appelman 9c2dce34e9 Also repair storage id's when repairing invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-19 12:34:00 +02:00
Pauli Järvinen 22b29943ed Fix emitting of legacy hook post_unshare
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
2017-07-19 11:42:23 +02:00
Morris Jobke ff9c5072f0 Add Android and iOS URLs to theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:57:38 +02:00
Roeland Jago Douma 235f4d614a Allow overwriting of IOS theming values
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 10:57:25 +02:00
Nextcloud bot fad8b275f1 [tx-robot] updated from transifex 2017-07-19 00:08:32 +00:00
Morris Jobke e00d5ab0be Merge pull request #5765 from nextcloud/update-3rdparty-12
Update 3rdparty for "Fix infinite propfinds reporting files as direct…
2017-07-18 23:13:32 +02:00
Roeland Jago Douma 3a9bc85976 Merge pull request #5771 from nextcloud/path-repair-steps-loop-12
[12] Fix invalid path repair step not getting all invalid entries
2017-07-18 22:23:22 +02:00
Morris Jobke bcff249f2a Merge pull request #5762 from nextcloud/files-checker-12
[stable12] Add test to check if new files are added to the root of the repository
2017-07-18 21:12:53 +02:00
Marin Treselj 33637c89f7 Add ellipsis for app titles in the app menu popover
Backport of #5733

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-18 20:57:20 +02:00
Morris Jobke 01500f34b9 Add test to check if new files are added to the root of the repository
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-18 20:32:26 +02:00
Robin Appelman c17b07667e Fix invalid path repair step not getting all invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-18 14:03:41 +02:00
Joas Schilling 6506508f2a Update 3rdparty for "Fix infinite propfinds reporting files as directories"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 10:07:50 +02:00
Allan Nordhøy a91ce85fed : Bigversal 2017-07-18 09:12:37 +02:00
Allan Nordhøy f29d8bda3e - your
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-18 09:12:31 +02:00
Allan Nordhøy 8bc18a1b4d sent, an invitation, - successful 2017-07-18 09:12:24 +02:00
Allan Nordhøy ee3c7fc8cb log out, : Bigversal 2017-07-18 09:12:07 +02:00
Allan Nordhøy 9eb5eebfad : Bigversal and LDAP 2017-07-18 09:11:56 +02:00
Allan Nordhøy 79e9f0a15b command-line, Consider narrowing 2017-07-18 09:11:45 +02:00
Allan Nordhøy 40eeaf4bb8 Spelling: Shortening and binding 2017-07-18 09:11:30 +02:00
Nextcloud bot 041e327a6c [tx-robot] updated from transifex 2017-07-18 00:08:12 +00:00
Robin Appelman 8bfa3922a3 fix parsing of dav permissions
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:40:49 +02:00
Robin Appelman d7620e3970 non movable mounts can not be moved
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:40:45 +02:00
Robin Appelman e49b8959c4 still remove the federated share even if we cant notify the remote
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:21:22 +02:00
Lukas Reschke 515d83236b Merge pull request #5728 from nextcloud/bump-stable12-version
12.0.1RC1
2017-07-17 08:16:22 +02:00
Nextcloud bot 3fefa01709 [tx-robot] updated from transifex 2017-07-17 00:08:12 +00:00
Lukas Reschke d928468524 12.0.1RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-16 11:13:42 +02:00
Nextcloud bot 0463ef7e3b [tx-robot] updated from transifex 2017-07-15 00:09:06 +00:00
Morris Jobke 81d785b680 Merge pull request #5730 from nextcloud/stable12-fix-drone
[stable12] fix drone for 0.7
2017-07-14 23:34:12 +02:00
Morris Jobke d61fc0531f Temporarily disable acceptance and object storage tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 21:49:20 +02:00
Morris Jobke 239ff34f3d Fix drone
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 13:02:16 +02:00
blizzz b9d7c48acf Merge pull request #5711 from nextcloud/null-user-exist-12
[12] null users dont exist
2017-07-14 12:38:27 +02:00
Nextcloud bot 281e5eb8bc [tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Morris Jobke 9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke 90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Robin Appelman ce45f87699 null users dont exist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 15:54:16 +02:00
Morris Jobke 61bac5637f Merge pull request #5697 from nextcloud/stable12-4984
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00
Robin Appelman 5804dfc078 Fix scan permissions with nested permissions masks
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:37:09 +02:00
Robin Appelman 069df4c8cb chunk getting invalid paths and reuse queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman 95e17a8245 use a generator instead of fetching all rows at once
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman 64d0a0ffc9 adjust to moved repair step
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Morris Jobke d422875ae4 Run repair step only once
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-13 13:08:23 +02:00
Robin Appelman 92b14fa8c0 Add repair step for invalid paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Robin Appelman 996269cfdd fix moving folders out of a cache jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Morris Jobke 701a865db7 Merge pull request #5692 from nextcloud/upload-hidden-filelist-12
[12] properly block file upload to non-active filelist
2017-07-13 11:47:46 +02:00
Morris Jobke 7da78af4d4 Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-13 11:47:35 +02:00
Nextcloud bot a9b38c025f [tx-robot] updated from transifex 2017-07-13 00:08:42 +00:00
Roeland Jago Douma fe7c907e8c Write cert bundle to tmp file first
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-12 20:21:27 +02:00
Robin Appelman 9e675dd8b1 fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:14 +02:00
Robin Appelman d05f67b2f3 properly block file upload to non-active filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:10 +02:00
Roeland Jago Douma 38ee24d56b Merge pull request #5687 from nextcloud/jail-propagator-12
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma 405d3ccbd7 Merge pull request #5463 from nextcloud/shared-cache-during-init-12
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Morris Jobke ac7997901b Merge pull request #5686 from nextcloud/backport-5520
hint should not be clickable
2017-07-12 10:44:31 +02:00
Nextcloud bot 05b03c173e [tx-robot] updated from transifex 2017-07-12 00:08:54 +00:00
Morris Jobke 48351b4778 Merge pull request #5484 from nextcloud/fix-if-circles-is-deleted
Check if Circles is still here
2017-07-11 23:42:30 +02:00
Maxence Lange 02baa45898 wrong call
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Maxence Lange 7464996c56 verify that circles is installed
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman 2f7d0bbb18 Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Maxence Lange 51107da4f4 hint should not be clickable
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 18:14:29 +02:00
Lukas Reschke ce59546344 Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-unreadable-items
[stable12] Allow dir-listing also when one child is blocked by access control
2017-07-11 16:08:43 +02:00
Morris Jobke e768426b11 Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-on-multi-select-dropdowns
[stable12] Fix unselecting items on multi select dropdowns
2017-07-11 15:34:30 +02:00
Daniel Calviño Sánchez 3a660a1b89 Enable the toggleSelect extension in multi-select dropdowns
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez bf4913acb9 Add select2-toggleselect to the JavaScript files to load
"select2-toggleselect.js" provides an extension to Select2 that makes
possible to unselect items in a multi-select dropdown by clicking on
them. It seems that its load slipped through when moving things around
in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it
to the JavaScript files to be loaded in the same position that it should
have had in that commit (based on how the other declarations were
moved).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez 00e0535aec Add acceptance tests for unselecting items in dropdown for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Morris Jobke ad7e6cfc9c Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activity-emails
[stable12] Fix remote share activity emails
2017-07-11 12:21:30 +02:00
Daniel Calviño Sánchez 6cf19cc81a Extract app navigation elements to its own context
The app navigation is not exclusive to the Files app but a generic
component used by other apps too, so its locators and steps should be in
its own context.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 11:54:57 +02:00
Daniel Calviño Sánchez b72aa998d6 Fix typo
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 11:48:19 +02:00
Morris Jobke 8fdd9dbb04 Merge pull request #5667 from nextcloud/5649-stable12
[stable12] fix alignment of radio button and its label in encryption settings
2017-07-11 11:31:41 +02:00
Morris Jobke 5fcf2d2bad Merge pull request #5665 from GitHubUser4234/ldap_password_renew_nc12fix_backport
[stable12] Ldap password renewal fixes for NC12
2017-07-10 15:03:31 +02:00
Roger Szabo ff286cd131 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:38:30 +08:00
Joas Schilling 1ed251c6a9 Fix owner cloud id in unshare activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:45 +02:00
Joas Schilling 509bc4f1eb Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:32 +02:00
Arthur Schiwon 0a71c1ccd3 fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-10 11:02:16 +02:00
Roger Szabo 500d2a0e2e pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:17:05 +08:00
Roger Szabo b725738870 css for button adjustment for nc12
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:55 +08:00
Roger Szabo 3e7a49e009 set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:42 +08:00
Roger Szabo 28933322a2 suppress superflous php error on rejected password change
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:12 +08:00
Nextcloud bot 28a37f04dc [tx-robot] updated from transifex 2017-07-10 00:08:51 +00:00
Nextcloud bot 0324993342 [tx-robot] updated from transifex 2017-07-09 00:08:41 +00:00
Nextcloud bot f80159f52a [tx-robot] updated from transifex 2017-07-08 00:08:37 +00:00
Morris Jobke a5182ab7c1 Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle 8ad1123d5d Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling a6bae8ac44 Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:54 +02:00
Joas Schilling 87e69b5510 Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:44 +02:00
Joas Schilling 43964d99ee Add a flag to allow checking if SVGs are okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:37 +02:00
Morris Jobke 36e3f3cc2a Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps
[stable12] Don't load navigation entries of restricted apps
2017-07-07 10:46:11 +02:00
Nextcloud bot a1f3f1783e [tx-robot] updated from transifex 2017-07-07 00:08:35 +00:00
Joas Schilling 33252cda9e Adjust tests to the old settings menu
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-06 09:30:42 +02:00
Joas Schilling 596380a62f Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
[stable12] Don't try to generate logs for chunking paths
2017-07-06 08:43:39 +02:00
Nextcloud bot f2ac9c6582 [tx-robot] updated from transifex 2017-07-06 00:08:53 +00:00
blizzz 40e454021b Merge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-dav-exceptions-either
[stable12] Don't log passwords on dav exceptions
2017-07-05 22:15:04 +02:00
Morris Jobke 2122cfce4b Merge pull request #5434 from nextcloud/backport-5404-translated-hint-password-policy
Use translated Hint instead of english error on password policy
2017-07-05 16:21:30 +02:00
Joas Schilling 79f6773ef9 Don't log passwords on dav exceptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:10:38 +02:00
Joas Schilling 20091a21c9 Don't load navigation entries of restricted apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:07:56 +02:00
Morris Jobke 5f0932a5a7 Merge pull request #5613 from nextcloud/stable12-5549
[stable12] Add info text about updates
2017-07-05 12:52:25 +02:00
Jos Poortvliet 68b6c3fca8 Update admin.php
add a note on our staged roll-out.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-05 11:40:26 +02:00
Joas Schilling 8b2d9251fd Merge pull request #5584 from nextcloud/stable12-5429
[stable12] Use base url for cache prefix and SCSS caching
2017-07-05 11:30:08 +02:00
Nextcloud bot 3db7bd196d [tx-robot] updated from transifex 2017-07-05 00:08:36 +00:00
Morris Jobke 29fdffb1af Merge pull request #5525 from nextcloud/stable12-5517
[stable12] Enhance the logging if the part file can not be renamed
2017-07-04 19:36:08 +02:00
Morris Jobke e0b01f9cb5 Merge pull request #5601 from nextcloud/stable12-5460-5526
[stable12] Improved logging for object storage and trashbin
2017-07-04 17:37:45 +02:00
Morris Jobke 2459eb80a7 Improve logging of trash bin inconsistencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-04 11:14:59 +02:00
Robin Appelman a277101133 improved logging of objectore errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-04 11:14:41 +02:00
Morris Jobke 0d7d00d681 Merge pull request #5583 from nextcloud/stable12-5450
[stable12] Fix more icon in apps menu on bright backgrounds
2017-07-04 11:01:12 +02:00
Nextcloud bot b1e230a7b6 [tx-robot] updated from transifex 2017-07-04 00:08:34 +00:00
Nextcloud bot 2711dbb445 [tx-robot] updated from transifex 2017-07-03 00:08:31 +00:00
Julius Härtl 9fbae1a174 Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:36 +02:00
Julius Härtl 0c6e4edc19 Fix theming app to also use the prefix
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl d9f83bac0f Add tests and inject IRequest
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl 4c3b27da5c Do not open version file again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl 3801c3aa3f Make cache and scss caching depend on the baseUrl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:03:35 +02:00
Julius Härtl 9c1cfbe154 Fix more icon in apps menu on bright backgrounds
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-02 14:02:51 +02:00
Nextcloud bot f02575db94 [tx-robot] updated from transifex 2017-07-02 00:08:23 +00:00
Nextcloud bot 4b6e5efd7e [tx-robot] updated from transifex 2017-07-01 00:08:38 +00:00
Nextcloud bot c892043dc9 [tx-robot] updated from transifex 2017-06-30 00:08:35 +00:00
Nextcloud bot af6e02976a [tx-robot] updated from transifex 2017-06-29 00:08:35 +00:00
Nextcloud bot 2767165d7f [tx-robot] updated from transifex 2017-06-28 00:08:28 +00:00
Nextcloud bot d13010ed2b [tx-robot] updated from transifex 2017-06-27 00:08:26 +00:00
Nextcloud bot 31422c9c6e [tx-robot] updated from transifex 2017-06-26 00:08:40 +00:00
Nextcloud bot 5e22b33096 [tx-robot] updated from transifex 2017-06-25 00:08:27 +00:00
Nextcloud bot 33bc17564c [tx-robot] updated from transifex 2017-06-24 00:08:39 +00:00
Morris Jobke 8a0a09eb90 Enhance the logging if the part file can not be renamed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-23 16:07:21 -05:00
Morris Jobke 8550fdf757 Merge pull request #5507 from derkostka/stable12
[stable12] Use realpath to obtain the webroot
2017-06-23 15:43:15 -05:00
Morris Jobke cb9a6a81a4 Merge pull request #5521 from nextcloud/backport-5508-no-acitivity-before-login
[stable12] Don't create activities for email and password change before login
2017-06-23 11:23:50 -05:00
blizzz 0f7cb1fd65 Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language
[stable12] Allow to force a language and set it via the ocs api
2017-06-23 14:24:05 +02:00
Joas Schilling 7e714ae971 Don't create activities for email and password change before login
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-23 12:27:21 +02:00
Nextcloud bot 70afe8d03b [tx-robot] updated from transifex 2017-06-23 00:09:22 +00:00
Joas Schilling 11cb6991f2 Merge pull request #5511 from nextcloud/5491-stable12
[stable12] Create users in non default backends first
2017-06-22 14:11:43 +02:00
Joas Schilling 7257206bcf Create users in non default backends first
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 13:02:53 +02:00
Morris Jobke b0b39368b2 Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-22 09:56:07 +02:00
Joas Schilling aafb45456f Add unit tests for the new code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:55:57 +02:00
Joas Schilling 4d18757a85 Allow to force a language and set it via the ocs api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:54:39 +02:00
Sebastian Kostka f0753cb56d [stable12] Use realpath to obtain the webroot
Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
2017-06-22 08:37:11 +02:00
Nextcloud bot 00256ee18e [tx-robot] updated from transifex 2017-06-22 00:08:46 +00:00
Morris Jobke b150221fd0 Merge pull request #5489 from nextcloud/stable12-5061
[stable12] Fix example theme
2017-06-21 16:28:57 -05:00
Nextcloud bot 99d04b1917 [tx-robot] updated from transifex 2017-06-21 00:08:24 +00:00
Julius Härtl 1552924427 Move styles.css to server.css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-20 19:29:10 +02:00
Morris Jobke 6f252aa04a Merge pull request #5480 from nextcloud/backport-5459-group-admins-change-settings
[stable12] Don't try to save the setting when its not an admin
2017-06-20 10:54:09 -05:00
Joas Schilling 8600ba725a Also allow group admins to toogle the storage location
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:54:05 +02:00
Joas Schilling 9ae715de75 Don't try to save the setting when its not an admin
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:53:26 +02:00
Nextcloud bot 0277400618 [tx-robot] updated from transifex 2017-06-20 00:08:51 +00:00
Robin Appelman cbabc568db dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 14:00:52 +02:00
Robin Appelman e76081e858 Revert "dont die if we try to access the shared cache while setting up the shared storage"
Revent accidental push

This reverts commit ed89034047.
2017-06-19 14:00:27 +02:00
Robin Appelman 64864bf654 dont die if we try to access the shared cache while setting up the shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-19 13:58:30 +02:00
Joas Schilling b94a7a0ba3 Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 10:21:56 +02:00
Nextcloud bot deaa8b6885 [tx-robot] updated from transifex 2017-06-19 00:08:29 +00:00
Morris Jobke c3b58918f1 Merge pull request #5442 from Bekcpear/stable12
Fix upload remaining time and uploadrate value
2017-06-17 18:32:47 -05:00
Morris Jobke ab837da40b Merge pull request #5420 from nextcloud/stable12-appmenu-fixes
[stable12] App menu fixes
2017-06-17 18:28:59 -05:00
Nextcloud bot 0e608188d2 [tx-robot] updated from transifex 2017-06-17 00:08:36 +00:00
Yaojin Qian d41d48bd43 Fix upload remaining time and uploadrate value
1. The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.

2. The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.

Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 22:03:28 +08:00
Joas Schilling 0c522aa040 Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:47:56 +02:00
Joas Schilling 295a0c982c Allow dir-listing also when one child is blocked by access control
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:47:46 +02:00
Joas Schilling e667b31df5 Use translated Hint instead of english error on password policy
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:44:46 +02:00
Joas Schilling 9c2c42c7cc Don't try to generate logs for chunking paths
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-16 10:42:07 +02:00
Nextcloud bot 3cb59ac602 [tx-robot] updated from transifex 2017-06-16 00:08:53 +00:00
Morris Jobke 3040eaefc7 Merge pull request #5428 from nextcloud/5384-stable12
[stable12] Allow to find local users by their email address
2017-06-15 12:53:34 -05:00
Joas Schilling cdd4a75c17 Backport of #5384 to stable12
Allow to find local users by their email address

Signed-off-by: Joas Schilling <coding@schilljs.com>

Make sure to only add system users once

Signed-off-by: Joas Schilling <coding@schilljs.com>

Add unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-15 19:23:31 +02:00
Morris Jobke 20d994f21d Merge pull request #5422 from nextcloud/5190-stable12
[stable12] Treat PHP Errors on User session regenerate
2017-06-15 10:20:12 -05:00
Lukas Reschke c93cad74f9 Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
[stable12] Ldap attempt reconnect stable12
2017-06-15 13:29:42 +02:00
Arthur Schiwon 2ffdfeec28 Forward port of #5190 to stable12
Treat PHP Errors on User session regenerate

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

remove unnecessary lines…

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

change PHP errors to ErrorException in the session (PHP >=7)

Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-15 11:18:22 +02:00
Julius Härtl 02a63e9428 Show at least 8 icons, don't use percentage on mobile
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-15 10:55:17 +02:00
Patrik Kernstock 073d5dbc85 Decimal percentage, dynamic appIcon width
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:11 +02:00
Patrik Kernstock 6acabd64ca Now using dynamic percentual appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:55:04 +02:00
Patrik Kernstock d44786e9b7 Closed #5121, remove appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-15 10:54:51 +02:00
Morris Jobke aeb80e0f57 Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares
[stable12] allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:11:18 -05:00
Morris Jobke c20faa1c98 Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue
[stable12] urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:19 -05:00
Nextcloud bot 1965889fc8 [tx-robot] updated from transifex 2017-06-15 00:08:52 +00:00
Morris Jobke ec89aaa67a Merge pull request #5416 from nextcloud/stable12-5392
[stable12] Use the guest.css for the maintenance page as well
2017-06-14 18:04:06 -05:00
Morris Jobke 11d9722474 Merge pull request #5397 from nextcloud/stable12-5072
[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-14 11:30:38 -05:00
Morris Jobke b911033e7a Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12
[stable12] Make file name input tooltip error text change
2017-06-14 11:29:03 -05:00
Morris Jobke 385317a344 Merge pull request #5401 from nextcloud/translate-oauth2
Translate OAuth2 in stable12
2017-06-14 11:22:56 -05:00
Morris Jobke c603f54a1b Use the guest.css for the maintenance page as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-14 11:10:20 -05:00
Joas Schilling ac8d9afcfe Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder
[stable12] Localize contacts menu search input placeholder
2017-06-14 14:45:15 +02:00
Joas Schilling d07a661c94 Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email
[stable12] Prevent sending second WWW-Authenticate header
2017-06-14 14:24:01 +02:00
Christoph Wurst aab5dd7d7e Localize contacts menu search input placeholder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-14 11:52:52 +02:00
Joas Schilling 50ee4fba11 Translate OAuth2 in stable12
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 11:50:58 +02:00
Lukas Reschke fbeb6659f8 Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12
[stable12] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:28 +02:00
Nextcloud bot 426a4c11d6 [tx-robot] updated from transifex 2017-06-14 00:08:49 +00:00
Morris Jobke 1d2c1cf579 Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar
[stable12] allow PropPatch requests to contact_birthdays
2017-06-13 18:11:54 -05:00
Michael Munger 513401bdb6 Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071 2017-06-13 18:05:16 -05:00
Morris Jobke d4eb5cfecb Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
[stable12] Fix username and avatar for external users
2017-06-13 17:56:39 -05:00
Morris Jobke 4fec6dbf87 Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened
[stable12] Fix tag label removed when share view is opened
2017-06-13 17:32:55 -05:00
Morris Jobke 9f265007fe Merge pull request #5387 from nextcloud/backport-5367
[stable12] Fix unknown share token error message
2017-06-13 17:23:29 -05:00
Morris Jobke 9e402df41d Merge pull request #5388 from nextcloud/stable12-5378
[stable12] no themed icon when dragging folder
2017-06-13 17:23:02 -05:00
Morris Jobke db83fb7e76 Merge pull request #5389 from nextcloud/stable12-5305
[stable12] Add quota to the files view
2017-06-13 17:22:39 -05:00
Morris Jobke b2cd3107b8 Merge pull request #5382 from nextcloud/global-scale-settings-stable12
[stable12] fix "add to your nextcloud" input field
2017-06-13 14:43:02 -05:00
Morris Jobke cd9fb8cdf0 Merge pull request #5385 from nextcloud/stable12-revert-5259
[stable12] Revert "allow admin to disable groups on personal page"
2017-06-13 14:38:38 -05:00
Morris Jobke 28f6104bc8 Do not show icon for quota bar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:23 -05:00
Joas Schilling f6d0b92c59 Remove unused element
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:20 -05:00
Morris Jobke ef184c0b21 Put the quota bar to the bottom
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 12:28:16 -05:00
Joas Schilling 3ca3edd994 Adjust the unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:13 -05:00
Joas Schilling 41f107fd37 Remove the colored corners
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:09 -05:00
Joas Schilling c691b6d299 Add an event so apps can add hidden fields to the files page
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:28:03 -05:00
Joas Schilling 901eca84b0 Only set the active item when there is one (not the case for quota)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:59 -05:00
Joas Schilling b1ddc57e08 Content will come from the external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:55 -05:00
Joas Schilling 27b2102d6c Remove useless translation and make it better on unlimited
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:51 -05:00
Jan-Christoph Borchardt fe8450fcc9 Style quota entry in files view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-13 12:27:47 -05:00
Joas Schilling f1da30cc1e Add quota to the files view
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:27:43 -05:00
Patrik Kernstock a292a4b778 Fix #5349, no themed icon when dragging folder
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-13 12:22:57 -05:00
Joas Schilling 49c71bdbcb Fix unknown share token
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:53:52 +02:00
Lukas Reschke 913758dc28 Prevent sending second WWW-Authenticate header
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.

Fixes https://github.com/nextcloud/server/issues/5088

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 18:52:30 +02:00
Morris Jobke c4b65ab5e2 Revert "allow admin to disable groups on personal page"
This reverts commit 28e1a9da6c.

See #5259
2017-06-13 11:17:48 -05:00
Bjoern Schiessle 751bc180cc fix 'add to your nextcloud' input field, this is not an email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:00 +02:00
Daniel Calviño Sánchez c9bc521532 Extract toggle visibility of a SystemTagsInfoView to its own view
The SystemTagsInfoViewToggleView is a basic view that renders a label
that, when clicked, toggles the visibility of an associated
SystemTagsInfoView.

In order to keep the view parent agnostic its attachment and detachment
to/from the MainfFileInfoView is done in the FilesPlugin.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 5985ecb66d Add visibility related methods
SystemTagsInfoView now provides public methods related to its visibility
in preparation to be used by external objects.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 365d7918b2 Fix toggle element being removed when MainFileInfoView is rendered again
The toggle element was added to the MainFileInfoView element when
SystemTagsInfoView was rendered. However, if the MainFileInfoView was
rendered again after that the toggle element was removed. Therefore,
instead of adding it when SystemTagsInfoView is rendered, the toggle
element has to be added when MainFileInfoView triggers its "post-render"
event.

Note, however, that when MainFileInfoView is rendered all the events are
removed from its child elements. As the toggle uses a "click" event
either the event has to be added back or the element has to be detached
before the MainFileInfoView is rendered.

Fixes #4944

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez 2384703cf6 Trigger pre and post render events in MainFileInfoDetailsView
The post-render event makes possible to modify the
MainFileInfoDetailsView element once it has been rendered, which is
needed by OCA.SystemTags.FilesPlugin to add the "Tags" label to the file
details, while the pre-render event makes possible to detach added
elements if needed before the MainFileInfoDetailsView is rendered again,
as that removes the events from the child DOM elements even if they
belong to other views.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez 706106408c Make possible to know the registered detail views in a details view
In some cases, an app may need to act on a detail view registered by
another app or the core, for example, to add extra elements to the
element of the detail view.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez bd626a9faa Extract duplicated code to a method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez f822e3af4d Add acceptance tests for showing the input field for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-13 16:41:20 +02:00
Morris Jobke 4c56414cab Merge pull request #5365 from nextcloud/backport-5343
[stable12] filter missing groups in share provider
2017-06-13 08:04:59 -05:00
Joas Schilling f6264ad6c4 Merge pull request #5303 from nextcloud/fix_5047-nc12
[stable12] use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:56 +02:00
Robin Appelman 86c749349e filter missing groups in share provider
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-13 10:54:02 +02:00
Joas Schilling bd444c4951 Merge pull request #5354 from nextcloud/backport-5315-stable12
[stable12] execute eval in global scope, addresses #5314
2017-06-13 10:41:36 +02:00
Joas Schilling eb22d392d8 Merge pull request #5355 from nextcloud/stable12-5167
[stable12] l10n improvements from transifex
2017-06-13 10:20:26 +02:00
Bjoern Schiessle 4d84249ab7 don't try to encrypt/decrypt the certificate bundle
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:07:55 +02:00
Morris Jobke 7db495a246 Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin
[stable12] Use the language of the recipient not the actor
2017-06-12 22:31:08 -05:00
Nextcloud bot e0d8b17b20 [tx-robot] updated from transifex 2017-06-13 00:08:32 +00:00
Morris Jobke a4cba7df69 Merge pull request #5272 from nextcloud/stable12-5271
[stable12] Also use IMailer interface to generate the email template
2017-06-12 17:51:07 -05:00
Morris Jobke 17bde8a79e Merge pull request #5353 from nextcloud/stable12-5344
[stable12] Remove the char because it breaks the export from transifex
2017-06-12 17:50:41 -05:00
rakekniven e7e0d1b8a1 Update setupchecks.js
Fixed typo and removed doclink symbol.
Reported at transifex

Update util.php

Another l10n improvement from transifex.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-12 17:18:20 -05:00
Arthur Schiwon d02bcfda86 execute eval in global scope, addresses #5314
unsure whether this is properly supported everywhere, injection is not an
option for us

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-12 23:37:20 +02:00
Lukas Reschke 86b4ebc457 Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12
[stable12] add missing parent::setUp that broke any other dav app test
2017-06-12 23:09:35 +02:00
Joas Schilling 9d98e5c49b Remove the char because it breaks the export from transifex
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-12 15:40:41 -05:00
Morris Jobke 0b5efcfaca Merge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png
[stable12] Theme image for favicon-fb.png
2017-06-12 15:28:42 -05:00
Lukas Reschke d501b84c5a Fix tests
return is not defined

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-12 22:21:37 +02:00
Lukas Reschke e475229204 Merge pull request #5320 from nextcloud/5122-stable12
[stable12] Fix ldap integration tests
2017-06-12 22:10:08 +02:00
Georg Ehrke dba4935f24 urldecode group principals in Cal- and CardDAV backend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-12 21:02:21 +02:00
Georg Ehrke 2cf8da830c add missing parent::setUp that broke any other dav app test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-12 20:34:18 +02:00
Nextcloud bot acda3a2403 [tx-robot] updated from transifex 2017-06-12 00:08:21 +00:00
Nextcloud bot ea39d4feec [tx-robot] updated from transifex 2017-06-11 00:08:31 +00:00
Nextcloud bot b11d197d52 [tx-robot] updated from transifex 2017-06-10 00:08:47 +00:00
Lukas Reschke 26fe83aad8 Theme image for favicon-fb.png
Fixes https://github.com/nextcloud/server/issues/5322

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-09 21:13:56 +02:00
Arthur Schiwon b1820fa170 Backport of #5122 to stable12
add missing INotificationManager when creating User backend, LDAP
UserManager

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

Make IDE happy

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

add convenience script to run all tests at once

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-09 16:30:56 +02:00
Morris Jobke 5722afc1d7 Merge pull request #5123 from patschi/patch-2
[stable12] Backported Fix #5059
2017-06-08 20:07:25 -05:00
Nextcloud bot 6434305333 [tx-robot] updated from transifex 2017-06-09 00:08:34 +00:00
Robin Appelman 11ff813c8c Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12
[12] reword sessions to security in personal settings
2017-06-08 12:09:14 +02:00
Bjoern Schiessle 86646a24d5 use the email address configured in Nextcloud as sender instead of the users email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-08 11:49:10 +02:00
Georg Ehrke 32674afd95 allow users to send PropPatch request when calendar is group-shared with them
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 09:29:07 +02:00
Georg Ehrke 01b6a3da86 allow PropPatch requests to contact_birthdays
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 08:05:46 +02:00
Nextcloud bot d00c5886aa [tx-robot] updated from transifex 2017-06-08 00:08:37 +00:00
Morris Jobke e7b5ba8cef Merge pull request #5291 from nextcloud/stable12-5287
[stable12] show input fields if they are not empty but disable them in global scale mode
2017-06-07 16:27:50 -05:00
Bjoern Schiessle 6e765ccf39 unify look of disabled display name / email address and the other input fields
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:43:31 -05:00
Bjoern Schiessle ee53a2ed42 show input fields if they are not empty but disable them in global scale mode
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:43:27 -05:00
Morris Jobke 3ba2d6179a Merge pull request #5278 from nextcloud/stable12-5277
[stable12] Allow to change avatar when groups are disables
2017-06-07 11:42:21 -05:00
Morris Jobke d866547805 Allow to change avatar when groups are disables
* password form overlaps upload button and doesn't allow to click it
* regression from #5259

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

make sure that we always clear all floating rules after the user settings parts

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:30:56 -05:00
Morris Jobke d08a6c74ab Merge pull request #5186 from nextcloud/backport-5126-email-change-spam
[stable12] Don't trigger activity when the email didn't change
2017-06-07 11:14:00 -05:00
Robin Appelman 4972f9409a reword sessions to security in personal settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-07 14:36:47 +02:00
Nextcloud bot 85418640b3 [tx-robot] updated from transifex 2017-06-07 00:09:14 +00:00
Morris Jobke 952caf8f85 Also use IMailer interface to generate the email template
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 10:48:53 -05:00
Björn Schießle f29d53f509 Merge pull request #5270 from nextcloud/stable12-5223
[stable12] Don't allow the user to set fields they can't see
2017-06-06 16:58:16 +02:00
Morris Jobke 3cacc05217 Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12
[stable12] allow admin to disable groups on personal page
2017-06-06 08:53:55 -05:00
Joas Schilling b39dfe8eda adjust the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:35 -05:00
Joas Schilling a62b292dc5 Also cover the settings endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:31 -05:00
Joas Schilling ce34db22d7 Don't allow the user to set fields they can't see
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:28 -05:00
Morris Jobke 477f4965ca Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions
[stable12] combine apptokens and sessions
2017-06-06 08:03:04 -05:00
Morris Jobke 3cae858852 Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 08:01:52 -05:00
Joas Schilling 91de490b9e Bring back the description for app passwords
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:48:11 +02:00
Christoph Wurst c3cd07ec15 Combine sessions and app passwords view into one single view
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-06 13:47:59 +02:00
Bjoern Schiessle de809b4ac7 allow admin to disable groups on personal page
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 10:12:26 +02:00
Nextcloud bot 7ff205cf94 [tx-robot] updated from transifex 2017-06-06 00:08:55 +00:00
Nextcloud bot 413221bfe1 [tx-robot] updated from transifex 2017-06-05 00:08:38 +00:00
Nextcloud bot cf3988e248 [tx-robot] updated from transifex 2017-06-04 00:08:39 +00:00
Nextcloud bot 5d6345ea4b [tx-robot] updated from transifex 2017-06-03 00:09:12 +00:00
Björn Schießle 52f6c22954 Merge pull request #5224 from nextcloud/useful-gs-settings-stable12
[stable12] add new config switched for the global scale architecture
2017-06-02 20:18:45 +02:00
Björn Schießle a61aabea83 Merge pull request #5225 from nextcloud/no-client-info-without-firstrunwizard
Don't show client info, when the app is disabled
2017-06-02 18:09:54 +02:00
blizzz 2d15803a82 Merge pull request #5216 from nextcloud/5213-stable12
[stable12] Trigger changeUser hook only on real changes
2017-06-02 13:16:16 +02:00
blizzz d2734c6dbe Merge pull request #5217 from nextcloud/5209-stable12
[stable12] fix install on mb4 enabled mariadb/mysql
2017-06-02 13:11:33 +02:00
Joas Schilling 777e7bbf53 Don't show client info, when the app is disabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 11:25:20 +02:00
Bjoern Schiessle 6e7ff24474 add new config switched for the global scale architecture
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-02 11:00:08 +02:00
Nextcloud bot 577ea59968 [tx-robot] updated from transifex 2017-06-02 00:08:40 +00:00
Arthur Schiwon 0d893f09c4 fix install on mb4 enabled mariadb/mysql
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:12:30 +02:00
Arthur Schiwon c1f4191a77 emit changeUser only if there really was a change (quota, displayname)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:08:23 +02:00
Nextcloud bot db22c42e78 [tx-robot] updated from transifex 2017-06-01 00:08:48 +00:00
Joas Schilling bb583580d7 Merge pull request #5127 from nextcloud/backport-5090-fixing-missing-background-jobs-on-app-update
[stable12] Register the autoloading earlier so we can load the background jobs
2017-05-31 11:19:21 +02:00
Joas Schilling ea9613efa0 Don't trigger activity when the email didn't change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-31 11:17:11 +02:00
Nextcloud bot 99117349df [tx-robot] updated from transifex 2017-05-31 00:08:57 +00:00
Nextcloud bot 6ae58b6dcb [tx-robot] updated from transifex 2017-05-30 00:08:54 +00:00
Arthur Schiwon 2567a350f4 fix paging
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:32 +02:00
Arthur Schiwon d017e3602b make sure used ldap connection resource is always up to date
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:27 +02:00
bline 41a2686fc6 moved to something a little less invasive. back to passing CR around.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:23 +02:00
bline 76ab41732a special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-30 00:53:07 +02:00
Nextcloud bot 2d8ec64ee5 [tx-robot] updated from transifex 2017-05-29 00:08:44 +00:00
Nextcloud bot df3efa4984 [tx-robot] updated from transifex 2017-05-28 00:08:24 +00:00
Nextcloud bot 2e223cd1dc [tx-robot] updated from transifex 2017-05-27 00:08:42 +00:00
Joas Schilling 628a98ed62 Register the autoloading earlier so we can load the background jobs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 12:53:33 +02:00
Patrik Kernstock fd0c102f24 Backported Fix #5059 to stable12 by adding sanity checks before using var
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-26 12:16:46 +02:00
Joas Schilling d8abc4c16c Use the language of the recipient not the actor
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 11:08:37 +02:00
Nextcloud bot 0ed02da5dd [tx-robot] updated from transifex 2017-05-26 00:08:26 +00:00
Nextcloud bot 13d1c95db1 [tx-robot] updated from transifex 2017-05-25 00:08:13 +00:00
Nextcloud bot 9055109243 [tx-robot] updated from transifex 2017-05-24 00:08:31 +00:00
Roeland Jago Douma d00d96c902 Merge pull request #5073 from nextcloud/external-get-for-group-sql-type-12
[12] use the correct param type when getting external storages for groups
2017-05-23 22:39:34 +02:00
Robin Appelman 1e06e92bb0 use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-23 16:49:59 +02:00
Roeland Jago Douma 7593fa3464 Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunicode_for_calendar_properties_table
[stable12] fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:43:56 +02:00
Joas Schilling ebf6c628ed Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-23 12:04:18 +02:00
Roeland Jago Douma 446559979c Merge pull request #5017 from nextcloud/stable12-5016
[stable12] Reset opcache if update is detected
2017-05-23 11:36:57 +02:00
Nextcloud bot 6e005e0ffa [tx-robot] updated from transifex 2017-05-23 00:08:39 +00:00
Lukas Reschke 98e26f8b5c Merge pull request #5015 from nextcloud/stable12-5014
[stable12] Update Opcache recommendation
2017-05-22 10:18:41 +02:00
Lukas Reschke 93eeb40136 v12.0.0.29
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-22 10:11:27 +02:00
Lukas Reschke aee501a3bc Merge pull request #5025 from nextcloud/add-missing-version-requirement-to-oauth
Add missing version requirement to OAuth2 app
2017-05-22 10:10:22 +02:00
Phil Davis ed61c437cd Make new file file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-22 13:03:32 +05:45
Phil Davis db0b3bf42a Make rename file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-22 13:02:51 +05:45
Joas Schilling 21b6af3e1e Add missing version requirement to OAuth2 app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 09:01:34 +02:00
Morris Jobke e0e814dfae Merge pull request #5020 from nextcloud/stable12-5009
[stable12] Update acceptance tests for issue #4921
2017-05-22 01:49:05 -05:00
Daniel Calviño Sánchez 424979c32e Update acceptance tests for issue #4921
Acceptance tests opened the details view by clicking on the middle of
the file row, but due to the changes made in issue #4921 that now opens
the file instead; this commit updates the acceptance tests to open the
details view through the "Details" item in the file actions menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-21 22:50:15 -05:00
Nextcloud bot 9325003a72 [tx-robot] updated from transifex 2017-05-22 00:08:32 +00:00
Morris Jobke 3c832f201f Reset opcache if update is detected
This even works if opcache_reset is in the disabled_functions php.ini setting.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-21 18:40:53 -05:00
Morris Jobke 9acc590a27 Update Opcache recommendation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-21 18:24:06 -05:00
Lukas Reschke 6d9a6f03fb Merge pull request #5008 from nextcloud/fix_scss_cache_12
Fix scss cache 12
2017-05-21 22:52:20 +02:00
Roeland Jago Douma 32ee610f45 Increase version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-21 22:12:52 +02:00
Roeland Jago Douma cf1f77537d Set SCSS dependencies to memcache on compile
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-21 22:12:47 +02:00
Lukas Reschke b6f5e623bb v12.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-21 17:11:40 +02:00
Georg Ehrke f75b56fc5d fix replacing of 4MB Unicode Chars in cal props table
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-21 13:27:16 +02:00
Morris Jobke 482805d16f Merge pull request #4982 from nextcloud/stable12-oauth-not-disable
[stable12] Mark OAuth app as always enabled
2017-05-20 19:12:24 -05:00
Nextcloud bot fa47ed7979 [tx-robot] updated from transifex 2017-05-21 00:08:35 +00:00
Lukas Reschke 551a189ae8 Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 17:15:19 -05:00
Morris Jobke 394023949e Merge pull request #4998 from nextcloud/fix-for-sharing-stable-12
fix for sharing stable12
2017-05-20 17:03:52 -05:00
Lukas Reschke e23569ed68 Merge pull request #4996 from nextcloud/stable12-version
12.0.0RC3
2017-05-20 20:31:24 +02:00
Daniel Hansson 8817c65120 fix for sharing stable12
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 17:15:14 +02:00
Lukas Reschke e6683f4007 12.0.0RC3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 14:21:47 +02:00
Nextcloud bot df61c9e283 [tx-robot] updated from transifex 2017-05-20 00:08:37 +00:00
Lukas Reschke 4bf9df9cf1 [stable12] Mark OAuth app as always enabled
At the moment we don't support disabling the OAuth app

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 17:28:10 -05:00
Morris Jobke 697e14bf74 Merge pull request #4977 from nextcloud/rename-secure-drop-stable12
rename secure drop back to files drop
2017-05-19 17:06:07 -05:00
Morris Jobke d37ac1862f Merge pull request #4980 from nextcloud/fix-missing-argument-2-getAppContainer
Fix missing argument 2 for Settings classes
2017-05-19 17:05:18 -05:00
Joas Schilling fa95fb6862 Fix missing argument 2 for Settings classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 22:30:55 +02:00
Bjoern Schiessle c4dd1d970f rename secure drop back to files drop because of name collision with securedrop.org
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-19 21:58:01 +02:00
Lukas Reschke ebd15f50d9 Merge pull request #4976 from nextcloud/stable12-4910
[stable12] Fix logo being too big on log in page
2017-05-19 21:56:11 +02:00
Lukas Reschke 6e2139f60e Merge pull request #4975 from nextcloud/stable12-4974
Fixes visible sidebar even if hidden is applied
2017-05-19 21:47:56 +02:00
Lukas Reschke e0277fa9b7 Merge pull request #4973 from nextcloud/stable12-4972
Fix group restriction regression
2017-05-19 21:46:14 +02:00
Lukas Reschke 9e667d81bb 12.0.0RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 21:19:07 +02:00
Julius Härtl c190dfbe53 Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 21:01:41 +02:00
Jan-Christoph Borchardt 053dffb169 Fix logo being too big on log in page, fix #4585
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-19 21:01:34 +02:00
Morris Jobke 5a6af19076 Fixes visible sidebar even if hidden is applied
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 13:05:57 -05:00
Morris Jobke 5fbfebac35 Fix group restriction regression
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:09:49 -05:00
Lukas Reschke cc2d06606d Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-ever
[stable12] Stop infinit loop on invalid settings css/js file
2017-05-19 16:59:55 +02:00
Lukas Reschke 32558991a6 Merge pull request #4962 from nextcloud/backport-4905
Allow automatic DI for apps that don't register the container in app.php
2017-05-19 16:18:31 +02:00
Joas Schilling aa83127686 Allow automatic DI for apps that don't register the container in app.php
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 13:49:36 +02:00
Lukas Reschke 90837b9175 Merge pull request #4949 from nextcloud/workaround-4948
Lowercase the scriptname again
2017-05-19 12:37:53 +02:00
Joas Schilling 8a570aebf6 Stop infinit loop on invalid settings css/js file
Don't try to find dirname of false...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 11:40:10 +02:00
Nextcloud bot e14bd212f7 [tx-robot] updated from transifex 2017-05-19 00:08:36 +00:00
Lukas Reschke 54b2286420 Lowercase the scriptname again
Ref https://github.com/nextcloud/server/issues/4948

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 01:57:26 +02:00
Lukas Reschke 94b9335936 12.0.0RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 00:59:46 +02:00
Lukas Reschke 7976927628 Merge pull request #4894 from nextcloud/generic-security-activities
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Lukas Reschke 8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner
Make sure we use the passed-in storage when there is one
2017-05-19 00:49:58 +02:00
Lukas Reschke 0eb4970ec8 Merge pull request #4704 from nextcloud/add-oauth-code-flow-support
Add oauth code flow support
2017-05-18 23:30:44 +02:00
Lukas Reschke c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons
Fallback to default favicon
2017-05-18 23:30:02 +02:00
Lukas Reschke 10930c9ff2 Merge pull request #4813 from nextcloud/accounts-table-migration-from-owncloud
Add a migration step to save the data from the accounts table before …
2017-05-18 22:31:36 +02:00
Roeland Jago Douma 19a1e01d6c Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-18 22:11:29 +02:00
Roeland Jago Douma e43649e67e Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-18 22:10:57 +02:00
Christoph Wurst 258c8720dd Fix backup codes activity type
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 58683f11ac Publish 2fa backup codes activities to the right stream
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 1632bb4557 Move activities test code
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Christoph Wurst 0928b5f621 Change 2FA activities to more generic security activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Lukas Reschke f4189699e7 Function accepts only integers
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:59:22 +02:00
Lukas Reschke b8de3f40ee Bearer comes first on the new endpoint
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:57:07 +02:00
Lukas Reschke 639ba526d0 Adjust realm from SabreDAV to Nextcloud
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:38:55 +02:00
Lukas Reschke f93db724d7 Make legacy DAV backend use the BearerAuth backend as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 21:19:39 +02:00
Lukas Reschke ba7b6bd973 Delete token after usage in test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:05 +02:00
Lukas Reschke fa6ec47a5c Add indexes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:58:04 +02:00
Lukas Reschke 7927aed991 Adjust token name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:11 +02:00
Lukas Reschke 538112181f Add additional test for accessing DAV using Bearer Auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:11 +02:00
Lukas Reschke f2a01e1b08 Use a standardized Bearer now
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke df3909a7c3 Use Bearer backend for SabreDAV
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke 30552090bc Don't ignore OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke 691646bdae Add tests for OAuth2 app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:10 +02:00
Lukas Reschke 59e968977c Add test for DefaultTokenMapper
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke d90eba3f85 Fix style issues pointed out in review
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke 77827ebf11 Rename table back to lowercase
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:09 +02:00
Lukas Reschke 26ee889fec Add tests for ClientFlowLoginController
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke a4116220cb Add app to autoenabled provisioning API scenario
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke b07a0f51ba Add OAuth state to session
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 88afd8b224 Cleanup code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:08 +02:00
Lukas Reschke 9d91ebf8e0 Add XSD definitions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 1eb7f4956b delete auth token when client gets deleted
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle 23b296b66e use name of oauth app to identify auth token
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle bb19b37097 hide client secret by default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Bjoern Schiessle baa8490f44 add some spacing between the logo and the content of the page
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:06 +02:00
Bjoern Schiessle a74d67b69c show error page if no valid client identifier is given and if it is not a API request
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:06 +02:00
Bjoern Schiessle 1a8965b488 handle case if no valid client identifier is given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:06 +02:00
Bjoern Schiessle 3775b14c4c remove 'Alternative login using app token' in case of oauth login
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:05 +02:00
Lukas Reschke e86749121c Remove special characters
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 4b4d3bb1c2 It's a bearer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 1470ec95ca Fetch signle row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:05 +02:00
Lukas Reschke 4d96cd3df7 Change to POST
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke c5ad3c9213 Increase length of encrypted token in database
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke 0a2b57c93f Get a single row
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:04 +02:00
Lukas Reschke a5ddd65c10 Use query builder
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Lukas Reschke 5f71805c35 Add basic implementation for OAuth 2.0 Authorization Code Flow
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-18 20:49:03 +02:00
Björn Schießle 879e11e7d1 Merge pull request #4812 from nextcloud/move-sharing-to-migration
Move the file sharing app to migration
2017-05-18 18:24:43 +02:00
Björn Schießle 6c20c42d1b Merge pull request #4939 from nextcloud/add-share-name-column
Add the column so we keep the value from before the update
2017-05-18 18:10:32 +02:00
Robin Appelman 1f1e1b0d00 use unmasked permissions during scanning
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-18 16:38:54 +02:00
Joas Schilling fad02fe00c Add the column so we keep the value from before the update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 14:45:26 +02:00
Joas Schilling 682a57d50e Copy avatars to the new location
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling c90d56748f We want to see 1 in 100 messages, not all but the 100th
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling e1b5d20b3b Fix updating from some 11 versions when people didn't update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling dd6c9cb03d Allow migrating from ownCloud 10.0.0
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling 2259140e3b Add some more casting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:04 +02:00
Joas Schilling 0e325756c3 Avoid problems for some DBs by removing the table completly
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:49:03 +02:00
Joas Schilling c6a5a25b48 Add a migration step to save the data from the accounts table before migrating
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-18 10:48:54 +02:00
Julius Härtl 489131333a Inject FileAccessHelper for proper testing
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-18 10:45:42 +02:00
Nextcloud bot d41fd7471c [tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Lukas Reschke c002698ed2 Merge pull request #4929 from nextcloud/beta-4
12.0.0 Beta 4
2017-05-18 00:02:27 +02:00
Lukas Reschke fb45767524 Merge pull request #4892 from nextcloud/fix/encryption-remembered-login-hook
Fix encryption + remembered login due to missing login hook
2017-05-17 22:21:09 +02:00
Lukas Reschke aa9b465af7 Merge pull request #4921 from nextcloud/filerow-clickability
Increase width of clickable area in file row to open file/folder
2017-05-17 22:15:46 +02:00
Lukas Reschke fe87d89865 12.0.0 Beta 4
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-17 22:14:23 +02:00
Lukas Reschke 6e6327ec74 Merge pull request #4923 from nextcloud/backgroundjobs-wording
Change cron wording to background jobs
2017-05-17 20:38:03 +02:00
Lukas Reschke 45fcfc3b0b Merge pull request #4926 from nextcloud/remove-saml-from-shipped-apps
user_saml is shipped via appstore
2017-05-17 20:37:24 +02:00
Lukas Reschke eb2b84ca22 Merge pull request #4927 from nextcloud/bump-dom-purify-release
Bump DOMPurify version to 0.8.9
2017-05-17 20:37:03 +02:00
Lukas Reschke c53dd8add0 Bump DOMPurify version to 0.8.9
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-17 18:23:21 +02:00
Lukas Reschke 7d818d91f6 Merge pull request #4924 from nextcloud/shadow-style
Unify box-shadow style, remove filter
2017-05-17 18:21:01 +02:00
Lukas Reschke 40244285e0 user_saml is shipped via appstore
Keeping it in the shipped.json leads to odd side-effects such as https://help.nextcloud.com/t/earn-a-t-shirt-by-testing-nextcloud-12-beta-2/12374/41?u=lukasreschke in case a previous version was installed.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-17 18:05:06 +02:00
Nextcloud bot 11e04e394d [tx-robot] updated from transifex 2017-05-17 15:56:32 +00:00
Morris Jobke c2d8fe6336 Merge pull request #4922 from nextcloud/verbose-uploadmenu-text
Use more verbose text for upload menu
2017-05-17 10:48:52 -05:00
Morris Jobke 2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background
OCS Return color when theming uses no background image
2017-05-17 10:42:41 -05:00
Morris Jobke e3322634a2 Merge pull request #4887 from nextcloud/theming-appdata-fix
Use appdata logo when generating icons
2017-05-17 10:38:50 -05:00
Julius Härtl 81847c01b0 Return color when theming uses no background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 13:16:44 +02:00
Julius Härtl 639168ede4 Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:16:59 +02:00
Julius Härtl d3865b6096 Use appdata logo when generating icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:14:37 +02:00
Julius Härtl edb5502b9d Add proper Content-Type to icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Julius Härtl 1157f413c9 Fallback to default favicon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-17 10:11:29 +02:00
Nextcloud bot 443cbdc739 [tx-robot] updated from transifex 2017-05-17 00:08:09 +00:00
Morris Jobke 3a70ebfe02 Merge pull request #4767 from nextcloud/app-code-checker
Check language files and database schema with app code checker
2017-05-16 16:20:27 -05:00
Morris Jobke 6dea5e6aad Implement skip checkers and log the currently tested app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-16 16:18:02 -05:00
Morris Jobke da9479735c Merge pull request #4911 from nextcloud/public-link-button
Remove primary class from public link download button
2017-05-16 15:12:54 -05:00
Jan-Christoph Borchardt 43cfad705c Change cron wording to background jobs
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:12:28 +02:00
Jan-Christoph Borchardt 35bd469aa0 Unify box-shadow style, remove filter
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:08:44 +02:00
Jan-Christoph Borchardt b7a9ec0002 Use more verbose text for upload menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:06:05 +02:00
Jan-Christoph Borchardt ecf3deb01c Increase width of clickable area in file row to open file/folder
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:04:43 +02:00
Jan-Christoph Borchardt c180ad1caa Remove primary class from public link download button 2017-05-16 20:47:52 +02:00
Christoph Wurst 1161139ebb Merge pull request #4900 from nextcloud/fix-search-mime-icons
Use proper mime icons for search results
2017-05-16 20:04:33 +02:00
Lukas Reschke 7d5b1b8c38 Merge pull request #4907 from nextcloud/mention-bog
Add some ignores
2017-05-16 17:52:58 +02:00
Morris Jobke e4b896d758 Add some ignores
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-16 10:48:36 -05:00
Morris Jobke d8b79c5dd1 Merge pull request #4906 from nextcloud/use-review-requested-feature
Use reviews instead of comments
2017-05-16 10:47:27 -05:00
Lukas Reschke 77430c6a6e Use reviews instead of comments
Allows using stuff such as https://github.com/nextcloud/server/pulls/review-requested/LukasReschke

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-16 17:46:18 +02:00
Morris Jobke aa077d737f Merge pull request #4893 from nextcloud/fix_4886
Cache deps list to memcache on write not on first read
2017-05-16 10:30:59 -05:00
Morris Jobke 78e6c2dea4 Merge pull request #4666 from nextcloud/enable-redis-cluster
Add redis cluster tests to our CI jobs
2017-05-16 10:10:25 -05:00
Lukas Reschke 15f7fe022b Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
Make it clear that you can now click on usernames
2017-05-16 16:29:09 +02:00
Joas Schilling f920dfe09b Skip the code checking for now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:17:56 +02:00
Joas Schilling 7ec58479f9 Fix return code handling
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:17:54 +02:00
Joas Schilling 3571355eb5 Run the app checker on all apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:55 +02:00
Joas Schilling 1951c88bdc We don't use the prefix on index names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:12 +02:00
Joas Schilling 8e757b343d Fix apps without translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:11 +02:00
Joas Schilling 31bb65fa36 Check the name length of database items
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:11 +02:00
Joas Schilling 93fc7fcdbe Check the syntax of the language file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 16:16:07 +02:00
Julius Härtl da281822b6 Use proper mime icons for search results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-16 14:30:49 +02:00
Roeland Jago Douma fd74428cdb Merge pull request #4865 from nextcloud/improve-two-factor-buttons
Improve layout of buttons for two factor auth
2017-05-16 13:11:55 +02:00
Roeland Jago Douma 0e66c2a38a Do not scan for keys just get all the keys (with prefix)
Apparently scan leads to some issues sometimes on cluster. So just use
the get function to fetch the keys.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-16 09:52:05 +02:00
Roeland Jago Douma e22b957d7f Merge pull request #4889 from nextcloud/fix-contactsmenu-overflow
Fix contacts menu overflow for few entries, fix #4744
2017-05-16 09:19:34 +02:00
Roeland Jago Douma 6afd098a94 Cache deps list to memcache on write not on first read
Fixes #4886

Caching on first read leads to the bug that if the files are updated we
will never cache again. Since we will always fetch from the memcache
(which works) and then see that the files are newer.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-16 09:01:20 +02:00
Christoph Wurst 0a43c259c4 Fix encryption + remembered login due to missing login hook
The encryption app relies on the post_login hook to initialize its keys.
Since we do not emit it on a remembered login, the keys were always un-
initialized and the user was asked to log out and in again.
This patch *translates* the postRememberedLogin hook to a post_login
hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-16 08:41:11 +02:00
Morris Jobke e920e20284 Merge pull request #4425 from nextcloud/oci
Primary key is too long for oracle
2017-05-15 23:55:50 -05:00
Nextcloud bot 7d1f362aa0 [tx-robot] updated from transifex 2017-05-16 00:08:08 +00:00
Jan-Christoph Borchardt d23a7e2560 Fix contacts menu overflow for few entries, fix #4744
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 01:08:49 +02:00
Joas Schilling d89d96203a Rename the index so the name is unique until the old table is deleted
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 74a6a6c839 Add a update step that copies all the backup codes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Joas Schilling 2dc79efb32 Rename the table to a valid name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 15:41:45 -05:00
Roeland Jago Douma 2c9007616b Merge pull request #4881 from nextcloud/sign-off-check
Run sign-off check as last check
2017-05-15 22:18:27 +02:00
Lukas Reschke a1a13fee9b Merge pull request #4884 from nextcloud/beta-3
Bump to 12.0.0 beta 3
2017-05-15 22:09:43 +02:00
Lukas Reschke f20f071e70 Bump to 12.0.0 beta 3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-15 20:25:33 +02:00
Morris Jobke 75c437a96a Merge pull request #4883 from nextcloud/revert-4685-fix_4683
Revert "fix permissions of mountpoints - take 2"
2017-05-15 12:43:36 -05:00
Morris Jobke 91dfff5db4 Revert "fix permissions of mountpoints - take 2" 2017-05-15 12:43:25 -05:00
Morris Jobke ad0d0b0916 Merge pull request #4685 from nextcloud/fix_4683
fix permissions of mountpoints - take 2
2017-05-15 11:53:59 -05:00
Morris Jobke 30443ac177 Improve layout of buttons for two factor auth
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 11:45:15 -05:00
Morris Jobke 3f201ec7f3 Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
Remove more personal info on user deletion
2017-05-15 11:03:33 -05:00
Lukas Reschke 79af585ecd Merge pull request #4867 from nextcloud/kill-install-app
Remove OC_App:installApp
2017-05-15 18:01:12 +02:00
Morris Jobke edbe15f1c9 Run sign-off check as last check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 11:01:06 -05:00
Morris Jobke 007748fb1e Merge pull request #4810 from nextcloud/downstream-27668
Fix mimetype update query
2017-05-15 10:56:18 -05:00
Morris Jobke c995bcd557 Merge pull request #4877 from nextcloud/oc-group-is-gone
Remove OC_Group call
2017-05-15 09:51:42 -05:00
Morris Jobke d8f13dfe74 Merge pull request #4847 from nextcloud/throw-exception-if-password-not-avail
Throws exception if password not available
2017-05-15 09:50:28 -05:00
Morris Jobke 8c5062794f Merge pull request #4873 from nextcloud/check-whether-REQUEST-exists
Check whether the $_SERVER['REQUEST_*'] vars exist before using them
2017-05-15 09:49:11 -05:00
Morris Jobke 3bd51321de Merge pull request #4872 from nextcloud/os-rename
Revert "fix objectstore rename"
2017-05-15 09:12:55 -05:00
Robin Appelman 9b750c08ac update comment to code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-15 15:54:37 +02:00
Lukas Reschke 6ff40e64fb Remove OC_Group call
OC_Group has been removed in March with https://github.com/nextcloud/server/pull/4867, the check in question is also performed two lines below already.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-15 14:52:40 +02:00
Joas Schilling 72c1b24844 Check whether the $_SERVER['REQUEST_*'] vars exist before using them
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 14:33:27 +02:00
Lukas Reschke 8e7cff2eac Merge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances
Allow to enforce update via web UI
2017-05-15 14:28:28 +02:00
Lukas Reschke 9d920ef9b2 Update autoloader map
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-15 14:24:44 +02:00
Lukas Reschke bf0d966c7a Merge pull request #4866 from nextcloud/login-footer-bold-link
Bold link in footer on login page
2017-05-15 14:22:19 +02:00
Roeland Jago Douma cef2110263 Revert "fix objectstore rename"
This reverts commit 5334a3dc33.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-15 13:59:18 +02:00
Joas Schilling 975e572a3d Remove account data on user deletion
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:31 +02:00
Joas Schilling cd79eb1b2c Remove 2FA backup codes on user deletion
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 13:31:30 +02:00
Joas Schilling c56c98183d Merge pull request #4862 from coderkun/issue-440-localhost-regex
Add IPv6 to “localhost” regex (#440)
2017-05-15 12:45:39 +02:00
Joas Schilling 00ebd5c184 Fix variable names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-15 12:38:30 +02:00
Morris Jobke be33234266 Remove OC_App:installApp
* uses Installer->installApp now
* removes unused code
* fixes #4453
* added some additional checks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 00:03:35 -05:00
Morris Jobke ba57cf85a6 Bold link in footer on login page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-14 22:26:10 -05:00
Nextcloud bot 9ad57cabc8 [tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
coderkun bdc7bb1f26 Add IPv6 to “localhost” regex (#440)
Signed-off-by: Oliver Hanraths <olli@coderkun.de>
2017-05-14 21:29:03 +02:00
Nextcloud bot b1bd9ff0b9 [tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Nextcloud bot 6e3a914f4a [tx-robot] updated from transifex 2017-05-13 00:08:00 +00:00
Morris Jobke 6bc2be991e Thows exception if password not available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-12 12:53:29 -05:00
Morris Jobke 3bf9503070 Merge pull request #4816 from nextcloud/Ardinis-quota-files_external
Correctly calculate used space for quota with external storage
2017-05-12 11:33:54 -05:00
Morris Jobke 51c55a867d fix quota tests for external storage
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-12 11:32:16 -05:00
Ardinis 40560ca98d Correctly calculate used space for quota with external storage
issue #4348

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-12 11:32:12 -05:00
Morris Jobke 2289ccd0ec Merge pull request #4829 from nextcloud/theming-preview-click
Clicking on theming preview triggers fileupload dialog
2017-05-12 10:22:20 -05:00
Lukas Reschke 4f752ed1fc Merge pull request #4809 from nextcloud/downstream-27676
Disable reset password link
2017-05-12 12:39:07 +02:00
Lukas Reschke 48a9a4bd81 Merge pull request #4825 from nextcloud/add-timeout-appstore
Add timeout for requests to appstore
2017-05-12 12:37:18 +02:00
Lukas Reschke 98a7b34661 Merge pull request #4822 from nextcloud/fix-input-size
Fix size of enforced expiry date input
2017-05-12 12:31:30 +02:00
Lukas Reschke 22dff1974f Merge pull request #4824 from nextcloud/log-connection-problems-appfetcher
Log connectiong problems while fetching data from appstore
2017-05-12 12:30:17 +02:00
Joas Schilling e6a0ad4701 Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 10:02:15 +02:00
Joas Schilling adad4281af Fix failed assertions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:58:18 +02:00
Joas Schilling 16d84815c7 Merge pull request #4826 from nextcloud/hide-cropper-input
Hide checkbox in avatarcropper
2017-05-12 09:54:55 +02:00
Joas Schilling 37d333c3b5 Don't open the dialog for logo and background
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:48:51 +02:00
Joas Schilling 51757716ec Fix the share type of guest shares when migrating from ownCloud
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Joas Schilling 643b4a4ec4 Move the file sharing app to migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:38:48 +02:00
Joas Schilling fd75c08238 Fix order of parameter and escaping
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-12 09:33:51 +02:00
Morris Jobke c2350f237e Clicking on theming preview triggers fileupload dialog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:49:36 -05:00
Morris Jobke f444090272 Hide checkbox in avatarcropper
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:18:09 -05:00
Nextcloud bot 645f0aa96f [tx-robot] updated from transifex 2017-05-12 00:07:46 +00:00
Morris Jobke f0790bfad7 Merge pull request #4821 from nextcloud/update-redis-cluster-documentation
Update redis cluster documentation
2017-05-11 17:59:09 -05:00
Morris Jobke 72943c99a4 Add timeout for requests to appstore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:49:03 -05:00
Morris Jobke c90d832ce4 Log connectiong problems while fetching data from appstore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:46:41 -05:00
Morris Jobke 8a05d22be7 Update redis cluster documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:42:23 -05:00
Morris Jobke 768e88a6c0 Fix size of enforced expiry date input
* fixes #4819

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:18:00 -05:00
Morris Jobke fe5a4dd499 Make cache tests a bit more clear
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:07:25 -05:00
Morris Jobke f73ca1b77f Add redis cluster tests to our CI jobs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:07:20 -05:00
Lukas Reschke d83f1d96d4 Merge pull request #4817 from nextcloud/more-app-update-logs
Proper logging for appstore updates
2017-05-11 21:52:33 +02:00
Morris Jobke caa0ae94e8 Proper logging for appstore updates
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 13:35:17 -05:00
Morris Jobke 3fa604cc5e Allow to enforce update via web UI
* adds a disclaimer that an update via web UI is on own risk
* allows to skip the warning
* fixes #4353

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 10:22:44 -05:00
Lukas Reschke 23b6f0e4d7 Merge pull request #4804 from nextcloud/proper-upgrade-size
Properly decide on actual users if instance is too big
2017-05-11 17:10:45 +02:00
Joas Schilling 0828df5ed4 Disable the API endpoints as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-11 17:03:57 +02:00
Morris Jobke ec0c7fd104 Merge pull request #4808 from nextcloud/downstream-27788
Adjust sample documentation
2017-05-11 09:07:57 -05:00
Morris Jobke 995fed8d8a Merge pull request #4800 from nextcloud/remove-unused-config.php-option
SSL menu is now shown for files_external
2017-05-11 09:04:54 -05:00
Morris Jobke 31128ec52b Merge pull request #4803 from nextcloud/postgres-sleep
Add 10 seconds sleep time after postgres startup
2017-05-11 09:03:46 -05:00
Joas Schilling 2c3df9ee0c More fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-11 11:30:51 +02:00
Joas Schilling 65efb388e6 Actually we want to update the mimetype of all files ending with the suffix
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-11 10:58:21 +02:00
Rello f1ef5fc537 don´t change folders with --repair-filecache
check if folder is "httpd/unix-directory" and don´t perform here #27585
2017-05-11 10:40:48 +02:00
Ujjwal Bhardwaj 7c23414eef Disable reset password link. Issue: #27440 2017-05-11 10:27:33 +02:00
Joas Schilling 8d7b9e9e12 Adjust sample documentation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-11 10:16:52 +02:00
Morris Jobke abe4a19cbc Properly decide on actual users if instance is too big
* state the reason why NC thinks it is a big instance

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 22:32:42 -05:00
Morris Jobke ca62984b8c Add 10 seconds sleep time after postgres startup
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 21:37:09 -05:00
Nextcloud bot 241226c23c [tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Morris Jobke 167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes
Use automatic injection for appdata folders
2017-05-10 17:31:05 -05:00
Morris Jobke 1c2ccd2206 Merge pull request #4798 from nextcloud/multibucket-root-fs
Setup root FS for multibucket object storage
2017-05-10 16:50:19 -05:00
Morris Jobke 3ad96a4c57 SSL menu is now shown for files_external
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 16:08:40 -05:00
Morris Jobke d73c8d0981 Use distributed cache for SCSS dependencies as well
* followup to #3978 because with the proper setup of
  appdata we now are using the same data on all nodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 13:31:45 -05:00
Morris Jobke 74d742ba6d Setup root FS for multibucket object storage
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-10 13:21:35 -05:00
Morris Jobke affa8d07ca Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn
Add fallback to jQuery.fn.globalEval
2017-05-10 11:37:06 -05:00
Joas Schilling cd2b567c21 Make sure we use the passed-in storage when there is one
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 15:45:18 +02:00
Roeland Jago Douma f95f1b20f1 Merge pull request #4787 from nextcloud/missing-parameter
Fix missing placeholder for doc link
2017-05-10 14:44:24 +02:00
Lukas Reschke 486bfa5c78 Merge pull request #4788 from nextcloud/issue-4756-cron-error
Fix errors with LookupServerConnector background job
2017-05-10 13:22:40 +02:00
Lukas Reschke 93994b1320 Eval script elemtents in HTML body response
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-10 13:03:15 +02:00
Joas Schilling d84a6ec3f3 Merge pull request #4771 from nextcloud/error-page-logo-css
use the same logo css for the error page as the login page
2017-05-10 12:10:38 +02:00
Joas Schilling 5c20d2ca8c Use the configured lookup server
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling 266a1e88fa Define method shouldRun
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 12:06:09 +02:00
Joas Schilling 253057355c Fix missing placeholder for doc link
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 11:45:08 +02:00
Joas Schilling 538d32fe87 Automatic injection into the Fetchers
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:56:38 +02:00
Joas Schilling ca39940614 Automatic creation of Identity manager
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:45:11 +02:00
Joas Schilling a8bb4a1898 Use automatic DI injection for UpdateLookupServer
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:44:02 +02:00
Joas Schilling d418ea550b Automatic injection for CssController
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:42:40 +02:00
Joas Schilling 9c8fe82000 Automatic injection for JsController
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:42:15 +02:00
Morris Jobke 209b05489d Merge pull request #4770 from nextcloud/bugfix/4749/properties_table_propertyvalue_clob
we can't predict the size of propertyvalue. text -> clob
2017-05-10 00:20:57 -05:00
Nextcloud bot fb78774eb8 [tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Lukas Reschke ec69980154 Merge pull request #4772 from nextcloud/fix-theming-background-preview
Fix theming preview for background image
2017-05-10 00:31:55 +02:00
Roeland Jago Douma 6a4734d78e Merge pull request #4702 from nextcloud/handle-user-folder-not-available
Stop if user folder is not available
2017-05-09 22:50:52 +02:00
Morris Jobke b2c96d0c23 Stop if user folder is not available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 11:26:08 -05:00
Julius Härtl fb204de7f6 Fix theming preview for background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-09 18:21:41 +02:00
Robin Appelman 6a0f2fe52d Merge pull request #4737 from nextcloud/logo-icon-container
fix sizing of logo in header
2017-05-09 18:21:01 +02:00
Robin Appelman 694c9ad49c use the same logo css for the error page as the login page
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-09 18:14:33 +02:00
Georg Ehrke 80eb3064e2 we can't predict the size of propertyvalue. text -> clob
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-09 18:12:50 +02:00
Roeland Jago Douma b9bcc819bd Merge pull request #4758 from nextcloud/fix_3470
Do not write and read rootcerts.crt at the same time
2017-05-09 15:00:35 +02:00
Roeland Jago Douma 04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment
Fix mentioned user not clickable after posting or editing a comment
2017-05-09 14:23:29 +02:00
Roeland Jago Douma 5a61a794d4 Do not write and read rootcerts.crt at the same time
(Possibly) fixes #3470

When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.

For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results

And we don't want all the certificates to appear 2 times in there.

This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-09 13:00:07 +02:00
Roeland Jago Douma 46f7e8202f Merge pull request #4752 from nextcloud/fix-personal-settings-popover
Fix privacy settings drop downs on personal settings page
2017-05-09 12:15:20 +02:00
Lukas Reschke 62f2610129 Merge pull request #4736 from nextcloud/richdef-opengraph
open-graph
2017-05-09 11:15:55 +02:00
Joas Schilling a089e08411 Add circle as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-09 10:45:10 +02:00
Roeland Jago Douma 07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload
Proper exception for upload of .htaccess file via WebDAV
2017-05-09 10:35:38 +02:00
Roeland Jago Douma a06ef70c8f Merge pull request #4757 from nextcloud/fix/system-users-enumeration-contacts-menu
Do not list system users in contacts menu if sharing autocompletion i…
2017-05-09 10:34:37 +02:00
Morris Jobke defb153ce3 Fix privacy settings drop downs on personal settings page
* fixes #4672

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-09 10:16:23 +02:00
Maxence Lange 90b1c73e81 my name as author
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:14:52 -01:00
Maxence Lange 93e4bd3495 using title as name
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-09 07:10:16 -01:00
Christoph Wurst 56a9084dd2 Do not list system users in contacts menu if sharing autocompletion is disabled
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-09 08:45:36 +02:00
Roeland Jago Douma dfa3aaa0c6 Merge pull request #4753 from nextcloud/fix-links-on-error-page
Fix escaped HTML on error pages
2017-05-09 08:45:11 +02:00
Roeland Jago Douma 684997f79c Merge pull request #4751 from nextcloud/wait-for-postgres
Wait for Postgres to be available
2017-05-09 08:44:28 +02:00
Roeland Jago Douma 888e719671 Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json
Don't redirect requests to /core/img/manifest.json
2017-05-09 08:43:35 +02:00
Nextcloud bot 37b847ec48 [tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot 43275b1000 [tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke d6c25748be Merge pull request #4755 from nextcloud/l10n-extraction
Extract app name and navigation entries for l10n
2017-05-08 23:25:20 -05:00
Morris Jobke 692e056df9 Extract app name and navigation entries for l10n
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 23:24:28 -05:00
Morris Jobke 9309217ecb Fix escaped HTML on error pages
* fixes #4655

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 21:16:08 -05:00
Morris Jobke f8044cbbce Proper exception for upload of .htaccess file via WebDAV
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 20:03:41 -05:00
Nextcloud bot f6a4028fad [tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Morris Jobke e696b92297 Wait for Postgres to be available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 17:57:49 -05:00
Lukas Reschke ccd0ded812 Don't redirect requests to /core/img/manifest.json
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-09 00:02:37 +02:00
Nextcloud bot 9d8e9b1efb [tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Lukas Reschke 3a22f9dfe5 Merge pull request #4745 from nextcloud/improve-text
Improve readability of verify text
2017-05-08 22:29:04 +02:00
Daniel Calviño Sánchez 0db3a413b3 Fix mentioned user not clickable after posting or editing a comment
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
Morris Jobke e77ea713b2 Improve readability of verify text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-08 15:03:25 -05:00
Daniel Calviño Sánchez 002018d8ad Add missing unit tests for comments with mentions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
Morris Jobke fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages
don't mention the owner of a file in case of a re-share by mail.
2017-05-08 13:32:04 -05:00
Morris Jobke 1a83f11925 Merge pull request #4718 from nextcloud/handle-stalled-or-invisible-elements-automatically-in-acceptance-tests
Handle stale or invisible elements automatically in acceptance tests
2017-05-08 12:52:30 -05:00
Morris Jobke 2d707fdfb5 Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch
fix PROPPATCH requests to read-only shared calendars
2017-05-08 12:42:30 -05:00
Bjoern Schiessle adb60ae965 don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-08 19:20:31 +02:00
Morris Jobke df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651
Create a photo cache to speedup the contactsmenu
2017-05-08 12:20:27 -05:00
Robin Appelman 36d0c3da69 Merge pull request #4733 from nextcloud/fix-browser-dav-root
fix error when browsing the dav root
2017-05-08 18:04:13 +02:00
Lukas Reschke 9bc77f2914 Merge pull request #4695 from nextcloud/reset-verify-state
reset verification state if max tries are reached
2017-05-08 17:51:07 +02:00
Lukas Reschke ecba440574 Merge pull request #4741 from nextcloud/bump-to-beta2
Increase version to beta2
2017-05-08 17:50:06 +02:00
Lukas Reschke c28fe270b6 Merge pull request #4727 from stffabi/IncreaseDeviceEntropy
Increase device password entropy.
2017-05-08 17:49:52 +02:00
Lukas Reschke 5213c56197 Merge pull request #4734 from nextcloud/allow-specifying-logo-mimetype
Add function to request SVG or regular fallback image
2017-05-08 17:48:50 +02:00
Lukas Reschke 157be421a9 Merge pull request #4740 from nextcloud/external-moved-to-appstore
External has been moved to appstore
2017-05-08 17:48:25 +02:00
Lukas Reschke f859a3a5e8 Merge pull request #4738 from nextcloud/check-if-nextcloud-is-installed
Check if Nextcloud is installed
2017-05-08 17:48:11 +02:00
Lukas Reschke 9904d1ab43 Increase version to beta2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 16:04:57 +02:00
Lukas Reschke dcfd1f5b48 External has been moved to appstore
As discussed with Joas.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 15:46:09 +02:00
Lukas Reschke 26f7a3b462 Check if Nextcloud is installed
Fixes https://github.com/nextcloud/server/issues/4735

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 15:10:53 +02:00
Robin Appelman 02f3b74409 fix sizing of logo in header
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-08 15:08:30 +02:00
Maxence Lange ce2afca0e4 open-graph
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-05-08 11:57:41 -01:00
Lukas Reschke 099234cf12 Add function to request SVG or regular fallback image
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Robin Appelman 9d8936c5bf fix error when browsing the dav root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-08 14:34:36 +02:00
Robin Appelman 6acae94a02 Merge pull request #4716 from nextcloud/user-settings-dropdown
polish user actions dropdown
2017-05-08 14:25:52 +02:00
Fabrizio Steiner f2a2b34e46 Increase device password entropy. Use lower- and upper-case characters and digits, but exclude ambiguous characters. The number of digits has also been increased to 25.
Signed-off-by: Fabrizio Steiner <fabrizio.steiner@gmail.com>
2017-05-08 14:04:40 +02:00
Roeland Jago Douma dea6edb066 Fix init
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 12:40:00 +02:00
Lukas Reschke 278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78
LDAP: only use proxy classes as backend
2017-05-08 12:29:38 +02:00
Lukas Reschke 4d101ca2be Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection
Automatic mysql 4byte detection
2017-05-08 12:18:40 +02:00
Lukas Reschke 7cc750fe37 Merge pull request #4617 from nextcloud/theming-plain-background
Theming app: Add plain background color option
2017-05-08 12:15:59 +02:00
Lukas Reschke fecf72fb70 Merge pull request #4632 from nextcloud/login-logo-ratio
show non landscape logos bigger on the login page
2017-05-08 12:11:15 +02:00
Georg Ehrke 255442f281 fix PROPPATCH requests to read-only shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-08 12:09:15 +02:00
Lukas Reschke 69c5bcd804 Merge pull request #4719 from nextcloud/error-page-theming
ensure theming app is loaded when showing an error page
2017-05-08 11:51:34 +02:00
Joas Schilling 3afad7fe40 Fix docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-08 11:34:47 +02:00
Roeland Jago Douma 92408390b0 Fix ImageExportPluginTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 747990b03a No more XSS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 3ab53d000f Clear cache on vcard change/delete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 34d97aa51c Request proper size for contacts menu
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma dd430c2fd7 Cache the carddav photo endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:49 +02:00
Roeland Jago Douma 303c0dd6a8 Always dispatch Carddav events
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-08 11:20:47 +02:00
Julius Härtl 2801f5139b Adjust login button color and remove border
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
Julius Härtl 510f7cf1b6 Fix tests for theming backgroundColor
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
Julius Haertl 4199a56912 Theming app: Add plain background color option
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-05-08 10:16:29 +02:00
Morris Jobke 4d7a96bc85 Merge pull request #4551 from nextcloud/external-storages
Fix name of external storages
2017-05-08 00:36:10 -05:00
Jan-Christoph Borchardt 010b9c4609 Fix name of external storages
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-08 00:33:45 -05:00
Nextcloud bot 6109afc14d [tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot 56bb8745df [tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Robin Appelman f12cd19c34 ensure theming app is loaded when showing an error page
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-06 17:50:48 +02:00
Robin Appelman 4fa8170394 polish user actions dropdown
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-06 16:22:25 +02:00
Daniel Calviño Sánchez 9313c9797f Add automatic handling of common command failures of Mink elements
Commands executed on Mink elements may fail for several reasons.
ElementWrapper is introduced to automatically handle some of those
situations, like StaleElementReference exceptions and ElementNotVisible
exceptions.

StaleElementReference exceptions are thrown when the command is executed
on an element that is no longer attached to the DOM. When that happens
the ElementWrapper finds again the element and executes the command
again on the new element.

ElementNotVisible exceptions are thrown when the command requires the
element to be visible but the element is not. When that happens the
ElementWrapper waits for the element to be visible before executing the
command again.

These changes are totally compatible with the current acceptance tests.
They just make the tests more robust, but they do not change their
behaviour. In fact, this should minimize some of the sporadic failures
in the acceptance tests caused by their concurrent nature with respect
to the web browser executing the commands.

However, the ElementWrapper is not a silver bullet; it handles the most
common situations, but it does not handle every possible scenario. For
example, the acceptance tests would still fail sporadically if an
element can become staled several times in a row (uncommon) or if it
does not become visible before the timeout expires (which could still
happen in a loaded system even if the components under test work right,
but obviously it is not possible to wait indefinitely for them).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez 64f9c56224 Extract element finding to a command object
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez 7642a4b727 Make internal find methods static
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-06 12:37:55 +02:00
Daniel Calviño Sánchez 16e3e81635 Add missing type hints
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-06 12:37:55 +02:00
Nextcloud bot 59ee22101f [tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Robin Appelman af4b792d88 Merge pull request #4710 from nextcloud/skeleton-read-only
handle permissions errors when copying the skeleton for a read only user
2017-05-05 17:21:02 +02:00
Roeland Jago Douma 57275e9944 Merge pull request #4701 from nextcloud/enforce-type
Enforce type hints in dav app
2017-05-05 15:33:35 +02:00
Morris Jobke ee2dfb24e0 Merge pull request #4703 from nextcloud/improve-memcache-test
Make cache tests a bit more clear
2017-05-05 09:53:20 -03:00
Robin Appelman 2b0da0f218 handle permissions errors when copying the skeleton for a read only user
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-05 14:44:51 +02:00
Roeland Jago Douma 15f43b2635 Merge pull request #4707 from nextcloud/fix-invalid-theming-urls
Fix invalid theming URLs
2017-05-05 12:47:50 +02:00
Morris Jobke ac04fb8277 Fix invalid theming URLs
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-05 00:37:32 -03:00
Nextcloud bot 619d09529c [tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Morris Jobke 0896d2b006 Make cache tests a bit more clear
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-04 19:37:40 -03:00
Morris Jobke 49e958fa12 Enforce type hints in dav app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-04 19:32:22 -03:00
Roeland Jago Douma 8dc2749296 Merge pull request #4588 from nextcloud/update-redirection-login-flow
Update login flow redirection
2017-05-04 21:06:04 +02:00
Roeland Jago Douma c3117f4e55 Merge pull request #4700 from nextcloud/redis-cluster-compatibility
Compatibility with Redis and RedisCluster
2017-05-04 21:03:02 +02:00
Mario Danic e4aac15a92 Update login flow redirection
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-04 19:21:22 +02:00
Morris Jobke 7f46898dad Compatibility with Redis and RedisCluster
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-04 12:42:58 -03:00
Christoph Wurst fb3ac32915 Merge pull request #4694 from nextcloud/fix_4676
Load proper fonts in guest.css
2017-05-04 17:21:07 +02:00
Morris Jobke 7bb63d6a4d Merge pull request #4681 from nextcloud/link_radio
Make read/write options in sharing view radiobuttons
2017-05-04 11:26:01 -03:00
Bjoern Schiessle 327cddc157 reset verification state if max tries are reached
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-04 14:53:24 +02:00
Roeland Jago Douma b66dfa909b Merge pull request #4693 from nextcloud/fix_4644
Do not reload the filelist on first open
2017-05-04 14:37:45 +02:00
Roeland Jago Douma 1a8befa447 Load proper fonts in guest.css
Fixes #4676

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 13:42:58 +02:00
Morris Jobke ea2a7d5b0a Merge pull request #4690 from nextcloud/fix-igroup-since
Documentation fix IGroup::getDisplayName is available since version 12
2017-05-04 08:42:00 -03:00
Roeland Jago Douma 8d66e325a9 Do not reload the filelist on first open
Fixes: #4644

Without this patch the filelist would always reload. However since not
all the correct data was set yet it would often:

1. fireoff a propfind to ../webdav/
2. fireoff a propfind to ../webdav/<PATH>

When just opening the file list those are the same so the result is just
fine. However if opening a direct link it means that there is a race
condition on which finishes first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 13:29:49 +02:00
Björn Schießle 4965f02bf4 Merge pull request #4689 from nextcloud/fix-password-protected-mail-shares
check password for mail shares as well
2017-05-04 12:19:36 +02:00
Julius Härtl d72706861d IGroup::getDisplayName is available version 12, not 11 (9.2)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-04 12:06:03 +02:00
Bjoern Schiessle c053a275d7 check password for mail shares as well
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-04 11:20:20 +02:00
Roeland Jago Douma 2216e5dcd0 Fix event firing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 09:22:28 +02:00
Roeland Jago Douma 412d3e2e80 Fix SharedStorage Test
A moveable mount point (What a SharedStorage is) always has DELETE +
UPDATE permissions. Since you can either delete (unshare) or update
(rename) it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:43:05 +02:00
Roeland Jago Douma e5960fe260 Revert "Revert "fix permissions of mountpoints""
This reverts commit 70a0e9c2d3.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:41:54 +02:00
Morris Jobke b04102aab3 Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissions
Revert "fix permissions of mountpoints"
2017-05-04 00:09:27 -03:00
Morris Jobke 70a0e9c2d3 Revert "fix permissions of mountpoints" 2017-05-04 00:09:09 -03:00
Morris Jobke 61379c9165 Merge pull request #4682 from nextcloud/try-to-start-browser-sessions-again-when-they-fail-in-acceptance-tests
Try to start browser sessions again when they fail in acceptance tests
2017-05-04 00:02:18 -03:00
Nextcloud bot 806aeae71d [tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Felix A. Epp 6f2cc42885 Add radio class to read/write sharing options and 1px left adjustment
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-05-04 01:34:29 +02:00
Felix A. Epp 758576f608 Fix read-only label id
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-05-04 01:33:03 +02:00
Roeland Jago Douma 2e32ab945b Make files drop more permanent
Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 00:30:51 +02:00
Daniel Calviño Sánchez 1a83c4c5c3 Set timeout multiplier to 10 for acceptance tests run by Drone
Sometimes, acceptance tests run by Drone fail due to a timeout when
starting the web browser sessions. Increasing the timeout should
minimize the possibility of the failure happening, although it can not
guarantee that it will not happen. A timeout multiplier of 10 was set
just because it looks like a reasonable margin of time, although it is
not based on any hard data.

The timeout multiplier affects too the timeout used when finding
elements. Like when starting a session, increasing the find timeout
simply gives the acceptance tests more time to find the objects before
giving up, so it does not change their behaviour when successful and can
also prevent failures due to default timeouts being too low for a
strained system.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez 4fc9a7146b Add option to acceptance test runners to set a custom timeout multiplier
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez b10478ff19 Try again to start browser sessions when they fail
Starting a session for an Actor can fail, typically, due to a timeout
connecting with the web browser. Now if the session fails to start it
will be tried again up to "actorTimeoutMultiplier" times in total before
giving up.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez e355e953b5 Generalize attribute name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 12:45:52 +02:00
Daniel Calviño Sánchez 97bedb94af Fix exponential increase of timeout when finding ancestor elements
The timeout passed to the "find" method was multiplied by the
"findTimeoutMultiplier" attribute. However, as "find" used
"findAncestor" and "findAncestor", in turn, used "find" itself the
timeout was increased exponentially for ancestor elements. Now "find"
was split in "find" and "findInternal"; the first method is the public
one and modifies the given parameters as needed and then calls the
second method, private, that performs the find itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 12:34:04 +02:00
Nextcloud bot 3dbf30c220 [tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
Morris Jobke dbe11916fa Merge pull request #4662 from nextcloud/remove-named-selectors-from-acceptance-tests
Remove named selectors from acceptance tests
2017-05-02 20:44:23 -03:00
blizzz 4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726
show error message when "files-drop" upload fails
2017-05-03 00:21:40 +02:00
Morris Jobke aa39f9b8fc Merge pull request #4623 from nextcloud/fileinfo-mount-permissions
fix permissions of mountpoints
2017-05-02 17:28:33 -03:00
Morris Jobke a94c706f26 Merge pull request #4667 from nextcloud/split-up-more-integration-tests
Split up sharing-v1-part2.feature to avoid timeouts
2017-05-02 17:27:37 -03:00
Morris Jobke c079ca7651 Merge pull request #4669 from nextcloud/checkers
Consolidate all the code checkers into one job
2017-05-02 17:27:00 -03:00
Morris Jobke f233e856bf Merge pull request #4665 from nextcloud/enable-redis
Add redis support to our CI jobs
2017-05-02 17:16:19 -03:00
Roeland Jago Douma 24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
Lukas Reschke 34b8ea6ebf Merge pull request #4664 from nextcloud/redis-sample-config.php
Improve documentation for redis cluster
2017-05-02 21:46:34 +02:00
Roeland Jago Douma 6d9cb62f79 Merge pull request #4611 from nextcloud/js-use-dot-notation
Use dot notation for array access - JSLint recommendation
2017-05-02 21:44:44 +02:00
Morris Jobke a1929f4d56 Consolidate all the code checkers into one job
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 16:04:09 -03:00
Morris Jobke ecb369b5e8 Add redis support to our CI jobs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 15:55:42 -03:00
Robin Appelman c50b7addc7 smaller max logo sizes and cleaner code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:01:11 -03:00
Morris Jobke 865cd487c4 Split up sharing-v1-part2.feature to avoid timeouts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 12:55:29 -03:00
Morris Jobke 1e75206670 Improve documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 12:42:06 -03:00
Lukas Reschke 121cb4bcfc Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu
Do not show an email action for contacts with emtpy email addresses
2017-05-02 17:02:16 +02:00
Lukas Reschke 68a1902586 Merge pull request #4636 from nextcloud/jquery-migrate-browser
Remove dependency on jquery-migrate.js for browser detection
2017-05-02 17:01:27 +02:00
Lukas Reschke db337b4285 Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes
Hide 2FA backup codes if no other 2FA providers are enabled
2017-05-02 16:08:11 +02:00
Roeland Jago Douma cd631e5b9e Merge pull request #4657 from nextcloud/add_caching_imageexport
Add caching imageexport
2017-05-02 15:57:29 +02:00
Morris Jobke 705483e712 Merge pull request #4651 from nextcloud/fix_appfetcher_update
Make sure the AppFetcher fetches the new applist from the appstore
2017-05-02 10:45:04 -03:00
Daniel Calviño Sánchez 1381f6c131 Replace "named" Mink selectors with "named_exact" Mink selectors
The "named" Mink selector first tries to find an exact match for its
locator and then, if not found, tries to find a partial match. Besides
other harder to track problems (see comment in the commit in which the
"content" locator was removed), this could cause, for example, finding
an action link titled "Favorited" when looking for the action link
titled "Favorite" (that is, one that conveys the opposite state to the
one found).

Although currently all the acceptance tests are compatible with both the
"named" and the "named_exact" Mink selectors the predefined locators are
modified to use the "named_exact" Mink selector to make them more
future-proof; the "named" Mink selector can still be used if needed
through the "customSelector" method in the builder object.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-02 15:09:38 +02:00
Daniel Calviño Sánchez 762a8e0b76 Remove "content" locator from acceptance tests
The "content" locator uses the "named" Mink selector and the "content"
Mink locator to find the element. The "named" Mink first tries to find
the elements whose content match exactly the given content but, if none
is found, then it tries to find elements that just contain the given
content.

This behaviour can lead to hard to track issues. Finding the exact match
and, if not found, finding the partial match is done in quick
succession. In most cases, when looking for an exact match the element
is already there, it is returned, and everything works as expected. Or
it may not be there, but then it is not there either when finding the
partial match, so no element is returned, and everything works as
expected (that is, the actor tries to find again the element after some
time).

However, it can also happen that when looking for an exact match there
is no element yet, but it appears after trying to find the exact match
but before trying to find the partial match. In that situation the
desired element would be returned along with its ancestors. However, as
only the first found element is taken into account and the ancestors
would appear first the find action would be successful, but the returned
element would not be the expected one. This is highly unlikely, yet
possible, and can cause sporadic failures in acceptance tests that,
apparently, work as expected.

Using a "named_exact" Mink selector instead of the "named" Mink selector
does not provide the desired behaviour in most cases either. As it finds
any element whose content matches exactly the given content, looking for
"Hello world" in "<div><p><a>Hello world</a></p></div>" would match the
"div", "p" and "a" elements; in that situation the "div" element would
be the one returned, when typically the "a" element would be the
expected one.

As it is error prone and easily replaceable by more robust locators the
"content" locator was removed from the predefined ones (although it can
still be used if needed through the "customSelector" method in the
builder object).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-02 15:09:25 +02:00
Christoph Wurst d8b3fe460e Hide 2FA backup codes if no other 2FA providers are enabled
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-02 14:40:44 +02:00
Christoph Wurst b13c741cb3 Do not show an email action for contacts with emtpy email addresses
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-02 14:12:04 +02:00
Robin Appelman 2847e9f2e3 fix preview tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:43:48 +02:00
Morris Jobke 23cc309606 Handle more error cases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
Morris Jobke 6aac094091 Add PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:47 +02:00
Robin Appelman 4dfd90abc4 better handling of preview generation errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:43:47 +02:00
Roeland Jago Douma d25e13ea27 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 12:39:37 +02:00
Roeland Jago Douma 59e27f03b6 Add caching to the imageexport plugin
Since we now heavily use this endpoint for the contacts menu we better
set proper caching on the images. Else this gets reload over and over
again leading to slow loading menu and unneded bytes transfered.

* cache for 1 hour by default
* added ETag for validation

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 12:30:34 +02:00
Roeland Jago Douma 73b4ef53f0 Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 11:38:37 +02:00
Roeland Jago Douma ae7c1504a9 Fix test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 11:38:21 +02:00
Roeland Jago Douma e79424932a Make sure the AppFetcher fetches the new applist from the appstore
When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 10:24:10 +02:00
Lukas Reschke 94c2f12226 Merge pull request #4638 from nextcloud/fix-copy-tooltip
Fix "Copied" message for public links
2017-05-02 10:10:23 +02:00
Lukas Reschke d4217830c6 Merge pull request #4649 from nextcloud/update-links-to-12
Update documentation go.php URL to 12
2017-05-02 10:09:57 +02:00
Lukas Reschke 81ee0673a5 Merge pull request #4650 from nextcloud/appcache_on_update
Do not use caching for appstore fetchers after upgrade
2017-05-02 09:15:35 +02:00
Roeland Jago Douma aa4cebe749 Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 09:00:09 +02:00
Roeland Jago Douma 762284ce93 Fix and update tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 08:59:53 +02:00
Roeland Jago Douma 095463d568 Do not do ETag caching when the version is updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 08:44:20 +02:00
Lukas Reschke 6458875dc1 Update documentation go.php URL to 12
Fixes https://github.com/nextcloud/server/issues/4646

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-02 08:17:59 +02:00
Nextcloud bot f27d382c47 [tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke af6f5e8fad Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled
Mark IP as whitelisted if brute force protection is disabled
2017-05-01 18:03:39 -03:00
Morris Jobke 2ce71f8c24 Fix "Copied" message for public links
* share a file/fodler by public link and click the
  copy to clipboard icon and watch the tooltip
* before: it said "Copy"
* after: it now says "Copied" after clicking the button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 17:58:12 -03:00
Morris Jobke 242934c016 Remove dependency on jquery-migrate.js for browser detection
* ref #4628

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 17:53:48 -03:00
Lukas Reschke 72dd4425c9 Merge pull request #4626 from nextcloud/adjust-shipped-json
Remove apps delivered from the appstore
2017-05-01 20:49:43 +02:00
Lukas Reschke 8cb3115acf Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity
Remove abandoned methods in OC.Share that refer to old API endpoints
2017-05-01 20:44:19 +02:00
Lukas Reschke dd03fdebec Add missing space
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 20:36:25 +02:00
Roeland Jago Douma 4904117ba8 Merge pull request #4612 from nextcloud/js-fix-long-lines
Fix some long lines in JS - JSLinut recommendation
2017-05-01 19:55:56 +02:00
Roeland Jago Douma 92b73db053 Merge pull request #4613 from nextcloud/remove-unused
Remove unused JS file
2017-05-01 19:42:12 +02:00
Robin Appelman fa52f906e3 show non landscape icons bigger on the login page
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-01 19:05:21 +02:00
Lukas Reschke a5ccb31e85 Mark IP as whitelisted if brute force protection is disabled
Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling.

This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 18:31:45 +02:00
Lukas Reschke 0329adbc61 Merge pull request #4599 from nextcloud/contactsmenu-mobile
Define max-width for Contacts menu for mobile
2017-05-01 18:05:52 +02:00
Lukas Reschke 4a05ca46d3 Merge pull request #4598 from nextcloud/menu-flashing
Prevent flashing of apps and user menu on page load
2017-05-01 18:04:51 +02:00
Morris Jobke dba55f950a Merge pull request #4594 from nextcloud/theming-image-default
Delete theming images when logo/background is reset to default
2017-05-01 12:55:00 -03:00
Morris Jobke 3eba37ac14 Merge pull request #4527 from nextcloud/downstream-27504
Adjust SMB permissions on the root
2017-05-01 12:53:49 -03:00
Lukas Reschke 7a2d817c83 Merge pull request #4624 from nextcloud/email-settings-html
fix email settings
2017-05-01 17:51:15 +02:00
Lukas Reschke a2f6fea408 Merge pull request #4610 from nextcloud/js-semicolons
Fix semicolon at end of JS lines
2017-05-01 16:55:35 +02:00
Lukas Reschke 99f98ca343 Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate
Fix variable definitions in oc dialogs
2017-05-01 16:54:53 +02:00
Lukas Reschke 1e35c9d8b6 Merge pull request #4513 from nextcloud/bump-version-to-beta1
Bump version to Nextcloud 12.0 beta 1
2017-05-01 16:53:16 +02:00
Lukas Reschke a3546b0ec0 Remove apps delivered from the appstore
Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature.

Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore.

Fixes https://github.com/nextcloud/server/issues/4605

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 16:47:58 +02:00
Robin Appelman 6e7359ebfd fix email settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-01 16:32:09 +02:00
Robin Appelman 75b3b72d89 fix permissions of mountpoints
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-01 15:37:02 +02:00
Roeland Jago Douma 18b5e2fced Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js
Fix variable definition in sharedialogview.js
2017-05-01 14:21:28 +02:00
Morris Jobke 23858504eb Fix variable definition in sharedialogview.js
* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:32:54 -03:00
Morris Jobke 4cd8b3379b Remove unused methods from OC.Share
* they do calls against core/ajax/share.php which doesn't exist anymore
* also the methods are not called in any of our apps or any of the apps in the appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:29:00 -03:00
Morris Jobke d222351c87 Fix variable definitions in oc dialogs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 01:09:29 -03:00
Morris Jobke 26b92ada0e Remove unused JS file
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:59:10 -03:00
Morris Jobke a9ccfe06d9 Fix some long lines in JS - JSLinut recommendation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:49:00 -03:00
Morris Jobke 80a5e0a735 Use dot notation for array access - JSLint recommendation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:45:41 -03:00
Morris Jobke 11b9d224fd Fix semicolon at end of JS lines
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 00:42:53 -03:00
Nextcloud bot 2152d5f1f6 [tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Morris Jobke 285a5b98b0 Merge pull request #4602 from nextcloud/make-tooltip-intransparent
Make tooltip intransparent
2017-04-30 11:13:36 -03:00
Julius Härtl 7c69c117e2 Delete theming images when logo/background is reset to default
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-30 11:04:55 -03:00
Nextcloud bot 4518f6dc64 [tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
blizzz 9edd3916ff Merge pull request #4603 from nextcloud/basic-settings
Rename “Server settings” to “Basic settings”
2017-04-29 23:28:50 +02:00
Marius Blüm f26764c790 Rename “Server settings” to “Basic settings”
* fixes #4587

Signed-off-by: Marius Blüm <marius@lineone.io>
2017-04-29 17:13:21 +02:00
Jan-Christoph Borchardt fabaf09d4f Merge pull request #4583 from nextcloud/theming-fixes-admin
Theming admin section fixes
2017-04-29 17:05:11 +02:00
Morris Jobke 55da62a29c Make tooltip intransparent
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 10:44:38 -03:00
Morris Jobke 9af26d1db5 Merge pull request #4597 from nextcloud/tooltips-invert
Invert tooltip color to white, fix #4563
2017-04-29 10:43:33 -03:00
Jan-Christoph Borchardt bc36446455 Define max-width for Contacts menu for mobile
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:55:57 +02:00
Jan-Christoph Borchardt 7015eb9fe5 Prevent flashing of apps and user menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:34:44 +02:00
Jan-Christoph Borchardt 41b67e3d17 Invert tooltip color to white, fix #4563
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-29 13:19:17 +02:00
Morris Jobke 854dfef199 Merge pull request #1234 from nextcloud/rebase-413-by-faldon
Disabling users in WebUI
2017-04-29 01:35:04 -03:00
Arthur Schiwon c0e4fd0605 align popovermenu next to … buttonthingy
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Arthur Schiwon 99e97f135d consolidate setEnabled method
and fix a unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Arthur Schiwon 668fe7df51 UserManager can now count disabled users
Users page takes advantage of that

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-29 00:59:09 -03:00
Christoph Wurst 8f5f26c88d Use short array syntax
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-29 00:59:09 -03:00
Morris Jobke 4c37c38051 fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 485d6d6577 use proper return codes and handle failure cases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 2507e7459d Improve wording of error messages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 74802ca72f fix greyed out display name
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke a8457df064 fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 74e5091013 check $user object before using it
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:59:09 -03:00
Morris Jobke 72550377b4 add unit tests for enable method 2017-04-29 00:59:09 -03:00
Morris Jobke e521b6799f add unit tests for disable method 2017-04-29 00:59:09 -03:00
Morris Jobke 79d74a1425 adjust tests to have at least one disabled user 2017-04-29 00:54:30 -03:00
Morris Jobke 7be031ae6d change group id to _disabledUsers 2017-04-29 00:54:30 -03:00
Morris Jobke d91b4044fc optimize SVGs 2017-04-29 00:54:30 -03:00
Roeland Jago Douma 84b4d448d0 Fix unit tests 2017-04-29 00:54:30 -03:00
Morris Jobke 0ab85018e3 improve layout 2017-04-29 00:54:30 -03:00
Thomas Pulzer 637c75bca1 Implemented visual feedback if a user is disabled in admin user menu.
Implemented visuals for enabling/disabling user from admin user list.
Added the controller functions for enabling/disabling a user.

Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller.
 Finished the visuals to reflect current user status and changed user status respectively.

Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable.

Added displaying of disabled user count.
Improved style of user action menu.

Added proper counting of disabled users.
Removed visual indicator for disabled users.

Moved pseudo-group detection for disabled users from frontend to the controller.
Changed units for newly introduced css values from em to px.
Removed unnecessary png and optimized svg with scour.
Changed the userlist template to display the user action menu with correct width.

Style fixes for better readability and coding style conformity.

Changed the icons for enabling, disabling and deleting a user in the action menu.
2017-04-29 00:54:30 -03:00
Julius Härtl 6e215a0874 Code cleanup and preview for undo actions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl b436e43d68 Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl 6b8341ce4b Use generated SCSS for theming preview
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Morris Jobke 1307800561 Merge pull request #3869 from nextcloud/verify-personal-data
Verify personal data
2017-04-29 00:38:02 -03:00
Morris Jobke a0bf706983 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-29 00:13:41 -03:00
Bjoern Schiessle f488258d64 send signature to lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Roeland Jago Douma e3b10f3e6f Updated autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 9b36f2d9ea fix unit test
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 5464b14ef1 fix path to the website proof
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 7340d6a56c don't add multiple retry jobs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 4ec05ef050 cleanup template
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle df1d1c6c8f use already available instance if l10n
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 806ca43b52 allow to display the verification code also while verification is already running
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:38 -03:00
Bjoern Schiessle 9480b29413 move translatable strings out of the template
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 68ba8572b2 verification button should be clickable directly after status change, not only after page reload
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 072d69ffe4 fix name of website input field
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 2d071792c5 only close verification dialog if the user clicks outside of the dialog
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt 46079162cd Fix text overflow in website popover
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle e9021c123d update message in verify popup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle ec452a8294 only show verify button if scope is public and the input field contain some value
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt 9c0414bb47 Fix verification button placement on mobile
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt e40bdcd2ed Fix dialog width
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt de529b914b Improve placeholders for website and Twitter handle
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 47985a13fd only show verification buttons for public fields and field with some actual value
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle a0ca1c04c3 show and hide verification dialog
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 5fa0e6df39 fix email verification status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt 981c110f7e Use JS for verification icon tooltip
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt c1a784ee33 Fix verification icon positon and cursor
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 75c5becfda email doesn't need a verification dialog, verification mail is send automatically by the lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt ee61570acc Fix email verification cursor thing properly
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 27b676b680 only verify-actions should show a mouse pointer
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt 59e8a19cc8 Use individual verification popover dialogs instead of one
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Jan-Christoph Borchardt 6a48548755 Group verification CSS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:37 -03:00
Bjoern Schiessle 67057f7e71 minor style fixes; use verify-action class only for verification-status-icons which are interactive
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 9a366dbe2e add missing translation and other small fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Jan-Christoph Borchardt 08a33cc475 Fix styling of verification box to popover
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 17ad8120fd fix css file
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 46dd549e80 change status indicator if value was changed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle ebcb847681 remove action class once the status changes from 'to verify' to 'verifying'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 06265fe770 make use of verification buttons
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Jan-Christoph Borchardt 2a07ec8e21 Add verification icons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 71657db4be updated unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle f32304ffb9 remove unused variable
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 5c202884e9 pass verified status to template
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 391a989a91 make sure that every data set has a 'verified' status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle f3c433af7b check right location to verify web page and query lookup server for exact cloud id to check if the email address was verified correctly
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 7c309c253b ask lookup server if email address was verified by the user
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 86701dce7b make sure that we don't lose previous verification status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 94df091ee4 send local verification status to lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 866e5d6d05 use configured lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle cbf5acca45 check verification proof and update account table
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle 6f41a3edc0 store verification status in accounts table and update lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:36 -03:00
Bjoern Schiessle c9ccdca1ec add verification dialog
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:35 -03:00
Bjoern Schiessle 1fc05ea53a allow admin to configure lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-28 23:41:35 -03:00
Morris Jobke 2a773310dc Merge pull request #4098 from nextcloud/feature/caldav_search
add Nextcloud Search extension to CalDAV
2017-04-28 23:38:04 -03:00
Morris Jobke 424d62d630 Merge pull request #4566 from nextcloud/cache-gc-no-fs
dont spam log when request can't access filesystem
2017-04-28 23:11:08 -03:00
Nextcloud bot c4673224d1 [tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Morris Jobke ed21ab56c7 Merge pull request #4584 from nextcloud/hint-theming
Hint: Theming customizes the look and feel of supported clients too
2017-04-28 19:11:34 -03:00
Robin Appelman d925856787 dont spam log when request can't access filesystem
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 17:01:31 -03:00
Morris Jobke d4e5b1bf14 Merge pull request #4559 from nextcloud/invert-new-icons
Invert new header icons on bright theming colors
2017-04-28 16:01:35 -03:00
Julius Härtl d13e311aaf Invert new header icons on bright theming colors
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-28 15:53:33 -03:00
Marius Blüm 2eeed15f19 Hint: Theming customizes the look and feel of supported clients too
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-04-28 20:34:58 +02:00
Georg Ehrke 0f8a9514de rename calendarobjects_properties -> calendarobjects_props
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-28 20:21:46 +02:00
Georg Ehrke 8d00458b56 unit test custom calendar search
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-28 20:21:36 +02:00
Nextcloud bot 3c4dab1bbe [tx-robot] updated from transifex 2017-04-28 14:05:56 +00:00
Roeland Jago Douma 3e8c5441f7 Merge pull request #4521 from nextcloud/custom-mount-types
allow apps to set custom mount types
2017-04-28 12:50:38 +02:00
Lukas Reschke ec272f3ac3 Merge pull request #4574 from nextcloud/rename-extension-point
Rename extension point
2017-04-28 11:15:28 +02:00
Roeland Jago Douma 75e783c2a9 Merge pull request #4575 from nextcloud/add-sharing-types-for-guest
Add sharing types for guests
2017-04-28 11:12:10 +02:00
Joas Schilling df2ad641f4 Merge pull request #4576 from nextcloud/disable-oc-migration-until-we-found-a-path
Disable OC Migration until we found a path to do it
2017-04-28 10:31:21 +02:00
Joas Schilling 95b3a4dc1b Disable OC Migration until we found a path to do it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-28 10:20:32 +02:00
Roeland Jago Douma c42278b651 Make sure mountType is actually defined
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-28 10:03:31 +02:00
Lukas Reschke 9e7f7ba7f6 Add sharing types for guests
Fixes https://github.com/nextcloud/guests/issues/4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-28 09:56:57 +02:00
Lukas Reschke e974f26afa Rename extension point
To align with upstream.

Fixes https://github.com/nextcloud/guests/issues/3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-28 09:49:02 +02:00
Joas Schilling 3fb7de2dfb Merge pull request #4562 from nextcloud/contactmenu-second-tooltip
Show tooltip for second action in contacts menu
2017-04-28 09:38:35 +02:00
Robin Appelman ab9a36e872 allow apps to set custom mount types
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-28 09:38:21 +02:00
Roeland Jago Douma 9da697b11a Merge pull request #4524 from nextcloud/downstream-27508
Keep file id on move
2017-04-28 09:37:40 +02:00
Joas Schilling 0aa5ddff13 Fix autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-28 09:35:36 +02:00
Martin 99d60f43dc config.sample.php doc update for MySQL 4-Byte unicode 2017-04-28 09:35:36 +02:00
Thomas Müller 86ccc8949f MySQL 4 byte is now detected during setup in any case.
config.sample.php was updated to explicitly state that there detection in place to set mysql.utf8mb4
2017-04-28 09:35:36 +02:00
Thomas Müller 43427e26d7 Add console command to migrate the charset 2017-04-28 09:35:36 +02:00
Thomas Müller 6d93cb7488 Fix mysql settings 2017-04-28 09:35:36 +02:00
Thomas Müller aa22f93018 During setup of a mysql database we try to detect if charset 'utf8mb4' can be used 2017-04-28 09:35:35 +02:00
Roeland Jago Douma 3fd75e288c Merge pull request #4569 from nextcloud/fix-icons
Fix icons in sidebar on personal page
2017-04-28 08:33:45 +02:00
Lukas Reschke a809aa51cd Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade
Do not disable 3rdparty apps on occ upgrade
2017-04-28 08:33:28 +02:00
Nextcloud bot 6908818999 [tx-robot] updated from transifex 2017-04-28 00:07:41 +00:00
Morris Jobke aa10cca61b Do not disable 3rdparty apps on occ upgrade
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 18:11:33 -03:00
Morris Jobke d6e7cee607 Fix icons in sidebar on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 17:58:41 -03:00
Morris Jobke f000e22a97 Merge pull request #4522 from nextcloud/downstream-27596
Allow to create a user for a specific backend
2017-04-27 16:41:08 -03:00
Morris Jobke 2be212d179 Merge pull request #4565 from nextcloud/fix-typo
Fix typo in HTML tags
2017-04-27 16:33:54 -03:00
Morris Jobke 73660a3f81 Fix typo in HTML tags
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 16:14:21 -03:00
Morris Jobke 7b0ad3fb85 Merge pull request #4561 from nextcloud/text-for-federated
Add hint for federated sharing
2017-04-27 16:07:29 -03:00
Ivan Sein 9c4275a832 Show tooltip for second action.
Signed-off-by: Ivan Sein <ivan@nextcloud.com>
2017-04-27 18:11:35 +02:00
Morris Jobke 04cac5fb2b Add hint for federated sharing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-27 13:08:32 -03:00
Morris Jobke 31c762aebf Merge pull request #4540 from nextcloud/settings-help
Add more hints to settings
2017-04-27 12:09:01 -03:00
Juan Pablo Villafáñez a9a80f95e3 Use proxy classes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-27 15:57:25 +02:00
Joas Schilling 5f6153168f Fix class names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 15:45:41 +02:00
Joas Schilling 5bc593a92c Make it clear that you can now click on usernames
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 15:33:16 +02:00
Artur Neumann f2f2e7b6fb some small refactoring and reformating
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:55 +05:45
Artur Neumann 79c760a10c use jqXHR.fail() to check for failures
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-27 14:16:36 +05:45
Joas Schilling a9d06c07d8 Fix last unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 10:18:31 +02:00
Joas Schilling 6fb7d9a865 Don't end the abstract class name with Test.php
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 09:49:37 +02:00
Vincent Petry 211a76eff3 Add comment 2017-04-27 09:29:20 +02:00
Vincent Petry 614bd5c294 Properly handle missing READ permission 2017-04-27 09:29:02 +02:00
Joas Schilling 53deb26778 Fix duplicate name of class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 09:15:50 +02:00
Joas Schilling 9212089151 Use the new method in the old one to remove duplicate code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 08:56:51 +02:00
Morris Jobke 3e37a5f1c7 Merge pull request #3770 from nextcloud/faster-search-in-contacts
Factorize query for searching contacts
2017-04-27 00:25:30 -03:00
Morris Jobke 4dab01d9ed Merge pull request #4501 from nextcloud/downstream-27144
Add duration of last job execution to the table
2017-04-26 23:16:21 -03:00
Morris Jobke 10ec3fda83 Merge pull request #4519 from nextcloud/downstream-27703
Reload file list when leaving hidden state
2017-04-26 23:05:08 -03:00
Morris Jobke 01705b1b6a Merge pull request #4515 from nextcloud/downstream-27643
Adjust query/event logging code in favour of more complex owncloud/di…
2017-04-26 22:58:01 -03:00
Morris Jobke 0ac806a9dd Merge pull request #4517 from nextcloud/downstream-27637
Fix recovery checkbox label to properly point
2017-04-26 22:54:20 -03:00
Nextcloud bot c1c5f51fd8 [tx-robot] updated from transifex 2017-04-27 00:07:40 +00:00
Morris Jobke f72f55354d Merge pull request #4537 from nextcloud/change-link
Change feed to website planet link, fix wording
2017-04-26 19:29:29 -03:00
Morris Jobke 4a9cb81486 Merge pull request #4526 from nextcloud/downstream-27269
Don`t allow upload of files with extension .part
2017-04-26 18:21:13 -03:00
Morris Jobke aad0794500 Merge pull request #4454 from nextcloud/add-bundles-to-install-page
Add app bundles to the apps page and unbundle enterprise apps
2017-04-26 18:20:40 -03:00
Jan-Christoph Borchardt cb16892443 Add more hints to settings
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 22:43:58 +02:00
Morris Jobke 58fe27f092 Merge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-file-in-folder
Fix details view not closed when viewing a file in its folder
2017-04-26 17:42:55 -03:00
Roeland Jago Douma d0bbae7425 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-26 22:25:41 +02:00
Morris Jobke 313c971bd5 Merge pull request #4529 from nextcloud/fix-filelist-checkboxes
Fix filelist and checkbox vertical align
2017-04-26 16:52:46 -03:00
Jan-Christoph Borchardt 03514e485c Change feed to website planet link, fix wording
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 21:22:08 +02:00
Lukas Reschke d0e0bc55c8 Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:08:44 +02:00
Lukas Reschke d17a901f8a Update autoload map
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:54 +02:00
Lukas Reschke 3df99d8fd6 Add SocialSharingBundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:53 +02:00
Jan-Christoph Borchardt 79c706c289 Fix bundles header position
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 20:07:53 +02:00
Jan-Christoph Borchardt 1da371b69f Style app bundles
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 20:07:53 +02:00
Lukas Reschke b9ebdba7eb Use .installed layout
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:53 +02:00
Jan-Christoph Borchardt b2c16b0794 Styling fixes to bundle header
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 20:07:52 +02:00
Lukas Reschke 0c5a48c4a4 Add tests for repairstep
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:52 +02:00
Lukas Reschke a05295fca3 Add spreed to Groupware bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:52 +02:00
Lukas Reschke 0651d66181 Add tests for bundle code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke 78d0bb99f7 Remove unrequired getDescription() method
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke 3f9aaac4a2 Adjust tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke d4ba8198fe Make the emergency disable also accept arrays
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:51 +02:00
Lukas Reschke 732c92e93a Make disableapp.php accept arrays
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:50 +02:00
Lukas Reschke da67264a23 Fix styling
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:50 +02:00
Lukas Reschke 0428254ed6 Don't sort on app bundles
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:50 +02:00
Lukas Reschke 4b1ac3fef2 Add titles
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:49 +02:00
Lukas Reschke 47cd976035 Add app bundles
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 20:07:49 +02:00
Roeland Jago Douma 646db7f88d Merge pull request #4518 from nextcloud/downstream-25838
Fix share indicator handling
2017-04-26 19:23:27 +02:00
Lukas Reschke d89c76049f Merge pull request #4374 from nextcloud/contactsmenu_popover
add contacts popover
2017-04-26 18:31:17 +02:00
Roeland Jago Douma edd9444209 Merge pull request #4503 from nextcloud/downstream-27281
fix objectstore rename
2017-04-26 17:17:24 +02:00
Joas Schilling c0a8942764 Fix missing conflict resolutions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 17:05:59 +02:00
Roeland Jago Douma 94a4d47b22 Merge pull request #4516 from nextcloud/downstream-27527
OCC scanner commit in batches
2017-04-26 16:59:03 +02:00
Jan-Christoph Borchardt d17258d4b9 Fix filelist and checkbox vertical align
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 16:47:04 +02:00
Robin Appelman acb0903514 remove duplicate method
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:45:04 +02:00
Robin Appelman 43970b93d1 remove excessive logging
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-26 16:41:48 +02:00
Juan Pablo Villafáñez f2bd5f7496 Add new specific tests for SMB 2017-04-26 16:23:52 +02:00
Juan Pablo Villafáñez 71012b3432 Adjust SMB permissions on the root 2017-04-26 16:23:52 +02:00
Vincent Petry 1c771c097a Use regex to detect part files 2017-04-26 16:12:48 +02:00
Ilja Neumann 327094d557 #7496 Don`t allow upload of files with extension .part 2017-04-26 16:09:08 +02:00
Vincent Petry d379b197d5 Fix forbidden backslash DAV integration tests 2017-04-26 15:47:59 +02:00
Vincent Petry 7b6e4d0dd2 Fix FutureFile MOVE to keep destination node
Sabre usually deletes the target node on MOVE before proceeding with the
actual move operation. This fix prevents this to happen in case the
source node is a FutureFile.
2017-04-26 15:46:38 +02:00
Vincent Petry ec8d7010e5 Accept moving FutureFile into a Directory 2017-04-26 15:43:01 +02:00
Vincent Petry 642b4331a6 Moved unit tests from ObjectTree::move to Directory 2017-04-26 15:42:29 +02:00
Vincent Petry 82b967d3f9 Remove ObjectTree::move and let is use the IMoveTarget approach instead
This removes the duplicated code
2017-04-26 15:35:08 +02:00
Vincent Petry 0a9f7730d0 Ported ObjectTree::move to IMoveTarget in new DAV endpoint 2017-04-26 15:33:20 +02:00
Sergio Bertolin a761d4cce7 Added test cases from core 16825 2017-04-26 15:29:01 +02:00
Vincent Petry 9bff66e68d Simplified new endpoint move test 2017-04-26 15:27:02 +02:00
Vincent Petry c30feafaa2 Added case when final chunk move must not change file id 2017-04-26 15:26:15 +02:00
Sergio Bertolin 9ab17c95c0 Added test about checking file id after a move 2017-04-26 15:24:19 +02:00
Joas Schilling 9e6ac3de70 Allow to create a user for a specific backend
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 15:07:11 +02:00
Morris Jobke ba43a09380 Merge pull request #4512 from nextcloud/fix-translations-2
Fix translations
2017-04-26 08:57:08 -03:00
Vincent Petry 3f36548a6d Reload file list when leaving hidden state
Whenever a file list is already initialized and was hidden when
switching to another file list in the navigation bar, if the user comes
back to this list it gets redisplayed. At this point the list needs to
be refreshed to be able to reflect any potential file changes done from
the other lists.
2017-04-26 13:51:44 +02:00
Vincent Petry 17a31a51c6 Fix share indicator handling
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
2017-04-26 13:38:12 +02:00
Vincent Petry b92085f2c7 Fix recovery checkbox label to properly point 2017-04-26 13:29:42 +02:00
Vincent Petry 0721a7d5cc Fix scanner after review 2017-04-26 13:26:47 +02:00
Vincent Petry e3218ddffd OCC scanner commit in batches 2017-04-26 13:26:27 +02:00
Piotr Mrówczyński 9fec4031b3 Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643)
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
2017-04-26 13:19:43 +02:00
Roeland Jago Douma 5b5c3a1773 Merge pull request #4430 from nextcloud/refactor-auth
Improve readability of login logic
2017-04-26 10:41:53 +02:00
Lukas Reschke 83c5f3f3e8 Bump version to Nextcloud 12.0 beta 1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-26 10:36:38 +02:00
Joas Schilling bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help
adding some documentation hints and some smaller cleanup
2017-04-26 09:45:01 +02:00
Joas Schilling ec323cb687 Fix email vs mail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Joas Schilling 6c28c4ac8b Use correct plural form and add special strings for tomorrow and today
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:34:59 +02:00
Georg Ehrke 6bbc682c4b handle 404 separately
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:30:21 +02:00
Georg Ehrke 99b201a188 unit test jquery.contactsmenu
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke 6d7714f182 fix CommentsTabsView js test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke f32fc97533 fix ContactsStoreTest
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
Georg Ehrke 897bd5cfef add contactsmenu popover to comments
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke e61cf83faf better detection whether or not contactsmenu target was clicked
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke 399f08bd33 add contactsmenu popover to resharer infobox
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke 4d60aff6ec Contactsmenu popover: show proper message when server throws error
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Georg Ehrke 8f404c1f56 don't toggle sharing popover together with contactsmenu popover
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
Joas Schilling f43e7a9405 Fix past tense
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-26 09:27:41 +02:00
Georg Ehrke c844b2931e close menu again when clicking on avatar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:56 +02:00
Georg Ehrke 60f9ed6241 add contactsmenu popover
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:26:53 +02:00
Roeland Jago Douma 7386bea23f Merge pull request #4467 from nextcloud/lists-for-html-mails
Add lists to HTML emails
2017-04-26 08:30:30 +02:00
Roeland Jago Douma 752b219970 Merge pull request #4061 from nextcloud/downstream-26407
Redis cluster support
2017-04-26 08:27:30 +02:00
Morris Jobke 527369be9c Merge pull request #4500 from nextcloud/downstream-27118
Restrict proppatch to the proper nodes
2017-04-26 01:28:16 -03:00
Morris Jobke 4c2c08f376 Merge pull request #4416 from gvmura/avoid-duplicate-files-google
Avoid duplicate files in google with the same name
2017-04-26 01:26:04 -03:00
Morris Jobke d4329f3355 Merge pull request #4449 from stweil/mimetypes
Add mimetypes for jp2 and webp
2017-04-26 01:22:49 -03:00
Jörn Friedrich Dreyer fff6d6e3e8 Refactor auth methods
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-26 01:08:53 -03:00
Morris Jobke 215573fe3c Merge pull request #4486 from nextcloud/fix-js-unit
Remove DOMPurify from srcFiles
2017-04-25 22:39:55 -03:00
Morris Jobke 8a004ac41f Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo
user_ldap: Add support for gidNumber
2017-04-25 22:34:30 -03:00
Nextcloud bot e5fe41e16b [tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Jan-Christoph Borchardt 6db6911a13 Merge pull request #3233 from nextcloud/contactsmenu
Contacts menu
2017-04-26 01:31:11 +02:00
Jan-Christoph Borchardt 241e397326 Merge branch 'master' into contactsmenu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:50:38 +02:00
Jan-Christoph Borchardt 0f0b04b7d9 Fix test
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-26 00:06:56 +02:00
Morris Jobke 255c7df3bd Merge pull request #4499 from nextcloud/downstream-26984
Trigger change when a user is enabled/disabled
2017-04-25 18:27:38 -03:00
Morris Jobke 417bc606e4 Merge pull request #4508 from nextcloud/fix/remove-js-debug-logging
Remove js debug logging
2017-04-25 18:26:53 -03:00
Morris Jobke 859bc245b1 Merge pull request #4479 from nextcloud/auth-flow
Add new auth flow basics
2017-04-25 18:26:15 -03:00
Roeland Jago Douma c59652dbc3 Merge pull request #4495 from nextcloud/downstream-27638
Catch session already closed exception in destructor
2017-04-25 22:24:50 +02:00
Christoph Wurst fd74ad452a Remove js debug logging
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 21:42:38 +02:00
Jan-Christoph Borchardt 2ccaae8968 Fix emptycontent HTML and wording
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Jan-Christoph Borchardt 4ae5340814 Fix spinner position of Contacts menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:47:18 +02:00
Christoph Wurst 945420baaf Use HTTP POST to retrieve the list of contacts
We do not want to have sensitive information in the URL and
therefore also not in the access log. Thus the GET request is
replaced by a POST request.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst 5c29fb16c0 Update composer autoloader
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst 98f02fad60 Adjust entry unit test to newly added avatar property
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst 5c61852c25 Fix failing contacts menu js test data
When we test wheter action menus in the contacts menu close
when clicking other ones, we have to provide test data
that actually causes the view to render the menu.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:18 +02:00
Christoph Wurst ecd408d524 Fix icon of second action
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst 2c2e1f7988 Use absolute URI for action icons
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst b8c2a8ae36 Don't show contacts an entry for themselves
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst 36cee1f386 Let apps register contact menu provider via info.xml
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst 5762cd9436 Use tooltop for contact's top action title
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst e3efc4979b Show mail address in popover menu
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Christoph Wurst d091793ceb Contacts menu
* load list of contacts from the server
* show last message of each contact

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 20:47:17 +02:00
Jan-Christoph Borchardt 61af3f41f0 Fix auth flow background color and redirect view layout
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma aae079aa29 AppToken to 72 chars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma bb5e5efa6d Do not remove the state token to early
we should check the stateToken before we remove it. Else the check will
always fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Roeland Jago Douma 05e1092c44 Correctly case the stateToken
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 20:18:49 +02:00
Lukas Reschke 6a16df7288 Add new auth flow
This implements the basics for the new app-password based authentication flow for our clients.
The current implementation tries to keep it as simple as possible and works the following way:

1. Unauthenticated client opens `/index.php/login/flow`
2. User will be asked whether they want to grant access to the client
3. If accepted the user has the chance to do so using existing App Token or automatically generate an app password.

If the user chooses to use an existing app token then that one will simply be redirected to the `nc://` protocol handler.
While we can improve on that in the future, I think keeping this smaller at the moment has its advantages. Also, in the
near future we have to think about an automatic migration endpoint so there's that anyways :-)

If the user chooses to use the regular login the following happens:

1. A session state token is written to the session
2. User is redirected to the login page
3. If successfully authenticated they will be redirected to a page redirecting to the POST controller
4. The POST controller will check if the CSRF token as well as the state token is correct, if yes the user will be redirected to the `nc://` protocol handler.

This approach is quite simple but also allows to be extended in the future. One could for example allow external websites to consume this authentication endpoint as well.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-25 20:18:49 +02:00
Lukas Reschke db94b5d4af Merge pull request #4439 from nextcloud/appmenu-responsive
Responsive app menu
2017-04-25 19:42:01 +02:00
Stefan Weil 8ba67fbe1e Add test code for new image mime types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 19:22:46 +02:00
Stefan Weil c9e08a6445 Add repair steps for new image mime types
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 18:56:23 +02:00
Stefan Weil eb7e4d48c9 Add mimetypes for jp2 and webp
Those image formats can be processed by Tesseract, so they are needed
for improved Nextcloud OCR.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-04-25 18:43:39 +02:00
Georg Ehrke c76633bb8a require at least one param or prop filter element
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 18:20:32 +02:00
Joas Schilling 5334a3dc33 fix objectstore rename
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:52:05 +02:00
Lukas Reschke 16c8fdece3 Remove DOMPurify from srcFiles
It is already included via core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-25 12:50:15 -03:00
Jan-Christoph Borchardt 3bb41f4144 Move h2 and settings-hint together
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:47:23 +02:00
Morris Jobke 51da0442d9 Merge pull request #4494 from nextcloud/fix-jsunit
Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
2017-04-25 12:45:52 -03:00
Daniel Calviño Sánchez 18f46bd47f Fix closing details view when viewing file in folder
The Files app active view is set to "files" in silent mode to avoid an
unneeded load of the "/" directory. However, this also prevents the
details view from being automatically closed, so it has to be explicitly
closed by the Goto plugin; the approach used is the same that would have
been used by OCA.Files.App._onNavigationChanged if not silenced.

Fixes #1448

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-25 17:45:42 +02:00
Daniel Calviño Sánchez 16b4eecb05 Add acceptance tests for closing details view in Files app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-25 17:45:37 +02:00
Jan-Christoph Borchardt bbb58625fe Wording fixes
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt 4e537b5d6b Small layout fixes to settings hints
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 17:45:35 +02:00
Frank Karlitschek f62b75b2b8 change the headline as suggested 2017-04-25 17:45:35 +02:00
Frank Karlitschek c300d9b225 one more hint 2017-04-25 17:45:35 +02:00
Frank Karlitschek 5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Noveen Sachdeva 1b1f403a5d Add duration of last job execution to the table 2017-04-25 17:39:58 +02:00
Julius Härtl 27b19aaba1 Fix loading spinner for new app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:25 +02:00
Julius Härtl 673b58ef09 Fix adding/removing apps
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Julius Härtl 7548825743 Responsive app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 17:31:24 +02:00
Vincent Petry 1c40a05204 Restrict proppatch to the proper nodes
Need to fetch the node earlier because cancelling from within the
handler is not possible. Well, it is but it prevents other node types
using the same property names to run because the failure marks the
property with status 403.
2017-04-25 17:25:03 +02:00
Joas Schilling 5ee445c54b Audit log for enabling/disabling a user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
Joas Schilling ac0c21f4a7 Trigger change when a user is enabled/disabled
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 17:20:35 +02:00
Georg Ehrke ac3cc5211b updateProperties: catch exception when reading calendar data
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 16:42:41 +02:00
Georg Ehrke dd424fcb7b unit test CalDAV Search Plugin
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 16:39:17 +02:00
Victor Dubiniuk 131df248ef Catch session already closed exception in destructor 2017-04-25 16:28:52 +02:00
Joas Schilling 8ef25a7628 Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion
Audit group creation/deletion
2017-04-25 16:14:52 +02:00
Morris Jobke 5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss
Theming using SCSS variables
2017-04-25 10:56:13 -03:00
Morris Jobke bcf587542c Merge pull request #4485 from nextcloud/translation-checker
Check whether we can json decode the translations
2017-04-25 10:46:51 -03:00
Morris Jobke dd5dbe3ebd Fix JS unit failure because of Jasmine 2.6 and the phantomjs launcher
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-25 10:26:46 -03:00
Morris Jobke 6f2df5e495 Merge pull request #3195 from nextcloud/settings-apps-tabular
Make apps settings tabular
2017-04-25 10:25:29 -03:00
Arthur Schiwon 43f451e9e0 Fix usersInGroup retrieval
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 15:07:05 +02:00
Joas Schilling 7ea492b69a Loop over the apps directory and add the task
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:35:51 +02:00
Joas Schilling f1ffb728b9 Allow meta info and icons
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 14:31:21 +02:00
Roeland Jago Douma 82c9eb1c56 Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link
Fix sharing a password protected link
2017-04-25 14:12:44 +02:00
blizzz 026070a2fc Merge pull request #4484 from nextcloud/fix/logincontroller-redirect-url-failed-login
Fix remember redirect_url on failed login attempts
2017-04-25 13:15:53 +02:00
Roger Szabo f1522a8dca 4190
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-25 19:06:49 +08:00
Arthur Schiwon 685faad5ca fix method name due to changes in master
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-25 13:03:08 +02:00
Arthur Schiwon b1d646640a Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Joas Schilling 6448cf5748 Mock it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 12:16:07 +02:00
Georg Ehrke 40eec1e63c add repairstep with backgroundjob to index calendar data
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-25 11:55:31 +02:00
Joas Schilling bedd500884 Logo and background URLs must be relative
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:43:06 +02:00
Julius Härtl bc1efdf2e1 Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Härtl 1c54463853 Use theming cachebuster for server resources
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl 68a63ad3f3 Implement scss variable injection by OC_Defaults
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

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

Update theming.scss

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

Code cleanup

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

Fix tests

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

Inject SCSSCacher for easier testing

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

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

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

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
Joas Schilling 5be1010d45 Fix invalid character
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:06:27 +02:00
Joas Schilling dee2c8d23b Check whether we can json decode the translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:01:34 +02:00
Christoph Wurst bb1d191f82 Fix remember redirect_url on failed login attempts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-25 09:38:19 +02:00
Xuanwo 8db21ad8c8 user_ldap: Add support for gidNumber
This patch is based on the work of @dleeuw (https://github.com/dleeuw)
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.

Fixed https://github.com/nextcloud/server/issues/2640

Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-04-25 10:06:47 +08:00
Nextcloud bot 133f3fdc9a [tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Jan-Christoph Borchardt 88bc43182f Fix app icon being inverted for app store apps too
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt f03e59530a Show spinner until app store images loaded
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt b48d81d59f Show placeholder for image-less apps in app management
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt cf588f03bf Center spinner in apps management
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Felix A. Epp 2fbf1114ac Add installed category in AppSettingsControlerTest
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:57 +02:00
Felix A. Epp 47d9bffc53 Make svgs more fluid and consistent remove action, instead of 'remove app'
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt a04413fd75 rename Uninstall to Remove
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:57 +02:00
Jan-Christoph Borchardt a392532e28 also improve layout of apps from store
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt bb436a4300 Revert "Add Minor styling improvements with opacity instead of grey"
This reverts commit e9f8a15692ccd4690eef9d4268343d59aa8491ea.

Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt b5a9c4e455 fix sizing and alignment of your app list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt 6e5f0e0d9d hide app version and level on narrower screens
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Jan-Christoph Borchardt ec96faead8 improve wording of Apps mgmt navigation entries
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-25 00:22:01 +02:00
Felix A. Epp c7d9e0ab22 Add Minor styling improvements with opacity instead of grey
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp d772e758ab Fix spacing between enbale-groups label and select2
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 5e5aa2eeeb Fix uninstall in tabular view
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp c51c41b2af Fix app-icon opacity and positioing
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 8496b36f0a Add a link to the appstore page in the installed apps settings categories
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 89ac71355d Add apps category 'all installed'
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Felix A. Epp 91a4676fc0 Make enabled and disabled apps a tabular list
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-04-25 00:22:01 +02:00
Georg Ehrke e760cda96f remove unused CalendarSearchValidator
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:21 +02:00
Georg Ehrke 57b543a918 add Nextcloud Search extension to CalDAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-24 22:38:20 +02:00
Daniel Calviño Sánchez 58cc1251be Use "complete" callback in onPasswordEntered
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:18:52 +02:00
Daniel Calviño Sánchez e0b0115f99 Extract common ajax call for addShare and updateShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:07:08 +02:00
Daniel Calviño Sánchez 3ab2958930 Document options parameter in saveLinkShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 22:05:34 +02:00
Daniel Calviño Sánchez 6e9f49f397 Add "complete" callback support for addShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:31:53 +02:00
Daniel Calviño Sánchez 488020cf2e Add "complete" callback support for updateShare
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:30 +02:00
Daniel Calviño Sánchez 726c6c73f4 Add missing unit test cases and conditions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 21:24:05 +02:00
Roeland Jago Douma d01832ff64 Merge pull request #4472 from nextcloud/downstream-27714
Allow apps to register plugins for the user management
2017-04-24 19:44:57 +02:00
Roeland Jago Douma 41f492ada7 Merge pull request #4477 from danxuliu/acceptance-macos-nitpicking
Fix minor code style issues in acceptance test runner
2017-04-24 19:30:03 +02:00
Roeland Jago Douma 3551d38027 Merge pull request #4473 from nextcloud/downstream-27488
Add unit tests for mounts of delete users
2017-04-24 19:29:23 +02:00
Joas Schilling 6300be160a Add unit tests for mounts of delete users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 16:43:25 +02:00
Morris Jobke fd7257332d Merge pull request #4321 from nextcloud/improve-sharing-tooltip
change sharing tooltip with a more general description of all available share options
2017-04-24 11:12:41 -03:00
Joas Schilling 77b202ce80 Allow apps to register plugins for the user management
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 16:07:02 +02:00
Morris Jobke f3fdc35dc2 Merge pull request #4465 from nextcloud/fix-test-mail
Don't send the test mail twice
2017-04-24 10:49:29 -03:00
Morris Jobke b156117cbd Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing
Fix storage info with wrong casing
2017-04-24 10:41:16 -03:00
Christoph Wurst 363c289d25 Merge pull request #4468 from nextcloud/fix_link_password
Fix link password toggle
2017-04-24 15:26:52 +02:00
Roeland Jago Douma 7a81d46fcb Fix link password toggle
We took the wrong field from the share api response. So the password was
never shown as set.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-24 14:41:41 +02:00
Roeland Jago Douma c5617f4e8a Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
Fix working icon placement on password save
2017-04-24 14:34:56 +02:00
Joas Schilling 35414884d3 Add lists to HTML emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 13:48:27 +02:00
Roeland Jago Douma 97c27395aa Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings
Fix sinon.stub deprecation warnings
2017-04-24 13:47:46 +02:00
Daniel Calviño Sánchez faea890b87 Extract updateSharePasswordIfNeeded function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:38:36 +02:00
Daniel Calviño Sánchez 51e658da2a Join if block to preceding if chain
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 13:17:46 +02:00
Joas Schilling e938663329 Don't send the test mail twice
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 12:50:29 +02:00
blizzz 42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr
Handle password expiry in user_ldap
2017-04-24 12:17:04 +02:00
Daniel Calviño Sánchez 36f55b5867 Fix working icon placement on password save
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:50:06 +02:00
Joas Schilling 3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports
Remove unused use statements
2017-04-24 11:47:37 +02:00
Daniel Calviño Sánchez a56fb75e69 Add missing unit test for updateShare with email share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez de6b05a911 Add missing hook check
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez dcc8cce28b Fix double hashing of shared link passwords
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez 153d053ee7 Fix working icon not hidden when successfully setting a password
When a request to set the password of a shared link is sent a working
icon is shown. However, as there was no "success" callback, the icon was
never hidden again after successfully setting the password (it worked
fine if there was an error, though).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez 316710bcb1 Add acceptance tests for sharing password protected links
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez 13c84f6629 Add system to share data between acceptance test steps
The data storage (the "notebook") is shared between all the actors, so
the data can be stored and retrieved between different steps by any
actor in the same scenario.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-24 11:33:07 +02:00
Christoph Wurst 2317d7bb49 Fix sinon.stub deprecation warnings
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.

This makes the js unit testing output readable again.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-24 10:39:37 +02:00
Joas Schilling 7a87fedac3 Remove dead arguments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:18:14 +02:00
Joas Schilling e19126425b Fix similar issues with the group id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:15:03 +02:00
Joas Schilling 992c48c89b Fix the storage info and other checks when the user has wrong casing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:10:50 +02:00
Lukas Reschke 8a1d3c7e87 Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller
Add rate limit to TOTP solve challenge controller
2017-04-24 10:03:19 +02:00
Roeland Jago Douma d842b29c5b Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname
add owner-displayname property to calendars and addressbooks
2017-04-24 09:17:55 +02:00
Roeland Jago Douma 1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables
Remove unused variables
2017-04-24 08:09:01 +02:00
Nextcloud bot a01f946c56 [tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Georg Ehrke c89e057d27 add owner-displayname property to calendars and addressbooks
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-23 11:26:49 +02:00
Morris Jobke c54a59d51e Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Nextcloud bot 11c7953888 [tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke 2b6f6dac00 Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 18:20:51 -05:00
Daniel Calviño Sánchez b0b32eff1f Fix minor code style issues (also known as nitpicking)
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-22 17:50:37 +02:00
Lukas Reschke 1bd3bd33f9 Merge pull request #4435 from nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes
Add at most 10 password reset requests per 5 minutes and IP range
2017-04-22 11:17:54 +02:00
Lukas Reschke 7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar
Fix grammar
2017-04-22 08:15:46 +02:00
Lukas Reschke d0d34d308a Add at most 10 password reset requests per 5 minutes and IP range
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-22 08:12:54 +02:00
Lukas Reschke c1b8f152d8 Add rate limit to TOTP solve challenge controller
Fixes https://github.com/nextcloud/server/issues/2626

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-22 07:59:40 +02:00
Nextcloud bot 363d1c69dd [tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke 17c7b64f04 Merge pull request #4431 from nextcloud/acceptance-macos
Run acceptance tests on macOS
2017-04-21 16:09:50 -05:00
Morris Jobke aa2bed44b6 Fix grammar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 16:07:12 -05:00
Morris Jobke db7eedccc9 Run acceptance tests on macOS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 14:11:56 -05:00
Roeland Jago Douma eaa6f766e6 Merge pull request #4208 from danxuliu/add-basic-acceptance-test-system
Add basic acceptance test system
2017-04-21 20:53:32 +02:00
Roeland Jago Douma 6d1651452f Add back the name query part
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 20:43:40 +02:00
Thomas Citharel ecba3722da Factorize query for searching contacts 2017-04-21 20:43:36 +02:00
Roeland Jago Douma 867b3ee234 Merge pull request #4396 from nextcloud/scan-non-existing
show error when trying to scan non existing path
2017-04-21 19:47:33 +02:00
Roeland Jago Douma d46b155916 Merge pull request #4428 from nextcloud/file-by-id-limit-user
limit the user when searching for a file by id if we know the user already
2017-04-21 19:43:53 +02:00
Morris Jobke 1666a17ebe Merge pull request #4426 from nextcloud/update-dom-purify
Bump to DOMPurify 0.8.6
2017-04-21 12:41:26 -05:00
Lukas Reschke 83ecf893d9 Merge pull request #4429 from nextcloud/proper-return-code-for-welcome-email
Use RESPOND_NOT_FOUND for non existing user
2017-04-21 19:39:40 +02:00
Morris Jobke 4dd72e9eb9 Use RESPOND_NOT_FOUND for non existing user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 11:30:00 -05:00
Robin Appelman 6fbe991afb limit the user when searching for a file by id if we know the user already
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 17:11:26 +02:00
Roeland Jago Douma b101c6f5fe Update core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 16:44:11 +02:00
Roeland Jago Douma 9a0280f1c8 Merge pull request #4422 from nextcloud/favorite-wording-detail
Wording detail fix for favorite emptycontent view
2017-04-21 16:43:22 +02:00
Morris Jobke 5605166523 Merge pull request #4423 from nextcloud/reload-fav-view
properly reload favorites list
2017-04-21 09:35:34 -05:00
Lukas Reschke f4755218a1 Bump to DOMPurify 0.8.6
Fixes https://github.com/nextcloud/server/issues/4424

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-21 16:33:00 +02:00
Daniel Calviño Sánchez e970b5261f Make test passwords valid for the password_policy app
As requested by Morris Jobke, the passwords in the acceptance tests were
modified to make them valid both for a clean Nextcloud server and one
with the password_policy app enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:47:44 +02:00
Daniel Calviño Sánchez 2f80025ec2 Move acceptance tests from build/acceptance to tests/acceptance
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:44:29 +02:00
Daniel Calviño Sánchez f89c16f83e Exclude data-autotest from the files copied to the container
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:29:07 +02:00
Daniel Calviño Sánchez cccbd028a6 Add safety parameter
As the script modifies the Git repository a safety parameter was added
to prevent running it by mistake and messing with the local copy of the
repository.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:31 +02:00
Daniel Calviño Sánchez 42fbf809fe Remove no longer needed Docker helper and its related Dockerfile
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez eea015c1ba Change default configuration to use local helper
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez 59004dc75e Run acceptance tests using the local helper instead of the Docker one
When run through "run.sh" the acceptance tests were executed in the same
system in which the script was called and they started and stopped the
Nextcloud server using Docker containers that provided real web servers.
For consistency now they use the same approach used when run through
Drone: the acceptance tests are run in a Docker container and they start
and stop the Nextcloud server directly using the PHP built-in web server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:26:29 +02:00
Daniel Calviño Sánchez bbe479bcd9 Generalize names and descriptions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez 72310cdac1 Use PHP built-in web server instead of Apache in Drone
Instead of running an additional Drone service with the Nextcloud server
now the Nextcloud server is run in the same Drone step as the acceptance
tests themselves using the PHP built-in web server.

Thanks to this, the Nextcloud server control is no longer needed, as the
acceptance tests can now directly reset, start and stop the Nextcloud
server. Also, the "nextcloudci/php7.0:php7.0-7" image provides
everything needed to run and manage the Nextcloud server (including the
Git command used to restore the directory to a saved state), so the
custom image is no longer needed either.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez 593118204a Replace downloaded Selenium server with Docker container
Instead of downloading the Selenium server and requiring a specific
Firefox version to be installed in the system now the Selenium server is
run using one of the official Selenium Docker images, which provides
both the Selenium server and the appropriate version of Firefox.

Moreover, as it is run inside the Docker container, the web browser is
now run in headless mode; however, if needed, it can still be viewed
through VNC.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-21 14:24:32 +02:00
Robin Appelman c49def4a10 properly reload favorites list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-21 14:20:34 +02:00
Jan-Christoph Borchardt 8b8f537f3b Wording detail fix for favorite emptycontent view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-21 14:11:49 +02:00
Roeland Jago Douma 3a2a87d25e Merge pull request #4418 from nextcloud/fix_3380
No need to log guzzle exception
2017-04-21 12:54:44 +02:00
root 8613678462 Merge branch 'avoid-duplicate-files-google' of https://github.com/gvmura/server into avoid-duplicate-files-google 2017-04-21 11:33:32 +02:00
gvmura 0d063c316a avoid duplicate files in google with the same name
Signed-off-by: gvmura <gvmura@uniss.it>
2017-04-21 11:30:02 +02:00
Roeland Jago Douma bec4b468c3 No need to log guzzle exception
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server

Fixes #3380

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-21 11:29:01 +02:00
gvmura 888dfdffaf avoid duplicate files in google with the same name
When it renames the temporary file, it tests if the file is already present. If so, it moves to trash the previous version to avoid duplicate files with the same name (message log: "Ignoring duplicate file name: ... on Google Drive for Google user: ...").
It doesn't handle duplicate files in Google Drive, it tries to avoid them.
You'll watch #4279 issue.
2017-04-21 09:53:52 +02:00
Roeland Jago Douma e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
2017-04-21 09:35:01 +02:00
Roeland Jago Douma c4bd01456b Merge pull request #4408 from nextcloud/accesslist_ng
Move systemtags and comments to new accesslist functions
2017-04-21 08:58:52 +02:00
Nextcloud bot fb7663cefe [tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Morris Jobke f5b900b654 Merge pull request #4412 from individual-it/master
deleted forgotten code in test
2017-04-20 18:04:32 -05:00
Morris Jobke 9536cbf739 Merge pull request #4409 from nextcloud/socialharing_mail
Allow social sharing to specify if a new window is opened
2017-04-20 17:59:55 -05:00
Morris Jobke 8a743e0359 Merge pull request #4404 from Ardinis/master
Remove json handling for files_external:config
2017-04-20 17:59:35 -05:00
Morris Jobke b99d2b78bd Merge pull request #3595 from nextcloud/dav-sharing-changes
Restrict DAV share handling to the owner only
2017-04-20 16:44:16 -05:00
Morris Jobke 5d18e4243d Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:01:26 -05:00
Artur Neumann faf55adb90 deleted forgotten code in test
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-20 22:27:51 +05:45
Morris Jobke 6b41d82f4c Merge pull request #4411 from nextcloud/fix-it
Remove accidentially commited module
2017-04-20 10:53:03 -05:00
Morris Jobke ec07791acc Remove accidentially commited module
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 10:51:05 -05:00
Björn Schießle 810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area
Fix clickable area in share permissions menu
2017-04-20 16:49:00 +02:00
Björn Schießle a4086a6ec5 Merge pull request #4303 from nextcloud/enforce-password-mailshare
allow admin to enforce password on mail shares
2017-04-20 16:46:36 +02:00
Morris Jobke 6c294c3407 fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Morris Jobke 9d07ec5a96 Fix casing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle aa54d31bd2 fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:27 +02:00
Bjoern Schiessle 972b4c04e2 respect password policy for auto generated passwords
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 428d7cdb5e improve mail text
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle f00c1eccf7 create activity if a password was send by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle f0651cb066 allow to set a password for shares which where created without a password before the admin started to enforce the password
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Bjoern Schiessle 7a8f8cbb33 templates no longer needed 2017-04-20 16:33:26 +02:00
Bjoern Schiessle d8dcd72118 allow admin to enforce password on mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-20 16:33:26 +02:00
Roeland Jago Douma 48fd0ee9f0 Allow social sharing to specify if a new window is opened
For example mail shares should not open a new window because it looks
weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 16:32:46 +02:00
Roeland Jago Douma 4004e39f75 Move systemtags and comments to new accesslist functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
Joas Schilling 73b6cd1061 Fix invalid Dav test
PHP Warning:  Declaration of PublicCalendarTest::testPrivateClassification()
should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared)
in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:54:20 +02:00
Joas Schilling ec2f2b75be Make sure we use a new encryption module all the time
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:48:14 +02:00
Robin Appelman a0e5107c0b check for existence before we start the db transaction
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-20 13:25:49 +02:00
Joas Schilling 06e60f88c5 Don't assume the admin didn't configure Opcache correctly...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:17:21 +02:00
Joas Schilling 8c703c954d Fix theming tests
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Joas Schilling b2deb6deb0 Use the correct class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:55:11 +02:00
Joas Schilling 0de5fc9020 Import some classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:54:14 +02:00
Joas Schilling ada615eb86 Use the correct Dummy and Backend class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:48:51 +02:00
Joas Schilling 9871e4eaee Kill dead code
> No tests found in class "Test\Share\MailNotificationsTest".

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:43:19 +02:00
Joas Schilling d2d9f74707 Fix warning with undefined method
Trying to configure method "getRemember" which cannot be configured
because it does not exist, has not been specified, is final, or is
static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:37:59 +02:00
Joas Schilling a0ada9aab4 Don't use deprecated getMock() anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
Joas Schilling 24789ba0f4 Restoring the error handler within the error handler causes unexpected results
See http://php.net/manual/en/function.restore-error-handler.php#120879
for more information.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:23:34 +02:00
Joas Schilling 38c901fadf Delete the correct config value
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:23:12 +02:00
Joas Schilling 547f6ee009 Only loop over Test cases
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:21:39 +02:00
Ardinis 71118214f9 reviewed 2017-04-20 11:31:04 +02:00
Joas Schilling 140580f9d8 Merge pull request #4398 from nextcloud/fix_accesslistcode
Get proper accesslist for userFolder
2017-04-20 11:03:22 +02:00
Joas Schilling b469882595 Merge pull request #4212 from individual-it/master
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
Joas Schilling 088f4422f9 Fix remaining "PHP Inspection" warnings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Joas Schilling 62ef59616d Add public access modifier to all methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Joas Schilling c2d1e6e7ff Restrict share handling to the owner only
Otherwise group members can remove the share for the complete group,
remove edit permissions and even single user shares for other users.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 10:44:11 +02:00
Roeland Jago Douma ae2db5e60d Get proper accesslist for userFolder
If the accesslist is requested for a users root folder we should
properly construct the path

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 10:28:32 +02:00
Joas Schilling 799b229a68 Merge pull request #4381 from nextcloud/2954_take_2
Fix group settings routes and fix route regression
2017-04-20 10:25:16 +02:00
Nextcloud bot adf316c3af [tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
Morris Jobke 0556104cd3 Merge pull request #4384 from nextcloud/renderHtml-fix
Rename renderHTML to renderHtml
2017-04-19 17:52:37 -05:00
Morris Jobke 16b8397765 Fix clickable area in share permissions menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:41:26 -05:00
Morris Jobke fbedea0807 Add PHPDoc and handle exception in ScanAppData as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Morris Jobke 16c4755e03 Rename renderHTML to renderHtml
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 15:46:41 -05:00
Morris Jobke 01c9d00e1d Merge pull request #4387 from nextcloud/fix-little-glitch
Fix font-weight of settings button
2017-04-19 14:45:48 -05:00
Morris Jobke a55f5c0173 Merge pull request #4388 from nextcloud/remove-unused-stuff
Remove unused CSS styles
2017-04-19 14:45:32 -05:00
Morris Jobke 3c892d6ad5 Merge pull request #4386 from nextcloud/improve-menu-css
Improve menu CSS
2017-04-19 13:12:31 -05:00
Morris Jobke 4be923e459 Improve menu CSS
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
Roeland Jago Douma ac9d0fd14c Merge pull request #4385 from nextcloud/remove-unused-css
Remove unused CSS
2017-04-19 19:27:05 +02:00
Lukas Reschke e91b8b452c Merge pull request #4395 from nextcloud/fix_4394
Do not show empty admin sections
2017-04-19 17:01:27 +02:00
Robin Appelman ce2dba0796 show error when trying to scan non existing path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Roeland Jago Douma be30ff59ef Do not show empty admin sections
Fixes #4393

It is far from efficient code. But then again it is easy to understand
and I doubt admins will browse it 24/7

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-19 13:22:49 +02:00
Lukas Reschke a3569a1452 Merge pull request #4382 from nextcloud/use-proper-reply-to
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Lukas Reschke b7fe28bba1 Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-19 12:03:54 +02:00
Roeland Jago Douma ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
Daniel Calviño Sánchez 50dfca8d8a Make possible to specify a subset of the acceptance tests to run
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:57 +02:00
Daniel Calviño Sánchez ed7d63d16a Add acceptance test steps to Drone
Each acceptance test feature is run in its own Drone step. The container
of the step runs the acceptance tests themselves, but they require two
additional Drone services. One service provides the Selenium server that
performs the web browser actions specified by the tests, and the other
service provides the Nextcloud server that the tests will be run
against (due to security concerns the acceptance tests themselves can
not create Docker containers for the Nextcloud server as done when
running them in a local system, as if Drone containers had access to
Docker a malicious pull request could be used to take over the Drone
server).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:57 +02:00
Daniel Calviño Sánchez be96be09b5 Add general multiplier for find timeouts
Although the timeouts specified in the acceptance tests are enough in
most cases they may not be when running them in a slow system or
environment. For those situations a general multiplier for find
timeouts is added. It can be set in the "behat.yml" configuration file
to increase the timeout used in every find call (except those that used
a timeout of 0, as in those cases the element had to be already present
when finding it and whether the system is slow or not does not change
that).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:04 +02:00
Daniel Calviño Sánchez a7e1833cf3 Add the timeout in NoSuchElementException messages
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:04 +02:00
Daniel Calviño Sánchez ff7d1bf1e7 Add NextcloudTestServerHelper for Nextcloud servers in Drone services
Due to security concerns, the public Nextcloud server repository is not
set as "trusted" in Drone (otherwise a malicious pull request could be
used to take over the server), so it is not possible to create Docker
containers from the containers started by Drone. Therefore, the
Nextcloud server must be started as a service by Drone itself.

The NextcloudTestServerDroneHelper is added to manage from the
acceptance tests a Nextcloud test server running in a Drone service; to
be able to control the remote Nextcloud server the Drone service must
provide the Nextcloud server control server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:04 +02:00
Daniel Calviño Sánchez c452390d59 Extract waiting for the server to start to the Utils class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:04 +02:00
Daniel Calviño Sánchez 34510b73a2 Extract installation and configuration of the Nextcloud server
The installation and configuration of the Nextcloud server as expected
by the acceptance tests is extracted to its own script so it can be used
from any element that launches the acceptance tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:04 +02:00
Daniel Calviño Sánchez 7de82615ff Use NextcloudTestServerHelper in NextcloudTestServerContext
Instead of depending on a Nextcloud test server created through Docker,
NextcloudTestServerContext now uses the NextcloudTestServerHelper
interface. This makes possible to provide other implementations of the
interface for those cases in which using a Docker container is not a
valid approach, like in the continuous integration system of the public
repository due to security concerns.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez f10156f009 Extract NextcloudTestServerHelper interface
The NextcloudTestServerHelper interface provides the needed methods to
manage the Nextcloud server used in acceptance tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 4d71d37fe3 Reorganize method position inside class
For consistency with the rest of private methods in the class,
"isContainerRegistered" is moved below the only public method in which
it is used ("cleanUp").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 03233b1d58 Hide methods not needed outside the class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 8170b99561 Remove no longer needed methods
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez dead90f1cf Move all Docker-related logic to NextcloudTestServerDockerHelper
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 38efa97aa5 Rename methods to something less tied to its implementation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez c4613733eb Add acceptance tests related to access levels
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 1203369ea6 Add acceptance tests related to login
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 6a15d9da9c Add script to set up and run the acceptance tests
The acceptance tests require several elements to be set up in order to
be run. Besides those PHP packages that it depends on, like Behat or
Mink, it requires a running Selenium server and a Docker image with the
Nextcloud server to be tested available in the system. The "run.sh"
script takes care of preparing all the needed elements and then run the
acceptance tests; once finished, either normally or due to an error, it
also cleans up the temporal elements created/started by the script and
the acceptance tests.

The Docker image with the Nextcloud server to be tested is created from
the Nextcloud code in the greatparent directory each time "run.sh" is
executed; the code is copied inside the image, so once the acceptance
tests are started the code in the greatparent directory can be modified
without affecting them. As it is based on the current code at the time
of the launch that image is created and destroyed each time the
acceptance tests are run. However, the image that it is based on, which
is created using "docker/nextcloud-local-parent/Dockerfile", does not
change between runs, so it is kept built in the system to speed up the
launch of acceptance tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez b22997796b Add wrappers to adapt the element finding system of Mink
Mink elements (including the document element) provide a
"find(selector, locator)" method to look for child elements in their web
browser session. The Locator class is added to be able to store the
selector and locator in a single object; it also provides a fluent API
to ease the definition of Mink locators, specially those using the
"named" selector.

The method "find(locator, timeout, timeoutStep)" is added to Actor
objects; it is simply a wrapper over Mink's "find(selector, locator)"
method, although it throws an exception if the element can not be found
instead of returning null, and it also makes possible to automatically
retry to find the element for certain amount of time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 7c07f01d59 Add actors for test scenarios
An actor plays the role of an end-user in the test scenario. As such,
each actor has its own web browser session used to perform the actions
specified by the steps of the scenario. Only one actor is active at a
time in a test scenario, and the current actor can be set through the "I
act as XXX" step; from then on, all the steps are performed by that
actor, until a different actor is set by calling "I act as XXX" again.
If no actor was explicitly set in a scenario then the default actor,
unsurprisingly named "default", is the one used.

The ActorContext class is added to provide automatic support for all
that. To use the ActorContext, besides adding it to the context list in
"behat.yml", a Mink session for each actor used in the features must be
specified in "behat.yml". Once done other Contexts just need to
implement the ActorAwareInterface (which can be done simply by using the
ActorAware trait) to have access to the current Actor object of the test
scenario; as the Actor object provides its own session other Contexts do
not need to extend from RawMinkContext. The ActorContext is itself a
RawMinkContext, so it automatically receives the base URL of the
Nextcloud test server run by NextcloudTestServerContext and propagates
that base URL to all the actors.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez 4c620f1fcb Add helper context to isolate the test server with Docker containers
Scenarios in acceptance tests must be independent one of each other.
That is, the execution of one scenario can not affect the execution of
another scenario, nor it can depend on the result of the execution of a
different scenario. Each scenario must be isolated and self-contained.
As the acceptance tests are run against a Nextcloud server the server
must be in a known and predefined initial state each time a scenario
begins.

The NextcloudTestServerContext is introduced to automatically set up the
Nextcloud test server for each scenario.

This can be achieved using Docker containers. Before an scenario begins
a new Docker container with a Nextcloud server is run; the scenario is
then run against the server provided by the container. When the scenario
ends the container is destroyed. As long as the Nextcloud server uses
local data storage each scenario is thus isolated from the rest.

The NextcloudTestServerContext also notifies its sibling RawMinkContexts
about the base URL of the Nextcloud test server being used in each
scenario.

Although it uses the Behat context system, NextcloudTestServerContext is
not really part of the acceptance tests, but a provider of core features
needed by them; it can be seen as part of a Nextcloud acceptance test
library. Therefore, those classes are stored in the "core" directory
instead of the "bootstrap" directory. Besides its own (quite limited)
autoload configuration, Behat also uses the Composer autoloader, so the
"core" directory has to be added there for its classes to be found by
Behat.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Daniel Calviño Sánchez b5fba56499 Add basic files for the automated acceptance test system
The acceptance tests verify that a Nextcloud server works as expected
from the point of view of an end-user. They are specified as user
stories using Behat paired with Mink, which provides web browser
automation.

Mink supports several browser emulators, but the system is set up to use
Selenium, as it is FOSS and the one that better reflects the use of a
web browser by an end-user (as, in fact, it controls real web browsers).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-04-19 08:26:03 +02:00
Morris Jobke 1dfd7de10e Remove unused CSS styles
* could not find an traces of .popup and .arrow anywhere else

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 22:26:18 -05:00
Morris Jobke 6fa7e41047 Fix font-weight of settings button
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 21:38:49 -05:00
Morris Jobke 74936e15d1 Remove unused CSS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 20:36:54 -05:00
Morris Jobke f1ddb939a0 Merge pull request #4371 from nextcloud/dont-allow-dot-usernames
Better validation of allowed user names
2017-04-18 20:04:32 -05:00
Nextcloud bot febe01f571 [tx-robot] updated from transifex 2017-04-19 00:07:40 +00:00
Nextcloud bot 6b490f45fd [tx-robot] updated from transifex 2017-04-18 23:08:43 +00:00
Morris Jobke 269600a04f Merge pull request #4369 from nextcloud/fix-translations
Fix translations
2017-04-18 18:01:50 -05:00
Morris Jobke 34e0b21f41 Merge pull request #3585 from nextcloud/popover-clickable-area
expand clickable area of popover menu entries to full width
2017-04-18 17:59:42 -05:00
Morris Jobke 4b2d594c70 Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mail
Beautify test email
2017-04-18 17:17:40 -05:00
Jan-Christoph Borchardt 535ec04245 expand clickable area of popover menu entries to full width
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-18 16:59:35 -05:00
Joas Schilling 1c0bffe87f Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Morris Jobke 47fe5e8f41 Merge pull request #4380 from nextcloud/show-instance-name-in-from
Add instance name to default sender
2017-04-18 16:22:56 -05:00
Lukas Reschke 0a54d5a5dd Beautify test email
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 16:18:00 -05:00
Morris Jobke d379ac7545 Merge pull request #4372 from nextcloud/smtp-password
Don't put the SMTP password into the HTML code
2017-04-18 16:13:31 -05:00
Nextcloud bot c40b7acb09 [tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Lukas Reschke 203ef88509 Add "Reply-To" on ShareByMailProvider mails
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Morris Jobke d2c4440ed6 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 15:08:38 -05:00
Roeland Jago Douma 2850f09bf2 Make group settings routes explicit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-18 22:00:22 +02:00
Roeland Jago Douma d12ec7cff1 Revert "Match slashes in ../{id} resource routes"
This reverts commit 31f9be7a75.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-18 21:50:36 +02:00
Lukas Reschke bae64e810e Add instance name to default sender
Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 21:44:37 +02:00
Christoph Wurst 24f5c44e2b Merge pull request #4376 from nextcloud/add-bruteforce-protection-to-change-self-password
Add bruteforce protection to changePersonalPassword
2017-04-18 21:43:11 +02:00
Lukas Reschke 805419bb95 Add bruteforce protection to changePersonalPassword
While the risk is actually quite low because one would already have the user session and could potentially do other havoc it makes sense to throttle here in case of invalid previous password attempts.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 17:55:51 +02:00
Artur Neumann bf58d24b5c remove accidently left over *f*it
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
Artur Neumann 88f02f27a3 JS tests for upload only function
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
Artur Neumann cdb65eff34 refactor to make it easier to test
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
Joas Schilling fcaa315c96 Fix some more stuff
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:11:29 +02:00
Joas Schilling dfca672378 Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:08:29 +02:00
Joas Schilling a5b4308a51 Don't put the SMTP password into the HTML code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 15:44:20 +02:00
Joas Schilling a3922bbcdc Better validation of allowed user names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 14:29:34 +02:00
Bjoern Schiessle c6ae57ecee simplify share placeholder
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-18 12:08:35 +02:00
Nextcloud bot b072d2c49d [tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot df2235c71f [tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot 69e0e2420c [tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Morris Jobke 10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager
Access list to share manager
2017-04-15 13:06:24 -05:00
Nextcloud bot dafa9c740a [tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Ardinis 3db84ed90a Remove json handling for files_external:config
#4347
2017-04-14 15:42:45 +02:00
Lukas Reschke 727688ebd9 Adjust existing bruteforce protection code
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Roeland Jago Douma f40b9fa9bd Merge pull request #4330 from nextcloud/activities-for-password-mail-change
Add activities when email or password is changed
2017-04-14 08:16:43 +02:00
Roeland Jago Douma 6b79bf0960 Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
Make BruteForceProtection annotation more clever
2017-04-14 08:15:55 +02:00
Nextcloud bot 0f96d5a641 [tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Morris Jobke 8e8b345fbd Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 16:28:07 -05:00
Lukas Reschke 8149945a91 Make BruteForceProtection annotation more clever
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.

Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Morris Jobke d0c0f6cfc1 Merge pull request #4326 from nextcloud/downstream-27562
Reorder the entries of the log for easier reading
2017-04-13 13:11:47 -05:00
Lukas Reschke 81d3732bf5 Merge pull request #4308 from nextcloud/lost-password-email
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke d36751ee38 Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke ac05d6dd67 Improve PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:16:12 -05:00
Morris Jobke ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
Joas Schilling 695696a4a6 Use constants
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:04:32 -05:00
Morris Jobke 13c71203bb Merge pull request #4341 from nextcloud/local-link-explanation
Explain local link
2017-04-13 12:01:57 -05:00
Jos Poortvliet a8b09c860e Explain local link
The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR:
* renames local link to direct link
* adds a short explanation, noting it only works for users who have access to this file/folder.

As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think?

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:01:45 -05:00
Lukas Reschke f3dbfd68a2 Merge pull request #4336 from nextcloud/add-ratelimiting
Add support for ratelimiting via annotations
2017-04-13 18:53:56 +02:00
Morris Jobke 9b9ca0b34d Merge pull request #4342 from nextcloud/update-certificate-bundle
Update CA bundle
2017-04-13 10:40:12 -05:00
Roeland Jago Douma 0f8a098476 Merge pull request #4344 from nextcloud/dont-load-handlebars
Don't load handlebars in template
2017-04-13 16:08:29 +02:00
Roeland Jago Douma cab41118f6 Mail shares trigger the public key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 15:19:23 +02:00
Roeland Jago Douma 6a519abde8 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:56:05 +02:00
Roeland Jago Douma 0f5682321e Fix server container registration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:52:09 +02:00
Lukas Reschke 881539a9e0 Don't load handlebars in template
It's already loaded in core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 14:01:21 +02:00
Roeland Jago Douma aef95b9b7d Not needed in the DIContainer anymore
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 13:37:39 +02:00
Roeland Jago Douma b96297e9cc Do not set full path if not currentAccess
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:53 +02:00
Joas Schilling f57ef55249 Add samples to the docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling e1d54e3b48 Add more tests for the share helper
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling 29f2088a7b Catch exceptions and use as many results as possible
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling 7d416ac1dd Activate the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:53 +02:00
Joas Schilling 629b7c0fc3 Adjust docs and make !$currentAccess simpler
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 6c23a5fa35 Add unit tests for sharebymail provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 4eeb194ae5 Fix share manager test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 5b57bb955b Fix default share provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 2fcf334c6a Fix tests for ShareHelper
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:52 +02:00
Joas Schilling 5df727d4ad Fix federated file sharing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling 3c1365c0d1 Fix returned paths for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling 4bcb7d88b5 Return the token as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling cf7c320949 Also return the token
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:51 +02:00
Joas Schilling 91e650791d Return the paths for the users without setting them all up
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 0c2dc3bc8c Fix comments
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 4437e00f16 Add shareHelper test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 12afd7d1d5 Add mail element to access list
* Each provider just returns what they have so adding an element won't
require changing everything
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 2cbac3357b Offload acceslist creation to providers
* This allows for effective queries.
* Introduce currentAccess parameter to speciy if the users needs to have
currently acces (deleted incomming group share). (For notifications)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:50 +02:00
Roeland Jago Douma 97f8ca6595 Added ShareHelper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma 553b3b2928 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma a1edcc8ecf Port Encryption/file to new getAccessList
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma 88299ec27c Added to public interface
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma 7dcc98eb20 Add owner to access list
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:49 +02:00
Roeland Jago Douma d84df15590 Add getAccessList to ShareManager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 12:58:48 +02:00
Joas Schilling 4f0e2640d7 No need for those emails anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:35:08 +02:00
Joas Schilling 786258ff30 Send an email to the old address on email change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:34:34 +02:00
Joas Schilling 1110b51aa3 Allow to read the old email on the hook as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:34:02 +02:00
Lukas Reschke 51377f3d8c Merge pull request #4313 from nextcloud/ldap-name-change
Change LDAP method names
2017-04-13 12:28:24 +02:00
Joas Schilling 0eb08a510b Move logic into new class with DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:01:10 +02:00
Lukas Reschke e39e6d0605 Remove expired attempts
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:18 +02:00
Lukas Reschke 31ae39c569 Add tests for multiple parameters
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:18 +02:00
Lukas Reschke 3d425ce833 Enable testing app in CI step
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:18 +02:00
Lukas Reschke 54930ac926 Update static autoloadermap
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke a1ae5275f9 Move to dedicated MiddleWare
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke a05471eb43 Fix .drone.yml
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke 511524c668 Add isset() as it can be an empty result
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:17 +02:00
Lukas Reschke d729bde98c Register in ServerContainer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke 66835476b5 Add support for ratelimiting via annotations
This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 12:00:16 +02:00
Lukas Reschke 23d9902cf3 Update CA bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:56:09 +02:00
Joas Schilling 49fd41b21f Send an email on password change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 11:49:02 +02:00
Roeland Jago Douma 5505faa3d7 Merge pull request #4340 from nextcloud/remove-invalid-route
Remove invalid route
2017-04-13 11:26:05 +02:00
Joas Schilling f23a36b0a6 Add activities when email or password is changed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 11:13:19 +02:00
Lukas Reschke 06f8ea247b Remove invalid route
Said file doesn't exist anymore and accessing it would just return a 500

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 11:05:44 +02:00
Lukas Reschke 01f3698175 Merge pull request #3966 from nextcloud/downstream-26570
Override config.php values through environment variables
2017-04-13 10:51:09 +02:00
Morris Jobke 7cb6038fca Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
Dont create a log entry on email login
2017-04-13 01:04:11 -05:00
Nextcloud bot 396618fd19 [tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Lukas Reschke 7ebcc045a2 Merge pull request #4338 from nextcloud/handlebars-min
Move to handlebars.min.js
2017-04-12 23:14:12 +02:00
Roeland Jago Douma 3eb6f88019 Move to handlebars.min.js
core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 22:22:38 +02:00
Morris Jobke 1f962f9115 Update email template for lost password email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 15:19:53 -05:00
Roeland Jago Douma b3b24172e4 Merge pull request #4307 from nextcloud/sharing-emails
New emails for sharebymail
2017-04-12 21:23:11 +02:00
Lukas Reschke 72ff33da1d Merge pull request #4335 from nextcloud/jquery-ui-min
Moved to jquery-ui.custom.min.js
2017-04-12 20:58:05 +02:00
Morris Jobke a7da2ef977 Merge pull request #4282 from nextcloud/oci-connect-string
use the same oci connectstring in all code paths
2017-04-12 13:11:00 -05:00
Roeland Jago Douma abe887cd48 Moved to jquery-ui.custom.min.js
Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-12 20:03:00 +02:00
Roeland Jago Douma 250eb34e81 Merge pull request #4306 from nextcloud/followup-3905
Favorites integration tests for shared files
2017-04-12 19:57:16 +02:00
Morris Jobke 124fdf8062 Merge pull request #4331 from nextcloud/query-builder-sum
Add sum() to the query function builder
2017-04-12 12:55:09 -05:00
Morris Jobke ae4c2893a2 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 12:42:23 -05:00
Morris Jobke 4cf4d2f27e Favorites integration tests for shared files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 11:44:57 -05:00
Morris Jobke 31024b7700 Merge pull request #4329 from nextcloud/move-out-shared-folder
Fix moving files out of a shared folder
2017-04-12 11:44:26 -05:00
Joas Schilling 983210de2e Dont add click-button text for plaintext mails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Joas Schilling 4b639e2763 No newlines when heading is empty
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:27 +02:00
Bjoern Schiessle 0a464dfb61 make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 17:16:27 +02:00
Joas Schilling 1c8c62272c Use instance name as alt-text
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Joas Schilling 506c7731a6 Don't duplicate the sentence with the header
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 17:16:26 +02:00
Morris Jobke d0bae447fb Use new email design for sharebymail emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke 33e077c1c1 Properly escape heading, body and button text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke 050ce1d40b Add addBodyButton to add a single button to email templates
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 17:16:26 +02:00
Morris Jobke 229d17e13b Change LDAP method names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 10:10:07 -05:00
Robin Appelman ac45af68cd Add sub() to the query function builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 16:09:35 +02:00
Bjoern Schiessle a3c9dcf82a change sharing tooltip with a more general description of all available share options
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-12 16:07:42 +02:00
Roeland Jago Douma dccb8928a1 Merge pull request #4325 from nextcloud/downstream-27522
Optimize put - Dont try to fetch filecache for not existing filecache…
2017-04-12 16:04:03 +02:00
Björn Schießle b90e91144b Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Discover federatedsharing endpoints
2017-04-12 16:01:07 +02:00
Roeland Jago Douma 3cf2f6e31b Merge pull request #4323 from nextcloud/downstream-27613
Allow file upload when storage is unlimited
2017-04-12 15:56:15 +02:00
Roeland Jago Douma c996e91d59 Merge pull request #4324 from nextcloud/downstream-27581-27602
Fix casing of same origin frame option
2017-04-12 15:54:46 +02:00
Jan-Christoph Borchardt 37145a275f Fix AdBlock blocking share icon, ref #866
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-12 15:04:12 +02:00
Robin Appelman 8500debe79 use unjailed path when moving files out of a shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:56:51 +02:00
Robin Appelman 2f949f4515 rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-12 14:55:47 +02:00
Joas Schilling 30817fa319 Simplify the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 13:23:55 +02:00
Juan Pablo Villafáñez 38e5135cb9 Reorder the entries of the log for easier reading 2017-04-12 13:03:19 +02:00
Piotr M dc78f1251e Optimize put - Dont try to fetch filecache for not existing filecache in encription 2017-04-12 12:54:20 +02:00
Joas Schilling bd37021587 Fix casing of same origin frame option
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:37:32 +02:00
Joas Schilling a3c3124762 Allow file upload when storage is unlimited
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-12 12:27:47 +02:00
Joas Schilling af42ca2025 Merge pull request #3905 from nextcloud/downstream-27069
Add integration test for trashbin
2017-04-12 11:09:42 +02:00
Björn Schießle 53787a29e1 Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update
[files_trashbin] Remove unneeded update steps
2017-04-12 10:57:09 +02:00
Björn Schießle 35188899e9 Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
[files_sharing] Remove unneeded update steps
2017-04-12 10:56:25 +02:00
Björn Schießle 49d8716eaa Merge pull request #4312 from nextcloud/cleanup-name
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Lukas Reschke 39468f627f Merge pull request #4315 from nextcloud/cleanup-files_external-update
[files_external] Remove unneeded update steps
2017-04-12 10:16:42 +02:00
Lukas Reschke b5d31e4e65 Merge pull request #4309 from nextcloud/remove-unused-code
Removes unused code for link share emails
2017-04-12 10:15:59 +02:00
Lukas Reschke d127f47801 Merge pull request #4310 from nextcloud/allow-plain-text-email
Allow to set text versions for the plain text email
2017-04-12 10:15:06 +02:00
Lukas Reschke feb594e212 Merge pull request #4314 from nextcloud/remove-not-needed-update.php
Remove update.php of files app
2017-04-12 10:14:04 +02:00
Morris Jobke 4f200040aa [files_trashbin] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:52:27 -05:00
Morris Jobke 4d7c7b1816 [files_sharing] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:49:50 -05:00
Morris Jobke 83864d465e [files_external] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:45:19 -05:00
Morris Jobke 5d444f493e Remove update.php of files app
* contains only update steps for 8.1/8.2 to 9.0 update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-12 00:35:12 -05:00
Morris Jobke 1729e4471f Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Nextcloud bot 633b952358 [tx-robot] updated from transifex 2017-04-12 00:07:44 +00:00
Morris Jobke be9a514dff Allow to set text versions for the plain text email
* allows different texts for HTML and text version of the email

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:50:06 -05:00
Morris Jobke 8fa5141aaa Removes unused code for link share emails
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 17:32:48 -05:00
Morris Jobke 6bd1c50dc3 Merge pull request #4304 from nextcloud/add-email-template-to-ocp
Add IEMailTemplate to public OCP API
2017-04-11 15:09:27 -05:00
Morris Jobke 749046a799 Add drone.yml config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 14:59:30 -05:00
Vincent Petry d1081e7940 Add integration test for trashbin
Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 14:59:21 -05:00
Roeland Jago Douma 8175ac6ecd Merge pull request #4302 from nextcloud/test-integration-test
[Integration Tests] Clear opcode cache after config change
2017-04-11 21:29:58 +02:00
Lukas Reschke f3a78ee39d Remove constructor from interface
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 21:22:39 +02:00
Roeland Jago Douma 53ac842755 Merge pull request #3876 from nextcloud/downstream-26583
Share api expanded by tags
2017-04-11 21:01:12 +02:00
Morris Jobke c2686be8da Merge pull request #4285 from nextcloud/bump-md5
[js] Bump blueimp-md5
2017-04-11 12:07:02 -05:00
Lukas Reschke 4cf61481e5 Clear opcode cache after config change
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 18:57:40 +02:00
Michael Jobst 81b1dc4930 share api expanded by tags (#26583)
* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
Morris Jobke 45a6e37699 Merge pull request #4293 from nextcloud/fix_4248
Do reload shared views
2017-04-11 11:53:01 -05:00
Lukas Reschke 280a075c9c Adjust class references
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 17:35:59 +02:00
Lukas Reschke 3600dd4f52 Add IEMailTemplate to public OCP API
Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 16:35:46 +02:00
Roeland Jago Douma 42f40659f6 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:15 +02:00
Roeland Jago Douma 53bca14a27 Do proper DI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 3bc72f7224 give old end-points a seperate name
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle e2d7bffcda fix constructor
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 449011dae7 remove discovery manager in favour of the OCSDiscoveryService
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 0dea31d48b add tests for discovery service
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 821e287805 adjust existing tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle d5dec527c9 get addressbook url and carddav user from remote server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 930c507d89 use discovered end-point for trusted servers
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:04:01 +02:00
Bjoern Schiessle 45aee2e479 provide public discovery service to discover OCS end-points on another server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-11 15:03:59 +02:00
Roeland Jago Douma bd6273ee1c Merge pull request #4280 from nextcloud/share_via_display
Show 'shared via' in share list for reshares
2017-04-11 14:46:22 +02:00
Lukas Reschke afb5d45705 Merge pull request #4256 from nextcloud/theming
Move OC_Defaults to OCP\Defaults
2017-04-11 14:39:46 +02:00
Roeland Jago Douma 58f959864a Show 'shared via' in share list for reshares
Fixes #1330

userA shares a file to userB
userB shares that file to userC

userA can see both userB and userC.
Now they can also see that userB shared it to user C

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 13:56:03 +02:00
Lukas Reschke 5ca5ebe584 Merge pull request #2618 from nextcloud/2fa-challenge-text
Move log out and backup codes link into 2fa box for better readability
2017-04-11 11:41:55 +02:00
Roeland Jago Douma 8c01e45d6b Do reload shared views
Fixes #4248

The magic introduced in #3686 caused the shared views not to be updated
properly. Thus we just overwrite the _onUrlChange method in the
sharedfilelist.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-11 09:33:27 +02:00
Morris Jobke 1846e1262d Merge pull request #4289 from nextcloud/maintenance-mode-also-on-dav
Add missing maintenance plugin to new DAV endpoint
2017-04-11 00:44:20 -05:00
Morris Jobke 11d6fe1023 Merge pull request #4283 from nextcloud/shares-by-folder-quote
properly quota table names in getSharesInFolder
2017-04-10 19:39:19 -05:00
Nextcloud bot 4d90b0520e [tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Lukas Reschke 2f748f625c Run maintenance mode tests on Drone
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
Lukas Reschke b882f65fbb Add integration tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:39:54 +02:00
Lukas Reschke aacbb560ae Add missing maintenance plugin to new DAV endpoint
The `/remote.php/dav/` endpoint was not implementing the MaintenancePlugin. Thus when the instance was put into maintenance mode the endpoints were still accessible and delivered empty content. Sync clients really do love this.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-11 01:31:57 +02:00
Roeland Jago Douma 3810e89449 [js] Bump blueimp-md5 a major version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:56:56 +02:00
Roeland Jago Douma 7d1745d1e7 [js] Bump blueimp-md5
* bumped to latest
* moved to min

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-10 20:37:07 +02:00
Morris Jobke a045f3c4d7 Merge pull request #4146 from nextcloud/unread-comments-folder
Allow getting the unread comment count for an entire folder at once
2017-04-10 13:21:39 -05:00
Roeland Jago Douma a750436ebc Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities
move share by mail capabilities to the share provider
2017-04-10 19:50:13 +02:00
Robin Appelman a555672f21 properly quota table names in getSharesInFolder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:59:40 +02:00
Robin Appelman 421ca6439f use the same oci connectstring in all code paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 17:58:52 +02:00
Bjoern Schiessle cbacca4202 move capabilities to share by mail app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 17:18:13 +02:00
Björn Schießle 18580395d4 Merge pull request #4277 from nextcloud/permissions-mask-scanner
Dont use the permissions mask while scanning
2017-04-10 16:04:12 +02:00
Roeland Jago Douma e9c6fe2fd8 Merge pull request #4222 from nextcloud/dav-search-fileid
Allow searching file by fileid
2017-04-10 15:57:56 +02:00
Robin Appelman a7c611039d Dont use the permissions mask while scanning
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-10 15:19:21 +02:00
Roeland Jago Douma afea05d296 Merge pull request #4210 from nextcloud/downstream-26643
Removed path to datadir in exception
2017-04-10 12:43:46 +02:00
Joas Schilling 87bca38413 Merge pull request #4271 from nextcloud/also-send-the-new-data-with-the-event
Also send the new account data with the event
2017-04-10 11:14:39 +02:00
Joas Schilling 9e3a3eebf9 Lowercase "data" correctly
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 11:13:46 +02:00
Björn Schießle 235563f0a0 Merge pull request #4250 from nextcloud/disable-lookupserver-upload
allow admin to disable lookupserver upload
2017-04-10 11:04:19 +02:00
Lukas Reschke 09c66c93c5 Merge pull request #4266 from nextcloud/fix_missing_owner_on_public_calendars
don't remove owner property for public calendars
2017-04-10 10:41:13 +02:00
Joas Schilling bc217cdf87 Also send the new account data with the event
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-10 10:22:57 +02:00
Bjoern Schiessle 78f0b5c19f simplify return statement
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-10 09:44:23 +02:00
Morris Jobke d83c8e0271 ThemingDefaults append cacheBusterCounter to logo URL by default
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:09 -05:00
Morris Jobke 5b4adf66e5 Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Nextcloud bot d25a96d921 [tx-robot] updated from transifex 2017-04-10 00:08:50 +00:00
Georg Ehrke c99bdc9eb4 don't remove owner property for public calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-09 21:20:59 +02:00
Nextcloud bot 16091f4424 [tx-robot] updated from transifex 2017-04-09 00:07:40 +00:00
Nextcloud bot 4b0f50c456 [tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Morris Jobke ca9d25169d Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
2017-04-07 17:14:05 -05:00
Roeland Jago Douma 9adfa60eb3 Merge pull request #4255 from nextcloud/appmenu-tappable
Increase clickable area of app icon
2017-04-07 22:29:38 +02:00
Roeland Jago Douma 6c0cafb10f Merge pull request #4253 from nextcloud/downstream-27599
make JobList::next() lock free
2017-04-07 22:18:40 +02:00
Roeland Jago Douma bf30090be5 Parse date trough moment
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-07 22:16:29 +02:00
Morris Jobke 8838ed4c2e Merge pull request #4244 from nextcloud/welcome-email
New layout for welcome email
2017-04-07 14:52:28 -05:00
Jan-Christoph Borchardt 50609f0d7a Increase clickable area of app icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 21:01:22 +02:00
Jan-Christoph Borchardt 637920f669 Fix share dropdown opacity issue
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:44:54 +02:00
Jan-Christoph Borchardt 8db3419df1 Fix font-weight of Unshare entry
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-07 20:31:26 +02:00
Jörn Friedrich Dreyer c993c363e0 make JobList::next() lock free
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 13:07:09 -05:00
Morris Jobke 4c60360bf7 Merge pull request #4221 from nextcloud/provisioning-api-for-account-info
Allow to change account info via provisioning api
2017-04-07 12:48:44 -05:00
Lukas Reschke 8daf3d4a70 Update autoloader
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Lukas Reschke 281ad406e8 Add support for theming
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Lukas Reschke 1be75e8db8 Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Morris Jobke 0560e69913 New layout for welcome email
* thanks to @espina2 for make this nice design
* the button says "Set password" if the admin didn't specified a password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-07 12:03:32 -05:00
Lukas Reschke 325f925e14 Merge pull request #4249 from nextcloud/dont-force-accept-language-anymore
Don't force the use of Accept-Language anymore
2017-04-07 17:05:09 +02:00
Bjoern Schiessle d5173ac30f make sure that the selector for the visibility always fits next to 'Profile picture'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 16:30:07 +02:00
Bjoern Schiessle 9afd160e66 allow to disable upload to lookup server, by default it is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 16:30:07 +02:00
Bjoern Schiessle 11b46389af adjust to changes in the theming app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 0dc13d098f reset password field properties before we hide it
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle c7b1a48da7 add datepicker to the popover
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3bce6a7a6f allow to edit single files shared by mail. This is useful for collaborative editing documents
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:44:00 +02:00
Bjoern Schiessle 3323d01db1 update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Bjoern Schiessle 676a4c781a update capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-07 15:43:59 +02:00
Joas Schilling 3d628783d9 Allow to change account info via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 12:50:47 +02:00
Roger Szabo 5fa218051b unit test adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-07 18:06:50 +08:00
Joas Schilling 9f3d9b5b23 Don't force the use of Accept-Language anymore
This is not intended anymore, since it falls back to force english
when the header is not set. Also 0228bc6e66
makes clear that the order should be:

1. User setting
2. Accept language
3. Admin default

This is the case since the commit from above, unless via OCS and DAV.
Both forced to accept-language falling back to english.
By removing the force, it now also matches the w3 priority list:
https://www.w3.org/International/questions/qa-lang-priorities

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 11:10:04 +02:00
Joas Schilling 7ad791efb4 Dont create a log entry on email login
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 10:15:20 +02:00
Nextcloud bot 536650c02f [tx-robot] updated from transifex 2017-04-07 00:09:11 +00:00
Arthur Schiwon fbadb37b9b use known LockdownManager
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:27:30 +02:00
Arthur Schiwon 0a463e55ae Save correct login name
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Morris Jobke 4eddb95fc4 Add method to $methodsWithSensitiveParameters
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon daf9d23547 don't regenerate Session ID twice, also fixes tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon 50844e8c47 regenerate session id on successful login, fixes integration test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:43 +02:00
Arthur Schiwon 7b3fdfeeaa do login routine only once when done via LoginController
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:22:42 +02:00
Arthur Schiwon 2994cbc586 fix login controller tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-06 15:20:17 +02:00
Roger Szabo 0ea8729d1d lower case for attributes
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 19:17:24 +08:00
Roger Szabo f49ff74943 blizzz comments 03.04.2017 with caching
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:57:07 +08:00
Roger Szabo 33c8bf1857 blizzz comments 03.04.2017
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-04-06 16:26:41 +08:00
Joas Schilling 287bae8c5f Merge pull request #4153 from nextcloud/fix-upload
Fix upload of folders in Chrome
2017-04-06 09:56:41 +02:00
Morris Jobke 6e72fd5f9f Fix upload of folders in Chrome
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-06 00:50:58 -05:00
Morris Jobke b084ceec3d Merge pull request #4224 from nextcloud/dont-list-on-public-calendar-endpoint
Don't list on public calendar endpoints
2017-04-05 20:55:39 -05:00
Nextcloud bot 7d9688c89e [tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Lukas Reschke 63288ebc50 Don't list on public calendar endpoints
There is no need to allow listing here.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 22:43:05 +02:00
Roeland Jago Douma 56797fd695 Merge pull request #3526 from nextcloud/token-save-scope
Save the scope of an auth token in the session
2017-04-05 22:05:11 +02:00
Lukas Reschke 1d3e391ad8 Add integration tests for token auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-05 17:58:33 +02:00
Robin Appelman baec42e80a Save the scope of an auth token in the session
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 17:58:33 +02:00
Robin Appelman bb7e236e74 Allow searching file by fileid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-05 15:22:53 +02:00
Roeland Jago Douma 00558de782 Merge pull request #3781 from nextcloud/fac-56-log-spam-with-external-storages
Also add the root of external storages to the file id list
2017-04-05 15:21:38 +02:00
Jos Poortvliet 98312a9a58 Merge pull request #4215 from nextcloud/issue-template
Rename config section
2017-04-05 11:01:33 +02:00
Joas Schilling e3a3ff98ab Rename config section
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-05 11:00:33 +02:00
Artur Neumann 3795636b90 validate file name before uploading in upload only folder
fixes #4211

Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-05 13:26:40 +05:45
Roeland Jago Douma 6bdd3a167d Merge pull request #4123 from nextcloud/allow-password-reset-with-email
Allow to reset the password with the email as an input
2017-04-05 09:12:41 +02:00
Roeland Jago Douma ddd157a84c Merge pull request #3741 from nextcloud/user-settings-design
User mgmt settings design improvements
2017-04-05 09:02:58 +02:00
Nextcloud bot 84035862f7 [tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Kawohl bee0a3699e removed path to datadir
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 19:07:59 -05:00
Jan-Christoph Borchardt 94d4d20c39 proper padding for checkboxes in app-settings
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Jan-Christoph Borchardt 602819d6ab correct sorting of user management settings, wording
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-04 16:49:43 -05:00
Morris Jobke 95a21e2f2a Check for boolean false and add tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke 0fcb37adcb OC_ -> NC_
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Philipp Schaffrath 695a17804e Override config.php values through ENV variables (#26570)
* added functionality to override config.php values with 'OC_' prefixed environment variables

* use getenv to read environment variables since apache does not set $_ENV variables, fixed test

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 15:56:50 -05:00
Morris Jobke fa4107893d Merge pull request #4138 from nextcloud/resources_match_fullid
Match slashes in ../{id} resource routes
2017-04-04 15:52:53 -05:00
Morris Jobke b78876236d Merge pull request #4192 from nextcloud/fix/custom-default-app-redirect-2fa-selection
Redirect to 2FA selection screen
2017-04-04 15:47:35 -05:00
Roeland Jago Douma 72b8784e2a Merge pull request #4204 from nextcloud/append-fixes-swift
fix fseek (Swift backend) against string not resource by removing append support
2017-04-04 21:15:34 +02:00
Arthur Schiwon 30c95b51fb fix fseek against string not resource by removing append support
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-04-04 20:25:59 +02:00
Morris Jobke 52eaf6cfbb Merge pull request #3310 from duritong/patch-1
only chmod logfile if necessary
2017-04-04 11:42:26 -05:00
Joas Schilling 75657c1a6e Merge pull request #4071 from nextcloud/issue-173-database-conversion-failure
Make sure blob columns are correctly converted as parameters
2017-04-04 16:29:53 +02:00
Lukas Reschke e0227cb458 Merge pull request #2095 from nextcloud/bruteforcesetttings
Introduce bruteforce settings
2017-04-04 11:57:43 +02:00
Roeland Jago Douma da178db98e Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
Make public links work with master key
2017-04-04 11:46:13 +02:00
Roeland Jago Douma efb21a948e Merge pull request #4093 from nextcloud/endorse-password-protection
Endorse password protection
2017-04-04 11:04:21 +02:00
Roeland Jago Douma aee2d6318f Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 10:29:12 +02:00
Roeland Jago Douma 0d69b52fde Merge pull request #4147 from nextcloud/fix_3890
Don't try to parse empty body if there is no body
2017-04-04 10:25:13 +02:00
Roeland Jago Douma c0972a26ed Merge pull request #3896 from nextcloud/xx621998xx-newbranch
Fix remaining upload time calculation
2017-04-04 10:24:32 +02:00
Joas Schilling b6c1f3fc6d Some more hardening
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-04 08:51:21 +02:00
SarthikaDhawan 62fb3bb3ef file-upload.js modified : Remaining upload time corrected
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-04 08:51:20 +02:00
Roeland Jago Douma 31f9be7a75 Match slashes in ../{id} resource routes
Fixes #2954

Before we could match on <prefix>/{id} however if the id contains a /
this would not match properly. But since we define the resource routes
internally we now make sure that we match all chars (up until the ?).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:37:11 +02:00
Roeland Jago Douma 2a9192334e Don't try to parse empty body if there is no body
Fixes #3890

If we do a put request without a body the current code still tries to
read the body. This patch makes sure that we do not try to read the body
if the content length is 0.

See RFC 2616 Section 4.3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-04 08:22:33 +02:00
Nextcloud bot ec5377306d [tx-robot] updated from transifex 2017-04-04 00:07:46 +00:00
Morris Jobke 51bcb0bbe1 Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_shared_calendars
allow sharees to edit certain calendar properties for themselves
2017-04-03 13:12:56 -05:00
Roeland Jago Douma 55c94caff5 Merge pull request #4191 from nextcloud/bump-autosize
Bump autosize
2017-04-03 15:32:42 +02:00
Christoph Wurst a7cc8c86ab Redirect to 2FA selection screen
Apps like 'rainloop' use \OCP\Util::isLoggedIn() to check whether the
current request is authenticated. Since we redirected to the index
page before, it resulted in an infinite redirection loop. This change
sets the redirection URL to the 2FA selection page, which is the only
allowed page in that authentication state.

Fixes https://github.com/nextcloud/server/issues/3702

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-04-03 14:31:57 +02:00
Roeland Jago Douma 7d72ae3011 Move to autosize.min.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:42:33 +02:00
Roeland Jago Douma 497fe1682f Bump autosize.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-03 13:40:34 +02:00
Roeland Jago Douma 455542d306 Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparency-on-calendars
Make sure transparency is an integer when saving a calendar
2017-04-03 12:46:00 +02:00
Jos Poortvliet 13e7a93860 Merge pull request #4189 from nextcloud/add-issue-template-app
Add reference to issue template app
2017-04-03 12:12:00 +02:00
Jos Poortvliet 543555ec95 Update issue_template.md 2017-04-03 12:11:34 +02:00
Christoph Wurst cbe44043be Merge pull request #4131 from nextcloud/fix-jscombiner
Fix check for cache value in JSCombiner
2017-04-03 11:27:39 +02:00
Roeland Jago Douma 47e342c730 Merge pull request #4175 from nextcloud/fix-socialmenudisplay
Do not show social menu when there is no link share
2017-04-03 10:59:44 +02:00
Bjoern Schiessle 5e7197e49f fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:25 +02:00
Timo Benk 868500eda4 let the user set an empty password for share link
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:19 +02:00
Timo Benk 0d7801b6ce endorseLinkPassword changed to enableLinkPasswordByDefault
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:11 +02:00
Timo Benk cbfe5f3c1f feature endorse password for share links
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:58:03 +02:00
Bjoern Schiessle b85b6f2439 feature endorse password for share links
works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:57:52 +02:00
Bjoern Schiessle 5540def5e3 change permission order
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle dac6826ad7 setting to disable sending password by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle 99ebdc1111 make sure that variables are defined correctly
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:33 +02:00
Bjoern Schiessle cfbabf8f2f fix typo and capitalize cruds
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle b84fd7c361 set expire date for all share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle 3cc0d15f92 add secure drop functionallity to mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle c191173d59 allow password protected mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:29:32 +02:00
Bjoern Schiessle c6613ee8fc fix share provider id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Bjoern Schiessle 0d5147bd49 add new password column to the share table in order to set passwords for share by mails
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:49 +02:00
Bjoern Schiessle d0eefd17d3 allow the user to set a expire date for all shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-04-03 10:20:47 +02:00
Nextcloud bot d56f6399eb [tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Lukas Reschke 7909d4e46c Add reference to issue template app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-02 22:13:04 +02:00
Roeland Jago Douma e09c386f70 Move app to own repo
https://github.com/nextcloud/bruteforcesettings

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:26:02 +02:00
Morris Jobke ed00bab80b Fixed layout of bruteforcesettings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-02 21:19:30 +02:00
Roeland Jago Douma 86022f8710 Fix app
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:16:22 +02:00
Roeland Jago Douma 4e0479f3a8 Update App Manager test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:51 +02:00
Roeland Jago Douma c637ff556a App is always enabled
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma be674c19a5 Respect bruteforce settings in the Throttler
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:50 +02:00
Roeland Jago Douma dca555b7f3 Adds security section to the admin page
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:13:09 +02:00
Roeland Jago Douma 6a40dce138 Initial commit of the bruteforcesettings app
This adds the bruteforce settings app that allows to configure (for now)
subnets that are to be ignored when doing brute force analysis. This can
for example be the LAN since we trust people from there.

* Add app
* Add php tests
* Add js tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-02 21:08:53 +02:00
Lukas Reschke f31dafe4a8 Merge pull request #4183 from nextcloud/css-shortcuts-view
Add CSS for styling of keyboard shortcuts view
2017-04-02 16:45:07 +02:00
Nextcloud bot 0056211672 [tx-robot] updated from transifex 2017-04-02 00:07:48 +00:00
Roeland Jago Douma 2fa84ecfe0 Merge pull request #4139 from nextcloud/phpseclib
[3rdparty] Bump phpseclib to 2.0.4
2017-04-01 14:00:25 +02:00
Christoph Wurst 468f502c8d Merge pull request #4174 from nextcloud/mergejs-newline
mergejs should print a newline between imports
2017-04-01 08:38:47 +02:00
Nextcloud bot 9098042c95 [tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Roeland Jago Douma 2950bcbc70 Do not show social menu when there is no link share
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:29:41 +02:00
Roeland Jago Douma 04fc00fcdf mergejs should print a newline between imports
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-31 17:06:38 +02:00
Roeland Jago Douma 57020a0c36 Merge pull request #3438 from nextcloud/external-storage-user-folder
Allow using '/' as external storage mountpoint
2017-03-31 15:07:39 +02:00
Björn Schießle 85da9378c0 Merge pull request #4140 from nextcloud/no_encryption_no_wrapper
Don't add the Encryption Storage Wrapper if there are no encryption modules
2017-03-31 14:49:38 +02:00
Roger Szabo bd907a5dac usertest adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 17:30:59 +08:00
Roger Szabo 9ed4fb0494 usertest adjustment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 16:54:22 +08:00
Roger Szabo 1853c1ade2 remove redundant tabs
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:27:50 +08:00
Roger Szabo 5e7723f15c restore ldap_password_renew_pr
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-31 15:16:22 +08:00
Nextcloud bot 6a6300b1f2 [tx-robot] updated from transifex 2017-03-31 00:08:35 +00:00
Joas Schilling 738730f7b2 Also add the root of external storages to the file id list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 23:26:19 +02:00
Roeland Jago Douma 548871a9f3 Merge pull request #3832 from nextcloud/fix_1303
Do not clear CSRF token on logout (fix for #1303)
2017-03-30 18:25:50 +02:00
Joas Schilling 43143e170e Make sure transparency is an integer when saving a calendar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-30 17:58:33 +02:00
Robin Appelman 7d4c4224d1 fix setup of external storage integration tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 17:16:59 +02:00
Joas Schilling a51e4dd259 Merge pull request #4150 from nextcloud/capped-memcache-push
support pushing to CappedMemoryCache
2017-03-30 15:16:33 +02:00
Joas Schilling 0fb7c631ce Merge pull request #4128 from nextcloud/updateclipboard
Update clipboard.js
2017-03-30 14:37:03 +02:00
Roeland Jago Douma 70f93bf53a Merge pull request #4143 from nextcloud/ldap-downstream-64
Correctly apply quota
2017-03-30 14:10:21 +02:00
Roeland Jago Douma bca7257920 Merge pull request #3089 from nextcloud/cache-move-single-query
Move all children of a folder in a single query
2017-03-30 14:08:31 +02:00
Jan-Christoph Borchardt 7788afaccf Add CSS for styling of keyboard shortcuts view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-30 13:07:26 +02:00
Robin Appelman 11c1e5dd86 fix whitespace in cleantags
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:49:09 +02:00
Robin Appelman 48df99f2e0 fix quote helper test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:49:05 +02:00
Robin Appelman 2a4d9f71af update FakeManager
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:34 +02:00
Robin Appelman 40154dd6a3 use castColumn
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:30 +02:00
Robin Appelman 212d9fd277 Add test for getting unread comment count by folder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:27 +02:00
Robin Appelman 429f8ae011 Allow getting the unread comment count for an entire folder at once
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:48:24 +02:00
Robin Appelman 0aeb595784 user ids are strings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 12:24:46 +02:00
Robin Appelman dc4b983639 support pushing to CappedMemoryCache
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:21:32 +02:00
Robin Appelman d4a7cfec7c rename fun to func
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:06 +02:00
Robin Appelman fee818f493 Add tests for query builder (i)like
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:15:03 +02:00
Robin Appelman 3355fd549f dont double escape
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:59 +02:00
Robin Appelman 07449a4885 update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:56 +02:00
Robin Appelman 4125bdeb93 fix licence headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:52 +02:00
Robin Appelman 4b7bc2af0e Move all children of a folder in a single query
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:14:48 +02:00
Robin Appelman 4279b13270 Add function builder to the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:26 +02:00
Robin Appelman a65652fc1e add support for escaping like parameters when using the query builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:22 +02:00
Robin Appelman 83f3990e06 Add MD5() to sqlite
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-30 11:09:19 +02:00
Lukas Reschke 1ee7e1c0b1 Merge pull request #4132 from nextcloud/fix-safari-gzip
Fix gzip files for Safari
2017-03-30 10:47:28 +02:00
Roeland Jago Douma 4debe9b080 [3rdparty] Bump phpseclib to 2.0.4
See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-30 09:43:59 +02:00
Morris Jobke 85fcd42065 Merge pull request #4100 from nextcloud/header-indicator
show triangle below user menu too when an entry inside there is active
2017-03-29 21:43:18 -06:00
Nextcloud bot f984cf0987 [tx-robot] updated from transifex 2017-03-30 00:07:41 +00:00
Morris Jobke e8f2ee769b Merge pull request #4142 from nextcloud/numeric_avatar
Allow avatars for full numeric users
2017-03-29 17:17:19 -06:00
Morris Jobke d17678b5b2 Merge pull request #4141 from nextcloud/ldap-downstream-9
Convert the group limit to match the same behaviour as the user search
2017-03-29 15:47:28 -06:00
Roeland Jago Douma 0da04fd284 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 22:54:08 +02:00
Roeland Jago Douma 0315e2ea36 Merge pull request #4145 from nextcloud/ldap-downstream-54
Add tooltips to LDAP wizard special attributtes
2017-03-29 19:31:35 +02:00
Roeland Jago Douma 6d8e447895 Merge pull request #4108 from nextcloud/color-variable-rename
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
2017-03-29 19:13:36 +02:00
Roeland Jago Douma 636575e3de Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
Ldap no memberof with memberuid
2017-03-29 19:12:51 +02:00
Roeland Jago Douma 111c9f7563 Don't add the Encryption Storage Wrapper if there are no encryption modules
fixes #4125

If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).

This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 18:57:56 +02:00
Morris Jobke c1030a34a5 Merge pull request #4062 from nextcloud/downstream-26872
Adding dav resource for avatars
2017-03-29 10:30:22 -06:00
Jan-Christoph Borchardt 354a24e0aa also rename defaultMailHeaderColor to defaultColorPrimary
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Julius Härtl 698396a927 Add fallback to getMailHeaderColor so we don't break existing themes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-29 18:23:23 +02:00
Jan-Christoph Borchardt 9a75714c22 rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
David Toledo a4b9bd29a9 Add tooltips to LDAP wizard special attributtes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update settings.php

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

Update settings.php

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

Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 14:38:01 +02:00
Roeland Jago Douma 54c68519ce Allow avatars for full numeric users
Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 13:39:48 +02:00
Juan Pablo Villafáñez 4622bebded Include tests for "default" and "none" quotas
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3676189e05 Add comments in the updateQuota method to explain the behavior
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez ebd1a7d4b2 Add new testes to cover more cases
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez e9b96062e6 Adjust current tests to match the expectations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez f9832ff347 Check if the user exists before trying to set the quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:16 +02:00
Juan Pablo Villafáñez 3345a72e7e Correctly apply quota
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 13:32:11 +02:00
Juan Pablo Villafáñez 9e2e0c4c30 Convert the group limit to match the same behaviour as the user search
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-03-29 12:49:08 +02:00
Roeland Jago Douma 626d03e3d4 Merge pull request #4116 from nextcloud/swift-cache-token
Cache swift authentication token in memcache
2017-03-29 11:23:13 +02:00
Roeland Jago Douma 00839a5ac5 Merge pull request #4066 from nextcloud/always-fix-the-values-live
Directly fix invalid values of DTEND and DTSTART
2017-03-29 10:13:10 +02:00
Joas Schilling a88edce54f Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p
Replace unecessary unescaped prints with print
2017-03-29 10:02:10 +02:00
Joas Schilling 784e06073b Merge pull request #4129 from nextcloud/remove-verbose-error-message
Remove verbose error message
2017-03-29 10:01:17 +02:00
Morris Jobke ac7ca1c3a8 Merge pull request #4060 from nextcloud/shared_by_for_own_calendars
fix bug with shared_by for own calendars if shared
2017-03-29 00:29:54 -06:00
Morris Jobke 9813023aab Fix gzip files for Safari
* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:11:51 -06:00
Morris Jobke 05f2596311 Merge pull request #4091 from nextcloud/Rudloff-manifest
Web app manifest for adding to Android home screen
2017-03-28 21:36:54 -06:00
Morris Jobke f9bc53146d Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 21:00:12 -06:00
Pierre Rudloff 19d3133ccf Web app manifest
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 18:39:57 -06:00
Nextcloud bot 58513255d2 [tx-robot] updated from transifex 2017-03-29 00:07:41 +00:00
Morris Jobke 1f7124a57b Merge pull request #4120 from nextcloud/newest-item-first-in-activity
Change the order on merging activities so the newest item is first
2017-03-28 17:51:30 -06:00
Morris Jobke 9e1fdf4da5 Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar
Better styling of the empty content messages in the sidebar
2017-03-28 17:50:10 -06:00
Morris Jobke dbf6b7ff86 Merge pull request #4127 from nextcloud/update-legacy-csp-policy
Update legacy CSP policy
2017-03-28 17:47:32 -06:00
Morris Jobke 51e5c0766c Fix check for cache value in JSCombiner
* fixes following log output, because there was empty string
  stored in the cache

Invalid argument supplied for foreach() at lib/private/Template/JSCombiner.php#108

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 17:43:39 -06:00
Morris Jobke 4f09dc71e0 Merge pull request #4121 from nextcloud/split-sharing-integration-tests
Split long running features/sharing-v1.feature into two smaller parts
2017-03-28 17:24:40 -06:00
Morris Jobke 16b8c0c691 Merge pull request #4070 from nextcloud/gzip_scss_js
GZip generated CSS/JS files
2017-03-28 17:11:17 -06:00
Morris Jobke 6901b28f07 Split long running features/sharing-v1.feature into two smaller parts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-28 16:46:56 -06:00
Lukas Reschke 99675b46e9 Replace unecessary unescaped prints with print
There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:43:44 +02:00
Lukas Reschke 49ba822fef Remove verbose error message
There's no need to have this included in the error message.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:34:33 +02:00
Roeland Jago Douma b052addaca Use minified clipboard.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:27:50 +02:00
Roeland Jago Douma e8d068af1e Update clipboard.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:26:05 +02:00
Roeland Jago Douma 7cc96c2121 Don't output jpeg if we request png
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:05:04 +02:00
Lukas Reschke 2a77727897 Fix PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-29 00:04:29 +02:00
Roeland Jago Douma f0850b266e Fix inspection results
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-29 00:04:29 +02:00
Thomas Müller 836271e0fd Adding AvatarNodeTest
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
Thomas Müller 3e93f491f2 Adding AvatarHomeTest
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
Thomas Müller 73007255ce Return last modification time to allow proper listing in cadaver
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
Thomas Müller 23aab05bda Adding dav resource for avatars
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-29 00:04:29 +02:00
Lukas Reschke 3a90ab7e0a Update legacy CSP policy
Aligns it with the one enforced by the AppFramework

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-28 23:55:31 +02:00
Roeland Jago Douma 3a0ef65f33 Fix controller tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:42:20 +02:00
Joas Schilling b91bacf141 Better styling of the empty content messages in the sidebar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 23:26:10 +02:00
Roeland Jago Douma a40405531c Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 23:13:59 +02:00
Joas Schilling 2c682ad34d Merge pull request #4054 from nextcloud/inlinejsfirst
Moving the inline js before the CSS
2017-03-28 22:36:50 +02:00
Roeland Jago Douma 1ae56b054b Moving the inline js before the CSS
This allows browsers to do smarted parallel downloads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 22:02:22 +02:00
Roeland Jago Douma 4821c00ea8 Merge pull request #4004 from nextcloud/backport-27172
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
2017-03-28 21:56:44 +02:00
Roeland Jago Douma 54f9b35f71 Allow to gzip CSS/JS files
Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.

This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-28 21:46:23 +02:00
Robin Appelman 6991b79d40 serialize the token to json instead of using php's serialize
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 21:33:07 +02:00
Joas Schilling 4bae7ef96d Allow to reset the password with the email as an input
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 21:17:37 +02:00
Robin Appelman 205d5586e8 cache swift tokens in memcache
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:41 -06:00
Robin Appelman de83bda777 update rackspace/opencloud to 1.16.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 12:37:36 -06:00
Robin Appelman e26f138fc5 Merge pull request #4112 from nextcloud/swift-config
Better error messages for objectsack swift configuration
2017-03-28 17:51:18 +02:00
Joas Schilling 644b37c7e4 Change the order on merging activities so the newest item is first
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-28 17:19:34 +02:00
Robin Appelman 8dbca71a77 better error messages for invalid regions, urltypes and service names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 17:00:11 +02:00
Morris Jobke 401a5d896d Merge pull request #4101 from nextcloud/header-detail
show active indicator on current app even when hovering other icons
2017-03-28 08:57:09 -06:00
Robin Appelman 5062d0ac50 better error messages when swift authentication fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-28 11:02:18 +02:00
John Molakvoæ f88a578f8e Merge pull request #4082 from nextcloud/fix-menu
Fix pop over menu opacity
2017-03-28 09:47:48 +02:00
Nextcloud bot 6309b9ec1d [tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Morris Jobke b673d1d8c4 Merge pull request #4107 from nextcloud/users-settings-label
add Settings label to users settings for consistency
2017-03-27 17:45:40 -06:00
Jan-Christoph Borchardt f47cb96753 add Settings label to users settings for consistency
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-28 01:18:16 +02:00
Morris Jobke da11931815 Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-items
Don't spam the log with "Undefined index showInHeader"
2017-03-27 15:53:08 -06:00
Jan-Christoph Borchardt 7d3b0adf0a adjust opacity of search and gear icons in header
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 23:30:09 +02:00
Jan-Christoph Borchardt ef07f27628 add pointer finger to full clickable app icon area
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:24:28 +02:00
Jan-Christoph Borchardt 3da45ec375 show active indicator on current app even when hovering other icons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:18:37 +02:00
Jan-Christoph Borchardt 1c4603a376 show triangle below user menu too when an entry inside there is active
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 20:17:03 +02:00
Georg Ehrke 242bb746b9 OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-27 19:15:51 +02:00
Morris Jobke 56243e07cb Merge pull request #4083 from nextcloud/update-strengthify
Update strengthify and fix password strength
2017-03-27 10:06:54 -06:00
Morris Jobke afcb41886e Update strengthify and fix password strength
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-27 10:06:30 -06:00
Morris Jobke 0037d18aee Merge pull request #4094 from nextcloud/ldap-description
Fix LDAP description
2017-03-27 09:52:02 -06:00
Morris Jobke 27527adfd7 Merge pull request #4092 from nextcloud/theme-favicon-mask-color
use theming colors for favicon on macOS
2017-03-27 09:50:21 -06:00
Morris Jobke f76a3b532d Merge pull request #4096 from nextcloud/touch-floor
round the mtime in touch
2017-03-27 09:46:10 -06:00
Georg Ehrke b887adf386 allow sharees to edit certain calendar properties for themselves
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-27 17:21:57 +02:00
Robin Appelman 8de4209c3e round the mtime in touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 17:07:48 +02:00
Marius Blüm 690aec26bb Merge branch 'master' of https://github.com/nextcloud/server 2017-03-27 16:32:45 +02:00
Marius Blüm 0e058a9a94 Fix LDAP description
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-27 16:30:29 +02:00
Robin Appelman dc5ba95469 Merge pull request #4027 from nextcloud/better-spreed-call-urls
Better spreed call urls
2017-03-27 16:21:24 +02:00
Jan-Christoph Borchardt ea517b489f use theming colors for favicon on macOS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 15:45:56 +02:00
Georg Ehrke fc044caab1 Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
Roeland Jago Douma f4c9e44403 Merge pull request #4073 from nextcloud/secure-drop
Rename File drop to Secure drop
2017-03-27 14:39:32 +02:00
Roeland Jago Douma 16b02a0fa9 Merge pull request #4064 from nextcloud/update-moment
Update momentjs
2017-03-27 14:10:54 +02:00
Robin Appelman ae3016959e fix shared storage numeric id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-27 14:05:18 +02:00
Jan-Christoph Borchardt 0322e7a29e highlight active entry in personal info menu again
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-27 11:23:33 +02:00
Joas Schilling 81d87b01fe Don't spam the log with "Undefined index showInHeader"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-27 10:24:10 +02:00
Nextcloud bot d9ebc2626f [tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Olivier Paroz 5a6c7877f6 Rename File drop to Secure drop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 16:13:35 -06:00
Morris Jobke 12c5c336ad Merge pull request #4077 from nextcloud/better-navigation-management
Register the app management in the normal way
2017-03-26 15:48:19 -06:00
Morris Jobke 96d4e1cab5 Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script
Use eval instead of $.script
2017-03-26 15:13:03 -06:00
Joas Schilling 8d3c461151 Allow to specify the id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
Morris Jobke 3ba114dbbc Merge pull request #4065 from nextcloud/bump_scss
[3rdparty] Bump SCSSphp
2017-03-26 15:03:19 -06:00
Roeland Jago Douma 272d6a1f44 [3rdparty] Bump SCSSphp
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 15:02:53 -06:00
Joas Schilling 75eee315a3 Use false because null crashes the cache
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:43:19 +02:00
Joas Schilling 918f6fd10b Make sure help is always after users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +02:00
Lukas Reschke 0d6e5dfbb9 Merge pull request #4075 from nextcloud/search-hover-feedback
add hover feedback for search, and opacity on use
2017-03-26 22:31:57 +02:00
Morris Jobke 900f11fd91 Fix order as @jancborchardt requested
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
Morris Jobke e1ad305e0b Fix pop over menu opacity
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:09:22 -06:00
Joas Schilling 0564392cb9 Fix the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:26:45 +02:00
Joas Schilling 0229c16e5f Don't use the dropdown for one item only
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
Joas Schilling e0b040d623 Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00
Morris Jobke 7dd5d7363e Merge pull request #4074 from nextcloud/replace-name-with-icon
replace name in top right with icon for less noise
2017-03-26 13:02:47 -06:00
Morris Jobke 84b5521981 Merge pull request #4069 from nextcloud/fix-emptycontent-font-color
fix emptycontent font color lightness
2017-03-26 12:59:58 -06:00
Joas Schilling 7cc5130e82 Allow apps to register a setting via info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:37:39 +02:00
Joas Schilling 433958e2e3 Move app management to the settings menu
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:26:05 +02:00
Lukas Reschke 3c1d76c282 Cleanup code as suggested by @icewind1991
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 19:45:36 +02:00
Joas Schilling 054e161eb5 Manage the right side menu via the navigation manager as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:40:41 +02:00
Joas Schilling ec330c7ac4 Register the app management in the normal way
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:08:51 +02:00
Christoph Wurst f154b1d32c Merge pull request #4063 from nextcloud/bump_dompurify
Bump dompurify
2017-03-26 18:35:14 +02:00
Jan-Christoph Borchardt 068e2b3c30 add hover feedback for search, and opacity on use
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-26 18:34:09 +02:00
Jan-Christoph Borchardt 2048e3e201 replace name in top right with icon for less noise
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-26 18:15:34 +02:00
Lukas Reschke bff6c8aafc Move X-Frame-Options into PHP
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 17:26:11 +02:00
Joas Schilling 2961c735e3 Make sure blob columns are correctly converted as parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 17:11:57 +02:00
Lukas Reschke fea2108710 Make async
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 15:26:10 +02:00
Jan-Christoph Borchardt 8654139b3c fix emptycontent font color lightness
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-26 15:19:41 +02:00
Lukas Reschke 980ef89dbf Fix callback
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 14:17:01 +02:00
Lukas Reschke 12a019d328 Use eval instead of $.script
Fixes https://github.com/nextcloud/server/issues/4067

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 14:12:44 +02:00
Joas Schilling 3bd501aad2 Directly fix the values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 13:09:53 +02:00
Roeland Jago Douma ec6853a2a6 Merge pull request #3895 from nextcloud/create-notification-when-update-server-not-reachable
Create a notification when the update server couldn't be reached for …
2017-03-26 12:10:09 +02:00
Joas Schilling 27e3a977aa Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:59 +02:00
Morris Jobke 2249c77a06 Also remove failure notification if no update is available
* error happened and vanished the notification should also
  vanish even if no update is available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 10:59:58 +02:00
Joas Schilling 3668673d7b Create a notification when the update server couldn't be reached for some days
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +02:00
Roeland Jago Douma 62827dd1da use moments.js min in core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 10:25:15 +02:00
Roeland Jago Douma 68eaa1f1d2 [js] Bump momentjs
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 10:25:09 +02:00
Roeland Jago Douma 329cee85d1 Update bundled core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 09:35:08 +02:00
Roeland Jago Douma a847bad4aa [js] Bump DOMPurify
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 09:34:32 +02:00
Morris Jobke f3917cfea1 Merge pull request #4053 from nextcloud/bump-zxcvbn
[3rdparty] Bump zxcvbn
2017-03-26 00:04:40 -06:00
Jörn Friedrich Dreyer 5da845609d no ternary
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:38 -06:00
Jörn Friedrich Dreyer 3d0005d001 fix constant
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:30 -06:00
Robin McCorkell ef57c03dd2 Add Redis Cluster support
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-25 21:25:27 -06:00
Nextcloud bot 0981f9a18a [tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Georg Ehrke 896dd76ab5 fix bug with shared_by for own calendars if shared
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-03-25 23:07:09 +01:00
Roeland Jago Douma b572cf8ec0 [3rdparty] Bump zxcvbn
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-25 20:56:20 +01:00
Roeland Jago Douma 28b6929111 Merge pull request #4049 from nextcloud/fix-installation-again
Don't run JSCombiner when not installed
2017-03-25 19:22:38 +01:00
Lukas Reschke d81cdcbe88 Don't run JSCombiner when not installed
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
Nextcloud bot 4ea79a5bbe [tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Morris Jobke ea8b61b61c Merge pull request #4037 from nextcloud/downstream-27421
Use authType BASIC for Sabre client in integration tests
2017-03-24 17:30:24 -06:00
Morris Jobke 2f7669179e Merge pull request #4043 from nextcloud/merge-js-for-template-prepend
Merge JS for template prepend
2017-03-24 15:42:08 -06:00
Morris Jobke 8aedebff22 Merge pull request #4044 from nextcloud/merge-login-js
Merge login JS
2017-03-24 15:38:29 -06:00
Lukas Reschke 6a4fde11e6 Merge login JS
Removes 2 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 21:18:24 +01:00
Lukas Reschke 4f73911bab Merge pull request #4041 from nextcloud/merge-systemtags-js
Merge systemtags JS
2017-03-24 21:12:42 +01:00
Lukas Reschke 3623431ac3 Merge pull request #4040 from nextcloud/merge-js-for-versions
Merge JS for files_versions
2017-03-24 21:11:58 +01:00
Lukas Reschke c628095ede Merge pull request #4042 from nextcloud/merge-js-forsharing-code
Merge sharing backend JS
2017-03-24 21:11:42 +01:00
Lukas Reschke 6a470e5935 Merge JS for template prepend
Shaves off 14 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:37:13 +01:00
Lukas Reschke 4d68324ba6 Merge sharing backend JS
Removes 8 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:17:38 +01:00
Morris Jobke 84b6b1807f Merge pull request #4038 from nextcloud/merge-js-for-fileview
Merge file view JS files
2017-03-24 13:17:06 -06:00
Morris Jobke 773faa215b Merge pull request #4039 from nextcloud/merge-js-for-comments
Merge JS for comments
2017-03-24 13:16:38 -06:00
Lukas Reschke a9c3692a9a Merge systemtags JS
Shaves off 7 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 20:08:27 +01:00
Lukas Reschke 0ed56589cc Merge JS for files_versions
Shaves off 3 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:57:19 +01:00
Lukas Reschke bdd71b6081 Merge JS for comments
Shaves off 6 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:49:43 +01:00
Lukas Reschke b70b138bdb Merge file view JS files
Removes 26 requests on the file list loading

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:42:22 +01:00
Vincent Petry c54091d43b Use authType BASIC for Sabre client in integration tests
This helps massively reduce the numerous useless 401 exceptions that
appears in the test log. These appear only because Sabre first connects
without any auth type to receive the challenge and then sends the
authentication data.

With this change it will directly use basic auth.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-24 12:40:14 -06:00
Lukas Reschke 2cd79a8d3d Merge pull request #3988 from nextcloud/jscombiner
[PoC] JS Combiner
2017-03-24 19:31:31 +01:00
Morris Jobke 94ab2e4029 Merge pull request #4021 from nextcloud/update-dependencies
Update dependencies
2017-03-24 11:10:20 -06:00
Morris Jobke 656528d6f8 Update dependencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-24 11:09:26 -06:00
Roeland Jago Douma be6acbeb52 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 16:11:54 +01:00
Joas Schilling 4174d75f86 Throw a nice HintException when the apps are missing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 15:02:49 +01:00
Vincent Petry 6b9ef15803 Use master key for public links as well 2017-03-24 14:55:42 +01:00
Vincent Petry 305718370a Add tests for null user 2017-03-24 14:55:33 +01:00
Vincent Petry 43c081bdc9 Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
2017-03-24 14:55:12 +01:00
Björn Schießle b79211e4ae Merge pull request #3825 from nextcloud/federation-fixes
create correct VCard and return correct error codes
2017-03-24 14:33:03 +01:00
Joas Schilling bc11c7ba97 Allow to use short URLs for calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:52:42 +01:00
Joas Schilling 34f0ad4ebe Allow to push a non-query URL to the browser history
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:51:58 +01:00
Roeland Jago Douma 677e11b1a4 Tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 11:31:48 +01:00
Bjoern Schiessle ee014bddbd fix tests
calling getAbsoluteBundlePath() in the constructor makes other tests fail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:27:01 +01:00
Joas Schilling 33867f331c Load cert file before syncing addressbooks and contacts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle aa26a3ae74 use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle e637113452 don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle 4531b4a81d only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle faf836b0c0 fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:41 +01:00
Roeland Jago Douma b5299b1403 Add return
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma 90910290d1 Add debug mode
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma 242f8964cf Add caching
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma 48158c8bec Combine additional files_sharing scripts
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Roeland Jago Douma 8e89ad21a2 [PoC] JS Combiner
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:10 +01:00
Joas Schilling 35d3a082f2 Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directories
Fix workflow engine mimetype detection when creating a directory
2017-03-24 10:55:10 +01:00
Lukas Reschke e5f9675a79 Merge pull request #4026 from nextcloud/appmenu-fix
Fix appmenu issues
2017-03-24 10:54:33 +01:00
Lukas Reschke f94bc6f8bb Merge pull request #4013 from nextcloud/bundle_vendor_js
Bundle vendor js
2017-03-24 10:49:57 +01:00
Julius Härtl 22c58a6610 Fix appmenu issues
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-24 10:19:42 +01:00
Roeland Jago Douma df4d1f7b78 Merge pull request #4022 from nextcloud/downstream-27105
Remove auto-focus on certain input fields
2017-03-24 10:01:06 +01:00
Roeland Jago Douma 34632de102 Merge pull request #4025 from nextcloud/downstream-27292
Update karma
2017-03-24 08:44:42 +01:00
Morris Jobke 1397b84777 Merge pull request #3928 from nextcloud/downstream-17978
Adjust 4 byte MySQL code to upstream
2017-03-23 23:45:43 -06:00
Morris Jobke d197f609a8 Merge pull request #3889 from nextcloud/downstream-26950
Sharing dialog: make autocomplete sorting case insensitive
2017-03-23 23:45:28 -06:00
Morris Jobke 9bd4c406e3 also install sinon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 23:42:54 -06:00
Vincent Petry ab37577182 Properly clear heartbeat interval
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 23:37:24 -06:00
Vincent Petry 46a32045d7 Update karma, use sinon from npm
Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 23:35:41 -06:00
Nextcloud bot e18d928d9b [tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Felix Heidecke a9dc3239b3 Remove auto-focus on certain input fields
* remove autofocus on input certain input fields if browser is msie
* Update sharedialoglinkshareview.js
* Update sharedialogview.js

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 17:34:50 -06:00
Morris Jobke 49d0507f5d Merge pull request #3879 from nextcloud/downstream-26915
Added integration tests for sharees using v2.php
2017-03-23 16:12:24 -06:00
Morris Jobke 71c80433c2 Merge pull request #4007 from nextcloud/backport-27155
Change showTemporary notifications for closable ones
2017-03-23 15:56:18 -06:00
Morris Jobke dbaebc53b0 fix sorting in the backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 15:41:25 -06:00
Morris Jobke 8a4466f9ae Improve error message of charset convert script and behaviour
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 15:36:22 -06:00
Morris Jobke a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06:00
Morris Jobke b59f6dcca4 Merge pull request #3850 from nextcloud/search-order
Fix search ordering
2017-03-23 15:25:27 -06:00
Robin Appelman 2d02a4735c Fix search ordering
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:24:50 -06:00
Morris Jobke d2654c8aea Merge pull request #3965 from nextcloud/downstream-27343
Providing --path option to transfer-ownership
2017-03-23 15:20:53 -06:00
Roeland Jago Douma 6e6cbae37c Merge pull request #3998 from nextcloud/backport-27032
Use the expected method depending on the target being a file or folder
2017-03-23 21:59:39 +01:00
noveens 40228c0c2b added quit option in commentstabview.js
added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
Morris Jobke 869ba16273 do not remove the method and only keep the tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:10:43 -06:00
Morris Jobke eee7e97a6e Merge pull request #4001 from nextcloud/backport-27389
Ensure that FileInfo return values as required by its phpdoc.
2017-03-23 13:00:49 -06:00
Lukas Reschke 9039b71a23 Merge pull request #4000 from nextcloud/backport-27216
allow configuring authType for DAV backend
2017-03-23 19:28:49 +01:00
Joas Schilling 3c1e7e5ada Make deleting a group compatible with ocs v2
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 19:24:02 +01:00
Joas Schilling 88015bc51f Fix type hints and doc blocks
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 17:52:47 +01:00
Robin Appelman a12ec5ec77 set cache to failedcache when shared storage init fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:01:23 +01:00
Robin Appelman 76d8699c0f Allow using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 14:03:22 +01:00
Roeland Jago Douma 03d688d6ac Handlebars is already loaded by core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:30 +01:00
Roeland Jago Douma 588f47d498 Add CI step to verify merged vendor js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:30 +01:00
Roeland Jago Douma eda98ed3df Merge vendor js
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:23 +01:00
Joas Schilling 394a61f1e6 Fix workflow engine mimetype detection when creating a directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 12:45:36 +01:00
Lukas Reschke f38d36a161 Merge pull request #3995 from nextcloud/files_scan_appdata
Add files:scanAppData command
2017-03-23 12:28:55 +01:00
Lukas Reschke 1f210bf273 Merge pull request #3948 from nextcloud/downstream-27271
Tooltip in trashbin with previous location
2017-03-23 11:57:34 +01:00
Lukas Reschke 9675bbd830 Merge pull request #3978 from nextcloud/scss_deps_memcache
Cache SCSS dependency file in memcache
2017-03-23 11:56:35 +01:00
Lukas Reschke 1a80960a27 Merge pull request #3989 from nextcloud/files-external-save-button
replace autosave with a save button for external storage configuration
2017-03-23 11:55:36 +01:00
Lukas Reschke d6cff564f6 Merge pull request #3994 from nextcloud/only_init_backbone_once
Only initialize backbone once
2017-03-23 11:54:54 +01:00
Roeland Jago Douma 17cf8dc450 Merge pull request #3997 from nextcloud/backport-27353
Update davclient.js to 0.1.1
2017-03-23 08:36:23 +01:00
Morris Jobke 9e2588f2cb Merge pull request #3999 from nextcloud/backport-27262
Updated UI messages relating to the encryption functionality
2017-03-23 00:25:59 -06:00
Vincent Petry 89c42a76c3 Remove SharedCache::getNumericStorageId to let CacheWrapper do it
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
Piotr M 5c7079f8c6 Ensure that FileInfo return values as required by its phpdoc.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 20:03:46 -06:00
Nextcloud bot 39ac804899 [tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Jörn Friedrich Dreyer 9eca1da1dd allow configuring authType for DAV backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06:00
Matthew Setter d7c9e2b841 Updated UI messages relating to the encryption functionality
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:06:55 -06:00
Juan Pablo Villafáñez 713faa0fc0 Use the expected method depending on the target being a file or folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:02:09 -06:00
Vincent Petry b1c98404d0 Update davclient.js to 0.1.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:58:52 -06:00
Morris Jobke fbf3bfa3ea improve file transfer code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:40:36 -06:00
Morris Jobke fb87aa61e7 fix path for files from root folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:17:37 -06:00
Morris Jobke b26c8f8bd3 Use proper name and code style
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 15:59:55 -06:00
Roeland Jago Douma e4d4fb5352 Only initialize backbone once
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 22:48:58 +01:00
Nextcloud bot d551b8e6fd [tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Roeland Jago Douma e3f8e416e6 Add files:scanAppData command
Fixes https://github.com/nextcloud/server/issues/3041

Add a dedicated command to scan the special appdata dir

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 21:30:44 +01:00
Roeland Jago Douma 35a21b4180 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 20:14:18 +01:00
Roeland Jago Douma e3925ba2a1 Cache SCSS dependency file in memcache
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 20:14:08 +01:00
Morris Jobke e25b997d0b Merge pull request #3497 from nextcloud/mount-shared-last
mount shared mounts last
2017-03-22 13:12:54 -06:00
Roeland Jago Douma 8b75e9b8a0 Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo
Remove the ownCloud Root Authority file as well
2017-03-22 20:10:05 +01:00
Morris Jobke 7281b240aa Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js
Revert "Bundle vendor js"
2017-03-22 12:11:45 -06:00
Morris Jobke f4ead7c7d3 Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 12:08:41 -06:00
Robin Appelman 1e707ef1db add integration test to ensure that shares dont overwrite external storages
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 18:00:12 +01:00
Robin Appelman 714f198a5d mount shared mounts last
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 17:15:42 +01:00
Roeland Jago Douma 4518a28924 Revert "Bundle vendor js" 2017-03-22 17:01:54 +01:00
blizzz 0b5e1814be Merge pull request #3977 from nextcloud/di_ng2
Make DI work for all apps
2017-03-22 15:36:52 +01:00
Joas Schilling 2e78aa6232 Remove the cert as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 15:17:19 +01:00
Robin Appelman 11ee0b14bb replace autosave with a save button for external storage configuration
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 14:32:26 +01:00
Roeland Jago Douma ec3f5aa6e2 Merge pull request #3795 from nextcloud/bundle_vendor_js
Bundle vendor js
2017-03-22 13:34:21 +01:00
Roeland Jago Douma 11c4875190 Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo
Remove ownCloud Root Authority as per todo
2017-03-22 12:33:24 +01:00
Joas Schilling 9667ac2b8e Register the namespace with the autoloading to allow reverse recovery
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:55:04 +01:00
Joas Schilling 3f86f1276f Also cache the namespace from appinfo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 11:50:31 +01:00
Roeland Jago Douma 8b94fbe014 Add the AppContainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 11:24:16 +01:00
Joas Schilling 5695a4ec92 Don't do a recursive search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:44:13 +01:00
Joas Schilling 9208f6379c buildAppNamespace already has the fallback
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 10:13:14 +01:00
Roeland Jago Douma d83b15cd85 Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip
Remove tooltip of delete button for systemtags
2017-03-22 09:24:40 +01:00
Roeland Jago Douma d2a2cef4cc Handlebars is already loaded by core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 09:01:47 +01:00
Roeland Jago Douma a427e130ae When debug don't load the bundled file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:58:28 +01:00
Joas Schilling 5a6e29e4a8 Remove ownCloud Root Authority as per todo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-22 08:54:40 +01:00
Roeland Jago Douma 1f7b86297a No need to exit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:52:49 +01:00
Roeland Jago Douma 2337e11d88 Bump core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:39 +01:00
Roeland Jago Douma 12de9ad655 Add CI step to verify merged vendor js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
Roeland Jago Douma 98a14909e1 Bundle more default vendor js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:49:03 +01:00
Roeland Jago Douma 7195a9323d Merge vendor js
There is a bunch of javascript we always load from vendors. This
combines this into 1 javascript file. Which reduces the number of
request by ~10.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 08:48:10 +01:00
Roeland Jago Douma 16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css
Merge some CSS files using our SCSS compiler
2017-03-22 08:46:10 +01:00
Christoph Wurst c6c5896474 Merge pull request #3980 from nextcloud/fix-app-menu-triangle
Fix position of triangle in app menu
2017-03-22 08:43:45 +01:00
Morris Jobke c3f08ab151 Remove tooltip of delete button for systemtags
* fixes #3967

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 21:49:25 -06:00
Nextcloud bot cae8702ab2 [tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Morris Jobke e46ffe82f7 Merge pull request #3974 from nextcloud/fix-reshare-activity-message
Fix reshare with user activity message
2017-03-21 16:55:15 -06:00
Joas Schilling 20a0a18fbd Fix reshare with user activity message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
Morris Jobke 6d35827bf6 Fix position of triangle in app menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:48:13 -06:00
Morris Jobke 3329f44a76 Address comments
* fix URL to documentation
* improve logic of UTF8mb4 check
* fix connection parameter creation - it's done already in ConnectionFactory::createConnectionParams
* remove unused attributes of MDB2SchemaReader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
Morris Jobke 1aef2f417b Adjust tests as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:42 -06:00
Morris Jobke 713f684a8b Adding tests for 4 byte unicode characters
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes

Add config option to update charset of mysql to utf8mb4

* fully optional
* requires additional options set in the database

only disable unicode test on mysql

Fixing ctor call

Adding docker based unit test execution for mysql utf8mb4

Add mysqlmb4 test configuration to Jenkinsfile

fix collation on utf8mb4

Properly setup charset and collation in the doctrine connection

Allow files containing 4-byte chars in case the database supports it

During setup of a mysql database we try to detect if charset 'utf8mb4' can be used

Fix mysql settings

Add console command to migrate the charset

Set ROW_FORMAT before setting collation to mb4

Also select tables with wrong collation

Faster MySQL docker

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 16:42:12 -06:00
Morris Jobke 1084cdb613 fix path
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
Roeland Jago Douma 67909cf87b Make DI work for all apps
As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309
appid's don't have to match the namespace.

Work around this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 20:53:37 +01:00
Morris Jobke d2b1b02244 Merge pull request #3937 from nextcloud/downstream-27234
fix typo in sftp public key
2017-03-21 13:18:19 -06:00
Morris Jobke a85d7e6f98 Merge pull request #3975 from nextcloud/remove-dead-code
Remove test code
2017-03-21 13:17:11 -06:00
Lukas Reschke 99bf437640 Remove test code
This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/6dbe417c51125419516dd29ebe4e529926c41a0f

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:59:10 +01:00
Joas Schilling 348d97dfd6 Merge pull request #3844 from nextcloud/unshare_event
Unshare event
2017-03-21 16:57:09 +01:00
Lukas Reschke 5c7ad6d3ec Merge some CSS files using our SCSS compiler
This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
Lukas Reschke 60d45ec2cc Merge pull request #3968 from nextcloud/fix-branding
[master] Fix branding and show Nextcloud
2017-03-21 13:54:58 +01:00
Lukas Reschke d8e8d7b60e [master] Fix branding
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:20:22 +01:00
Roeland Jago Douma 7e95837097 Merge pull request #3955 from nextcloud/downstream-27113
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
Lukas Reschke 04f419bc25 Merge pull request #3901 from nextcloud/di_ng
Move Interface Definitions to the ServerContainer
2017-03-21 11:06:16 +01:00
Roeland Jago Douma 92f50c7d87 Core is also a special app
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:42:33 +01:00
Roeland Jago Douma 48c34522ed Move a lot of stuff over to the ServerContainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 10:29:59 +01:00
Roeland Jago Douma 0fb5776133 Fix NODB tests etc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma c92b9ce2c4 Fix settings tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma 21641302a9 Add DI intergration tests
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma 7cece61ff6 Extend DI tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma 246e9ce547 More elegant handling of recursion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma df14684817 PoC of moving the interface classes to the servercontainer
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:20 +01:00
Roeland Jago Douma 886202123c Update query method for DIContainer
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-21 08:52:17 +01:00
Nextcloud bot fd0e42e093 [tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Morris Jobke 209e3e39e2 Use proper bash test syntax
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:48:55 -06:00
Sujith H f654f29532 Providing --path option to transfer-ownership
This will help user to selectively move the folders
specified using --path option, instead of moving
entire folder under files directory.

Signed-off-by: Sujith H <sharidasan@owncloud.com>

Update the integration test for transfer-ownership

Update the integration test for transfer-ownership
as the new option --path is introduced in the command.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:29:21 -06:00
Roeland Jago Douma 3b07731099 Merge pull request #3963 from nextcloud/logs-access-to-previews
Log access to preview images
2017-03-20 21:41:25 +01:00
Joas Schilling ce302aea11 Fix warning
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
Joas Schilling a8e3168c17 200 is ok
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
Joas Schilling 4157e7914a Fix deletion of groups
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
Joas Schilling 4626514a35 Strict comparisons
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 13:13:09 -06:00
Morris Jobke 036f5a6e08 add drone config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 13:13:08 -06:00
Sergio Bertolin 8e99f19c28 Added tests using v2.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 13:13:08 -06:00
Lukas Reschke 21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables
Implement scss variables
2017-03-20 19:49:53 +01:00
Thomas Müller 5bfce597a9 [CI] Can we get some faster phpunit execution? (#27113)
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 12:34:05 -06:00
Lukas Reschke abaf909ba2 Log access to preview images
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 18:36:36 +01:00
Robin Appelman 0c1b7fdcb5 return failed cache if the shared storage failed to setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:31:34 +01:00
Robin Appelman f2e981e269 also set nonmaskedstorage in error cases
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:17:53 +01:00
Christoph Wurst 03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
Robin Appelman be9ae45a4b Merge pull request #3961 from nextcloud/revert-2137-make-sure-tests-run-on-phpunit-4-again
Revert "Add a magic wrapper to allow phpunit4 to run the code again "
2017-03-20 15:32:34 +01:00
Roeland Jago Douma 1565177fb5 Revert "Add a magic wrapper to allow phpunit4 to run the code again "
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-20 14:25:43 +01:00
Julius Härtl a0f7d4b688 Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:20:34 +01:00
Julius Härtl 53c0fe6e23 Fix sass compile tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:12:45 +01:00
Julius Härtl 29ec58f1b5 Add tests for SCSSCacher
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 14:12:35 +01:00
Lukas Reschke 450a899f01 Merge pull request #3945 from nextcloud/downstream-27298
Adding file, line, class and function to the query logger (#27298)
2017-03-20 13:16:10 +01:00
Lukas Reschke 29039eb608 Merge pull request #3951 from nextcloud/menu-firefox-fixes
Fix new app menu on firefox
2017-03-20 13:15:43 +01:00
Roeland Jago Douma 376e6f0884 Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize
Fix value of attribute "autocapitalize"
2017-03-20 13:13:32 +01:00
Julius Haertl ccd35095d0 Add variables.scss to sass compile test
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 4fbf9a4feb Add tests for SCSSCacher
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 7381a2ec5c Replace old color occurences with calculations
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 322ecdca63 Make remaining colors depending on $color-main-text and $color-main-background
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 9f259d4c7a Remove legacy CSS
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl c7de67e44a Merge color tones aaaaaa, bebebe, cccccc in bbbbbb
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 58a9d1b0f2 Remove grey tints
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:08 +01:00
Julius Haertl 5b3a1a558e Remove separate error colors
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 8ff3db1be8 Extra variable for loading icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 33ee6e8d37 Merge #666 and #777 to #555
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 19ce6372ad Use one box-shadow color
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 7b5d5d19a8 Replace #222 with #333
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 51c6fcda10 Remove unused old #999
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:07 +01:00
Julius Haertl 52fdec8600 Merge colors
- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl 14d73d07aa Remove rgb color values
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl bea61d063a Simplify colors
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl e2d7ac1c3a SCSS colors in tooltip.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl 6c59377b95 SCSS colors in styles.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl 29028927d1 SCSS colors in share.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl 78d1e7685f SCSS colors in multiselect.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:06 +01:00
Julius Haertl 128c271c73 SCSS colors in inputs.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Julius Haertl 35a805a6f3 SCSS colors in icons.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Julius Haertl 5dac3805b0 SCSS colors in apps.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Julius Haertl 34bf2b5616 SCSS colors in header.scss
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Julius Haertl 2d1f886c6a Add variables of existing colors
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Julius Haertl 2bd06e0d37 Add variables.scss and import it for each scss file
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-20 12:49:05 +01:00
Joas Schilling 85a5c24934 Merge pull request #3939 from nextcloud/downstream-27159
Fix malformed logging in exception
2017-03-20 12:46:48 +01:00
Joas Schilling 257fbd85eb Merge pull request #3929 from nextcloud/downstream-27068
cache loadUser if not exists
2017-03-20 12:44:54 +01:00
Joas Schilling 35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
Joas Schilling 25f772d592 Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Correctly escape the footer description from theming
2017-03-20 11:56:29 +01:00
Lukas Reschke a3739906f6 Merge pull request #3924 from nextcloud/preview_fixes
Do not generate the max preview twice
2017-03-20 11:45:51 +01:00
Lukas Reschke ac1aff7d92 Merge pull request #3950 from nextcloud/downstream-27149
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00
Joas Schilling b3556456b6 Don't use private api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:32:29 +01:00
Joas Schilling 5795482282 createMock
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:14:14 +01:00
Lukas Reschke 1e61c17932 Fix grammar
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:08:39 +01:00
Lukas Reschke ab9e3525cc Move error message to log entry
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:06:08 +01:00
Joas Schilling 3eb8313657 Fix the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Joas Schilling 6d30b35ed7 Some more code fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Joas Schilling 5cf6fc7e8d Add integration tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Joas Schilling 3abe86dade Fix provisioning API call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Joas Schilling 591e75df5c Don't use a generic exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:33:16 +01:00
Roeland Jago Douma c4b6ff0bab Merge pull request #3946 from nextcloud/downstream-27263
Fix public link download button (unit test only)
2017-03-20 10:23:29 +01:00
Morris Jobke 8b670b41f1 Merge pull request #3952 from nextcloud/downstream-27209
Log files:scan exception, add InterruptedException
2017-03-20 03:22:58 -06:00
Morris Jobke c969d8005e Merge pull request #3949 from nextcloud/downstream-27307
Check if app exists before enabling
2017-03-20 03:21:02 -06:00
Lukas Reschke 81c1522ad0 Update autoloader
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 10:20:13 +01:00
Morris Jobke ea6b3a95ca Merge pull request #3954 from nextcloud/downstream-27392
Added logic and tests to remove everything inside a folder
2017-03-20 03:18:20 -06:00
Lukas Reschke 373bfea427 Merge pull request #3940 from nextcloud/downstream-27048
Add postLogout hook to finish sessions from external session managers…
2017-03-20 10:15:34 +01:00
Lukas Reschke 20c80cba6f Add exception to PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 10:13:57 +01:00
Morris Jobke 50b0a4b181 Improve the test case
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:47:32 -06:00
Morris Jobke 20534e0d1e Merge pull request #3943 from nextcloud/downstream-27318
Output maintenance mode message on STDERR
2017-03-20 02:42:31 -06:00
Vincent Petry 78ee125c34 Fix public link download button
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:39:46 -06:00
Vincent Petry b8a8f43fce Log files:scan exception, add InterruptedException
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:24:28 -06:00
Sergio Bertolin 493b4c2f5c Added logic and tests to remove everything inside a folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:19:04 -06:00
Vincent Petry aacfef463c Add tests for database user backend caching
Add comment, closeCursor in user DB query

Invalidate user in cache after successful creation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:03:03 -06:00
Jörn Friedrich Dreyer 592c04a9db cache loadUser if not exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:01:41 -06:00
Morris Jobke daa7e11095 Merge pull request #3947 from nextcloud/downstream-27323
Disable empty password for user::resetpassword command using CLI
2017-03-20 01:53:28 -06:00
Morris Jobke 85d7e600c1 Merge pull request #3941 from nextcloud/downstream-27254
HTTP 1.1 used when giving 403 and 404 errors while attempting to down…
2017-03-20 01:53:05 -06:00
Morris Jobke e446d22359 Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs
Fix duplicate id "apps-management"
2017-03-20 01:51:20 -06:00
Roeland Jago Douma 81647a58db Merge pull request #3931 from nextcloud/downstream-27295
Don't store empty groupids
2017-03-20 08:48:09 +01:00
Vincent Petry a4ce440392 Ignore NoUserException for shares from ghosts
Add unit tests for FailedStorage init from SharedStorage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:43:24 -06:00
Morris Jobke bd3d57be63 Merge pull request #3930 from nextcloud/downstream-27227
Added functions to add files in local_storage
2017-03-20 01:35:17 -06:00
Morris Jobke 5979f48134 Merge pull request #3934 from nextcloud/downstream-27246
Update the occ:encrypt-all prompt
2017-03-20 01:34:49 -06:00
Morris Jobke 55df840bd9 Merge pull request #3935 from nextcloud/downstream-27293
log where a resource was not found
2017-03-20 01:31:20 -06:00
Christoph Wurst 313173dd45 Merge pull request #3936 from nextcloud/downstream-27253
Add extensionpoint to sharedialogview
2017-03-20 08:31:01 +01:00
Julius Härtl c994e7afcd Fix filter for app icons on firefox
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 08:27:11 +01:00
Julius Härtl d3592e9180 Fix popover position on firefox
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-03-20 08:27:11 +01:00
Felix Heidecke 11f838f9e4 Add ignore_files to config,
test files against ignore_files list on upload

fix typo and indentation

Move blacklist declaration to lib/public/Files/FileInfo.php,

Rename *ignored to *blacklisted

Mocked blacklist_files for testing

Mocked blacklist_files for testing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:17:12 -06:00
Morris Jobke 24a8604426 Merge pull request #3942 from nextcloud/downstream-27264
Clear onpopstate handlers after unit tests
2017-03-20 01:12:11 -06:00
Morris Jobke ea54afb1b6 Merge pull request #3933 from nextcloud/downstream-27258
Add percentage to user's quota info
2017-03-20 01:10:16 -06:00
Morris Jobke ab16383853 Merge pull request #3932 from nextcloud/downstream-27273
trigger event on input autofill
2017-03-20 01:09:39 -06:00
Morris Jobke c9231f20e9 Merge pull request #3938 from nextcloud/downstream-27201
Defining App "cron" for "Invalidating tokens older than" message
2017-03-20 01:09:14 -06:00
Christoph Wurst 8f3cb5b01c Merge pull request #3919 from michaelletzgus/layout-fix_avatar
Fix avatar and caret position
2017-03-20 08:07:12 +01:00
noveens 5481a9b84a checking if app exists in the FileStream now
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:38:29 -06:00
Victor Dubiniuk 17bed297db In the real world id is an initial filename
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:06:32 -06:00
Sujith H a860ee3a45 Disable empty password for user::resetpassword command using CLI
Fixes issue: https://github.com/owncloud/core/issues/25206

Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:01:12 -06:00
Thomas Müller 45567572c8 Adding file, line, class and function to the query logger (#27298)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:39:51 -06:00
Morris Jobke 590e98a659 ownC -> Nextc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:20:24 -06:00
noveens 8948f66d0e maintenance warning printed on STDERR rather than STDOUT
redundant check removed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:19:54 -06:00
Vincent Petry 703f2e6a61 Clear onpopstate handlers after unit tests
Fixes issue when running Karma tests in Firefox.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:15:21 -06:00
noveens 8c27437ac0 HTTP 1.1 used when giving 403 and 404 errors while attempting to download non-existent file
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:14:26 -06:00
Felix Rupp e7dc1f4326 Add postLogout hook to finish sessions from external session managers (#27048)
* Add postLogout hook to finish sessions from external session managers like CAS

* Add postLogout hook to finish sessions from external session managers like CAS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:00:12 -06:00
kdslkdsaldsal fc57d4b96c Fix malformed logging in exception
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:56:35 -06:00
Martin 53b8330e6d Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:51:47 -06:00
Martin 718d1f3f15 fix typo in sftp public key
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:44:09 -06:00
Felix Heidecke f198d77388 Add extensionpoint to sharedialogview
Write method overriding extension

Add a list of unknowns while inputting a search term

Rename OCA.Share extension point

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:40:36 -06:00
Jörn Friedrich Dreyer 6b71dd11b7 log where a resource was not found
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:21:19 -06:00
Sergio Bertolin 190ceba22f Added functions to add files in local_storage
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:05:20 -06:00
David Toledo aa72f0e612 Add percentage to user's quota info
* Add percentage to user's quota info

Fixes https://github.com/owncloud/core/issues/24011

* Do not show percentage if the quota is Unlimited

* translate quota

* correct condition and remove print_unescaped

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:04:55 -06:00
Morris Jobke 0f2ee20885 ownC -> Nextc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:02:21 -06:00
Matthew Setter d4058b73c2 Update the occ:encrypt-all prompt
The message isn't as clear, nor as succinct, as it could be.
Given that, this commit seeks to address both those points.
This commit was prompted by https://github.com/owncloud/documentation/pull/2835.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:02:14 -06:00
Jörn Friedrich Dreyer c96486cfae test setTagGroups with empty groupids
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:01:46 -06:00
Jörn Friedrich Dreyer 4e1aca4e3c don't store empty groupids
gives an exception on oracle and shouldn't be added in the first place

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:01:37 -06:00
Felix Heidecke 13718b23e9 trigger event on input autofill
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:00:58 -06:00
Nextcloud bot 528a903a7b [tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Morris Jobke 540656c716 Merge pull request #3907 from nextcloud/port-more-db-stuff
Use SystemConfig instead of AllConfig for DB stuff
2017-03-19 16:29:50 -06:00
Morris Jobke edd55b0ea9 Use SystemConfig instead of AllConfig for DB stuff
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 15:53:49 -06:00
Morris Jobke c02527e414 Merge pull request #3927 from nextcloud/minor-fixes
Namespace and array syntax fixes
2017-03-19 15:49:38 -06:00
Morris Jobke d99ce3971b Namespace and array syntax fixes
* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 14:52:54 -06:00
Roeland Jago Douma a1f46db793 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-19 21:15:54 +01:00
Roeland Jago Douma ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2
Support Circles
2017-03-19 20:45:55 +01:00
Roeland Jago Douma 0ad4b89d41 Some code cleanup
As suggested by the inspector

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-19 20:30:46 +01:00
Roeland Jago Douma 4cd13e7668 Don't generate max preview twice
If you request a preview of X by Y. And after calculating X and Y are
equal to maxWidth and maxHeight then there is no reason to create a
preview of that size.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-19 20:23:23 +01:00
Michael Letzgus 14f465879c Fix duplicate id "apps-management"
Change CSS from #apps-management to .apps-management

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 16:17:26 +01:00
Michael Letzgus 0df6172036 Fix avatar and caret position
* Avatar image was not vertcially aligned
* The caret was below the avatar
* The surrounding <div> exceeded the title bar

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 15:19:11 +01:00
Roeland Jago Douma 6677963902 Merge pull request #3913 from cwickert/master
DummyGetResponsePlugin: ownCloud -> Nexcloud
2017-03-19 14:08:34 +01:00
Michael Letzgus 0b6ff1706f Fix duplicate id "apps-management"
Make duplicate id "apps-management" a class since IDs must be unique:

https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#the-id-attribute
https://api.jquery.com/id-selector/

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 12:36:29 +01:00
Nextcloud bot 1983606f80 [tx-robot] updated from transifex 2017-03-19 01:08:20 +00:00
Michael Letzgus 98187bf942 Fix value of attribute "autocapitalize"
Change <input> attribute "autocapitalize" from value "off" to "none" regarding to apples dev guide:

https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/Attributes.html#//apple_ref/doc/uid/TP40008058-autocapitalize

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-18 16:06:57 +01:00
Christoph Wickert 07b35b7bae DummyGetResponsePlugin: ownCloud -> Nexcloud
Signed-off-by: Christoph Wickert <cwickert@suse.de>
2017-03-18 12:59:25 +01:00
Lukas Reschke 1febf042d8 Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error
Fail when the test mail could not be sent
2017-03-18 10:47:57 +01:00
Nextcloud bot 9e1e7dac47 [tx-robot] updated from transifex 2017-03-18 01:07:50 +00:00
Lukas Reschke 3adee0f18b Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url
Always suggest the overwrite.cli.url
2017-03-18 00:01:17 +01:00
Maxence Lange 69694012ab shares-circles
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
Morris Jobke 3c66ad64e6 Merge pull request #3904 from nextcloud/revert-3893-downstream-27069
Revert "Add integration test for trashbin"
2017-03-17 12:06:46 -06:00
Morris Jobke 4a9ce18ced Revert "Add integration test for trashbin" 2017-03-17 12:06:16 -06:00
Morris Jobke 96ea85d01d Merge pull request #3887 from nextcloud/downstream-26379
Add CleanupRemoteStorages command
2017-03-17 09:16:19 -06:00
Joas Schilling 26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101
Redirect unlink to rmdir
2017-03-17 13:56:36 +01:00
Joas Schilling 80d2717e5c Fix 5.6 duplicate class import
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:54:58 +01:00
Joas Schilling 0c0ce25b3c Merge pull request #3881 from nextcloud/downstream-26842
Backbone Webdav Adapter MKCOL support
2017-03-17 13:53:04 +01:00
Joas Schilling 4caae91b83 Fail when the test mail could not be sent
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:45:25 +01:00
Joas Schilling 75b81c3e01 Always suggest the overwrite.cli.url
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 13:40:58 +01:00
blizzz a5c8016c8b Merge pull request #3883 from nextcloud/downstream-26968
Ignore exception when deleting keys of deleted user
2017-03-17 11:33:50 +01:00
Joas Schilling c65848effe Merge pull request #3878 from nextcloud/downstream-26303
Fixed failing test which was ignoring a required (not null) column
2017-03-17 11:10:21 +01:00
Joas Schilling 70bd819dd2 Cleanup test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:59:53 +01:00
Joas Schilling 2f16f3ba44 Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:39:08 +01:00
Joas Schilling ebabf81473 Clean up the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:35:22 +01:00
Joas Schilling bd97b7d130 Use DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
Roeland Jago Douma 3f331e02f9 Merge pull request #3893 from nextcloud/downstream-27069
Add integration test for trashbin
2017-03-17 10:10:00 +01:00
Joas Schilling e548d27d3a Merge pull request #3885 from nextcloud/downstream-26529
Skip FailedStorage in background scan
2017-03-17 10:06:58 +01:00
Joas Schilling 5a8129f8ef Merge pull request #3886 from nextcloud/downstream-26995
Chunking NG: Assemble in natural sort order of files
2017-03-17 10:05:25 +01:00
Joas Schilling 199405ddc0 Safer queries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
Joas Schilling 0a1135a7cc Better output
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:25 +01:00
Joas Schilling d504408efd Merge pull request #3894 from nextcloud/downstream-27008
Integration test check download without saving file locally
2017-03-17 09:17:36 +01:00
Joas Schilling e8750f618b Correctly escape the footer description from theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
Roeland Jago Douma 51846c95d9 Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend
Escape like parameters in database user backend
2017-03-17 08:53:10 +01:00
Roeland Jago Douma 57fc7f60d3 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:51:03 +01:00
Roeland Jago Douma 85601259fb Add LegacyHooks
Use a helper class to listen to the eventDispatcher calls from the share
manager to emit the old \OC_Hooks

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:50:56 +01:00
Roeland Jago Douma 5c9baf4ae2 Add unshare event
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-17 08:41:34 +01:00
Roeland Jago Douma 9915aa6d9c Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy
Add base-uri to CSP policy
2017-03-17 08:39:02 +01:00
Roeland Jago Douma 7a3acff782 Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution
Harden JS by disabling jQuery eval
2017-03-17 08:31:12 +01:00
Roeland Jago Douma 88e68b5058 Merge pull request #3875 from nextcloud/use-new-short-urls
Use cleaner social media URLs
2017-03-17 08:30:07 +01:00
Jörn Friedrich Dreyer 5155a5288c Add CleanupRemoteStorages command
cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:52 -06:00
Philipp Schaffrath 2ccf544ad7 Fixed failing test which was ignoring a required (not null) column (#26303)
* Fixed failing test which was ignoring a required (not null) column

* restored test to original, catching DriverException which also catches ConstraintViolationException

* catch ConstraintViolationException again

* removed unnecessary field from this test

* clobfield should be nullable

* clobfield now is nullable

* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does

* this field does not auto increment anymore

* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:07 -06:00
Vincent Petry 6488ed3cff Backbone Webdav Adapter MKCOL support
Usually Backbone collections cannot be created and just simply exists.
But in the Webdav world they need to be creatable.

This enhancement makes it possible to use a Backbone Model to represent
such collections and when creating it, it will use MKCOL instead of PUT.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:08:48 -06:00
Vincent Petry aebb8c3639 Ignore exception when deleting keys of deleted user
Whenever a user was deleted for encryption where the keys are stored in
the home, we can ignore user existence exceptions because it means the
keys are already gone.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:23 -06:00
Vincent Petry 377fdf3860 Skip null groups in group manager (#26871) (#26956)
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:03 -06:00
Vincent Petry cbebfaaf2b Skip FailedStorage in background scan
The background job that scans storages must skip failed storages to
avoid potential exceptions, especially when the failed storage comes
from a shared storage where the source is not accessible.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:48 -06:00
Markus Goetz 075a606514 Chunking NG: Assemble in natural sort order of files
For https://github.com/owncloud/client/pull/5476

Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc.

As per the spec "The name of every chunk should be its chunk number."
https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:31 -06:00
Ilja Neumann 31fa2f73d4 Sharing dialog: Names sorting is case sensitive #25971
Sharing dialog: Names sorting is case sensitive: adding tests #25971

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:05 -06:00
Vincent Petry 3740f9bc26 Integration test check download without saving file locally
Use Guzzle stream mode to download the contents instead of using a
temporary local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:57:16 -06:00
Morris Jobke 5d29e84118 Add drone.yml config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:54:13 -06:00
Vincent Petry 659006c234 Add integration test for trashbin
Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:53:58 -06:00
Vincent Petry 7256940524 Redirect unlink to rmdir (#27101)
Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-16 23:45:03 -06:00
Morris Jobke cc077e67d7 Merge pull request #2824 from nextcloud/ext-storage-expireversions
Properly expire ext storage versions (#26601)
2017-03-16 23:00:55 -06:00
Morris Jobke ead9a10cc5 Merge pull request #3619 from nextcloud/fix-scss-for-apps
Fix SCSS usage in apps
2017-03-16 22:51:31 -06:00
Nextcloud bot 5683365a2c [tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Lukas Reschke 86cba3ee45 Use cleaner social media URLs
We now have nice cleaner URLs since a longer time, let's use them.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 23:45:49 +01:00
Lukas Reschke 39afcbd49f Merge pull request #3679 from nextcloud/socialsharing
Add social sharing
2017-03-16 23:08:47 +01:00
Lukas Reschke 148e7abb51 Harden JS by disabling jQuery eval
Disable execution of eval in jQuery. We do require an allowed eval CSP
configuration at the moment for handlebars et al. But for jQuery there is
not much of a reason to execute JavaScript directly via eval.

This thus mitigates some unexpected XSS vectors. As example try to insert
`$('.fileinfo').html('<a href="asd"><script>alert(1)</script></a>');`
with and without this patch in your browsers JS console when the file list
is opened.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 23:03:02 +01:00
Lukas Reschke c4fe36cc02 Merge pull request #3862 from nextcloud/dont-set-the-status-twice
Don't set the HTTP status twice
2017-03-16 22:05:47 +01:00
Lukas Reschke d134dea508 Don't call function in constructor
The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 21:59:47 +01:00
Lukas Reschke 9e957d0ac9 Adjust integration test
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 20:51:40 +01:00
Morris Jobke cd4ebe2777 Merge pull request #3008 from nextcloud/appmenu-experiment
Show apps in header
2017-03-16 13:03:41 -06:00
Lukas Reschke 5f8f29508f Adjust tests to include base-uri
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 18:12:10 +01:00
Roeland Jago Douma 2a9d1a7147 Merge pull request #3863 from nextcloud/additional-hardening-of-t
Harden t() with DOMPurify
2017-03-16 15:54:04 +01:00
Lukas Reschke adfd1e63f6 Add base-uri to CSP policy
As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 15:16:20 +01:00
Lukas Reschke 6c8d48b0f6 Harden t() with DOMPurify
This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 14:17:42 +01:00
Lukas Reschke 793d7d1bd7 Merge pull request #3860 from nextcloud/fix_master_after_3802
Fix unit tests of master
2017-03-16 14:08:32 +01:00
Joas Schilling 3a53784f80 Don't set the HTTP status twice
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-16 13:35:41 +01:00
Roeland Jago Douma bb2ec51bbb Fix unit tests of master
Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-16 12:46:02 +01:00
Roeland Jago Douma 57c1be8633 Merge pull request #3802 from Ko-/master
Check that set_time_limit is not disabled before calling it
2017-03-16 12:27:26 +01:00
Joas Schilling 7ca2f5f137 Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations
Fix scheduling plugin on legacy caldav endpoint
2017-03-16 12:14:32 +01:00
Julius Haertl b8ef616455 Fix html formating issues
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 780400302c Rebuild menu to keep order of icons correct
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 25e18b840b Reduce device width and hide app name when menu is open
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 1d6fba03f4 Make enabling/disabling apps work with the new menu
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl efc681dcfe Fix positioning of popovermenu
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl f58f8f6f47 Fix popover positioning after window resize
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 267b89f5c7 Cleanup SCSS for app menu and fix mobile view
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 7eae6690ad Make app management icon act like a normal app icon
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl 61dc78e6dc Fix menu issues
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl a630e4629f Generate seperate menu list for header bar
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl e3e4cb3e67 Move active app to the first slot
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl 42feab59d5 Show app icons in the header
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Ko- 786ee72146 Add warning on admin screen when set_time_limit is unavailable 2017-03-16 11:48:28 +01:00
Joas Schilling 652ee8a605 Fix scheduling plugin on legacy caldav endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-16 09:55:15 +01:00
Roeland Jago Douma 4d207680f2 Merge pull request #3624 from marncz/master
Update.js: countdown feedback before redirect
2017-03-16 07:56:51 +01:00
Nextcloud bot 2fafdb39ac [tx-robot] updated from transifex 2017-03-16 01:07:36 +00:00
Lukas Reschke 085891a15d Escape like parameters in database user backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-15 22:46:40 +01:00
Roeland Jago Douma 93c9a06761 Merge pull request #3788 from nextcloud/fed-share-modify
Add api to change the remote of an incoming federated share
2017-03-15 17:32:35 +01:00
Joas Schilling f2d3704e97 Merge pull request #3843 from nextcloud/encryption-fix-mail-share
take share by mail into consideration if we calculate the access list
2017-03-15 15:23:17 +01:00
Roeland Jago Douma 5ed45fc8e6 Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Remove single quotes around search query like in user search
2017-03-15 15:05:15 +01:00
Joas Schilling 0fe45966a0 Remove single quotes around search query like in user search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-15 12:53:44 +01:00
Björn Schießle 5a998da206 Merge pull request #3841 from nextcloud/encyryption-trash-bin
Delete files on encryption error
2017-03-15 09:07:07 +01:00
Marcin Czarnecki 1a3617cdd6 Spacing
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
2017-03-15 06:35:40 +00:00
Morris Jobke 13aae43d89 Fix layout of sharing buttons
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-14 22:52:28 -06:00
Nextcloud bot 4da6b7e796 [tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Marcin Czarnecki df2670ca3c Update: feedback before redirect
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
2017-03-14 20:36:17 +00:00
Roeland Jago Douma 67faf7edc4 Merge pull request #3838 from Xuanwo/basename-fix
[OC/Files/Cache]: Fix wrong usage of basename
2017-03-14 21:00:24 +01:00
Roeland Jago Douma 562c45d925 Merge pull request #3829 from nextcloud/reshares-in-folder
switch reshares to true (display reshares in the folder/filelist)
2017-03-14 20:13:09 +01:00
Maxence Lange 16e1c21fcc fix mock
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-14 19:27:20 +01:00
Maxence Lange 1b9ed81cb6 switch reshares to true
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-14 19:27:07 +01:00
Roeland Jago Douma 25553172f4 Merge pull request #3836 from nextcloud/do-not-double-check-app-update
Do not check for app update twice
2017-03-14 19:26:01 +01:00
Bjoern Schiessle 8f92808caf take share by mail into consideration if we calculate the access list
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 17:40:42 +01:00
Roeland Jago Douma 6565533d3b Merge pull request #3600 from coletivoEITA/master
added method needsPartFile() in Storage
2017-03-14 15:14:59 +01:00
Roeland Jago Douma 3c2312fb09 Merge pull request #3783 from andrius-kulbis/master
Fix deleted objectstore shares
2017-03-14 15:14:39 +01:00
Robin Appelman 8217b16cfe Merge pull request #3824 from nextcloud/dav-search-getlastmodified
fix searching and ordering on getlastmodified
2017-03-14 14:42:57 +01:00
Robin Appelman e392d02d80 safer casting of datetime
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-14 14:12:40 +01:00
Vinicius Cubas Brand 13e50cbcd7 added method needsPartFile() in Storage
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-03-14 10:06:50 -03:00
Bjoern Schiessle 79d362f4a6 delete files right away in case of a encryption exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 12:11:28 +01:00
Bjoern Schiessle 9ce32d9941 always throw a encryption exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 12:11:28 +01:00
Xuanwo 210f4106c4 [OC/Files/Cache]: Fix wrong usage of basename
Fix https://github.com/nextcloud/server/issues/3837

Signed-off-by: Xuanwo <xuanwo@yunify.com>
2017-03-14 13:27:17 +08:00
Nextcloud bot 8d91c84ec4 [tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Morris Jobke 252858ec5e Do not double cherck app update
In base.php the apps are already checked for an update. No need to
repeat this during loading of the app.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-13 18:07:41 -06:00
Morris Jobke 5730c587ec Merge pull request #3827 from nextcloud/issue-3826-remove-double-password-confirmation
Remove the double password confirmation on changing cron
2017-03-13 16:03:11 -06:00
Morris Jobke ef14dc671f fix unit test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-13 15:59:04 -06:00
Roeland Jago Douma bb94b39745 Do not clear CSRF token on logout (fix for #1303)
This is a hacky way to allow the use case of #1303.

What happens is

1. User tries to login
2. PreLoginHook kicks in and figures out that the user need to change
their LDAP password or whatever => redirects user
3. While loading the redirect some logic of ours kicks in and logouts
the user (thus clearing the session).
4. We render the new page but now the session and the page disagree
about the CSRF token

This is kind of hacky but I don't think it introduces new attack
vectors.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-13 22:16:56 +01:00
Lukas Reschke af16416de5 Merge pull request #3828 from nextcloud/no-no-empty-wildcard-search
dont allow empty wildcard search
2017-03-13 19:28:00 +01:00
Lukas Reschke 756bc90eac Merge pull request #3648 from nextcloud/sabre-3.2.2
[3rdparty] Bump sabre/dav to 3.2.2
2017-03-13 19:27:09 +01:00
Robin Appelman 6d0c756ff9 dont allow empty wildcard search
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 16:06:19 +01:00
Joas Schilling beb3f92c4d Remove the double password confirmation on changing cron
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-13 15:52:16 +01:00
Robin Appelman c1cf872f1d Merge pull request #3822 from nextcloud/webui-upoad-no-mtime
dont preserve mtime when uploading trough the web interface
2017-03-13 15:48:59 +01:00
Roeland Jago Douma 308e8bb5ec Merge pull request #3814 from nextcloud/oc-27328-delay-language-initialisation
use closure to properly defer l10n initialization (#27328)
2017-03-13 15:00:26 +01:00
Roeland Jago Douma 938f432113 Merge pull request #3819 from nextcloud/dont-add-user-to-subadmin
Call right function after sudo mode
2017-03-13 14:59:48 +01:00
Robin Appelman 6074dc9979 fix searching and ordering on getlastmodified
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 14:44:52 +01:00
Robin Appelman ad4b5c82da dont preserve mtime when uploading trough the web interface
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-13 13:33:18 +01:00
Lukas Reschke 4395cf4fa7 Merge pull request #3780 from GitHubUser4234/audit_log_agent
Audit log the User-Agent
2017-03-13 12:38:04 +01:00
Lukas Reschke 08cbd82a16 Merge pull request #3803 from Thijsdh/master
Create app password by pressing enter
2017-03-13 12:37:19 +01:00
Lukas Reschke ec7be8bd43 Call right function after sudo mode
This should call the `applyGroupSelect` and not the `applySubadminSelect`.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-13 12:22:44 +01:00
Thijs den Hartog f72373dfda Create app password by pressing enter
Signed-off-by: Thijs den Hartog <Thijs@thijsbeer.nl>
2017-03-13 08:57:01 +01:00
Jörn Friedrich Dreyer fbd2dd49b6 use closure to properly defer l10n initialization (#27328) 2017-03-13 08:52:54 +01:00
Morris Jobke f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search
Allow searching for favorites
2017-03-13 00:55:12 -06:00
Nextcloud bot 0dd0242d2f [tx-robot] updated from transifex 2017-03-13 01:08:19 +00:00
Nextcloud bot 37fcc41004 [tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Ko- 0024b67aaf Check that set_time_limit is not disabled before calling it
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
2017-03-11 17:04:21 +01:00
Lukas Reschke 801b600ec3 Merge pull request #3739 from fti7/master
Serve robots.txt if the RewriteBase is configured
2017-03-11 09:56:38 +01:00
Nextcloud bot 456cd81a20 [tx-robot] updated from transifex 2017-03-11 01:07:48 +00:00
Vincent Petry 5dbb32fb81 Properly expire ext storage versions (#26601)
* Properly expire ext storage versions

System-wide external storages have no real owner so the current user is
used as owner. However when running cron.php there is no current user,
so no expiry can be done.

This fix adds an user argument to the expire() function to tell for
which user to expire files. This information is anyway always available
now through the expire command job.

* Move version expire setupFS into the expire function

* Add comment about not tearing down in version Storage::expire()

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-10 15:58:44 -06:00
Morris Jobke a10476a3c6 Merge pull request #3798 from nextcloud/fix-login
Fix login page, because only guest.css is loaded now
2017-03-10 14:57:05 -06:00
Morris Jobke c1be2d80ad Fix login page, because only guest.css is loaded now
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-10 14:43:14 -06:00
Lukas Reschke f2c0218652 Merge pull request #3755 from nextcloud/scan-tipstricks
Add security scan to tips & tricks section
2017-03-10 21:31:37 +01:00
Roeland Jago Douma e8ac348f47 Make intergration tests work again
The regex was to greedy

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:40:47 +01:00
Roeland Jago Douma 5c2772fb36 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:40:47 +01:00
Roeland Jago Douma 8a8df607c1 [3rdparty] Bump sabre/dav to 3.2.2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:40:41 +01:00
Roeland Jago Douma f86b5c2ebb Properly calculate webdir using the serverroot
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 20:00:34 +01:00
Roeland Jago Douma f7ebf1d47d SCSS files don't exist on the default fs so just add them to the
resource list

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 19:13:44 +01:00
Lukas Reschke 27de443fc4 Merge pull request #3774 from artem-sidorenko/posix-exit-1
Exit with error code if posix ext missing or wrong user
2017-03-10 18:18:59 +01:00
Lukas Reschke 42ee401376 Merge pull request #3778 from nextcloud/verify_jpg_files
Test if a file is a valid jpg file
2017-03-10 18:17:51 +01:00
Lukas Reschke f74911b638 Merge pull request #3787 from nextcloud/ocs-cookie
dont require strict same site cookies for ocs requests
2017-03-10 18:14:38 +01:00
Lukas Reschke 1045bf4a2b Merge pull request #3793 from stefan-squareweave/master
Correct incorrectly typed X-OC-Mtime header
2017-03-10 18:12:55 +01:00
Lukas Reschke 350aa8d8d2 Merge pull request #3794 from nextcloud/fix_2739
MP3 without cover don't get a preview
2017-03-10 18:10:49 +01:00
Robin Appelman 1c59240894 Add api to change the remote of an incoming federated share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-10 14:45:40 +01:00
Morris Jobke 3ca9d53194 Fix SCSS usage in apps
* fix the web root detection of the ResourceLocator for apps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-10 14:44:01 +01:00
Robin Appelman 9a8cef965f add test for skipping cookie checks for ocs
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-10 14:11:00 +01:00
Roger Szabo 35369ecc96 author update
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:24:37 +08:00
Roger Szabo 38d8492f30 improvement of userAgent variable assigment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 17:20:19 +08:00
Roger Szabo 06a8ac6ff6 log user agent globally instead
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-10 16:50:15 +08:00
Roeland Jago Douma 53640bbc47 MP3 without cover don't get a preview
* Fixes #2739

It tries to create an image from an SVG file. Which we don't support. So
this fails and prints an log line. Then we fall back anyways to the 404
and fetch the default icon.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-10 08:52:23 +01:00
Stefan Schneider f6ef024159 Correct incorrectly typed X-OC-Mtime header
Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
2017-03-10 18:16:27 +11:00
Morris Jobke c38f87e799 Merge pull request #3690 from nextcloud/cleanup-legacy-groups-class
Remove legacy class OC_Group and OC_User
2017-03-09 19:09:22 -06:00
Nextcloud bot 8904fb1cf3 [tx-robot] updated from transifex 2017-03-10 01:08:01 +00:00
Morris Jobke a5ba1f7803 Remove legacy class OC_Group and OC_User
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
Lukas Reschke 6fd0e7e939 Merge pull request #3791 from nextcloud/combine_sass
Combine sass
2017-03-09 23:25:17 +01:00
Morris Jobke 0c22a66967 Add more styles to the server.scss
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 15:36:03 -06:00
Roeland Jago Douma db5fc4d3cb Merge pull request #3693 from nextcloud/get-user-folder-of-correct-user
Get the user folder of the correct user for mention notifications
2017-03-09 21:50:05 +01:00
Roeland Jago Douma c16cb1978b Merge pull request #3621 from kuimovvg/master
don't setted status when file is lock
2017-03-09 21:28:32 +01:00
Joas Schilling d4200a08cc Get the user folder of the correct user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-09 21:07:37 +01:00
Roeland Jago Douma f2cf85fad2 [PoC] combine 2 scss files!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:42:34 +01:00
Roeland Jago Douma 57be594f1f Allow using import in sass files
This allows us to combine multiple sass files that we have to always
load together anyway.

Fixes #3389

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 20:29:50 +01:00
Roeland Jago Douma 8626ccab1c dont require strict same site cookies for ocs requests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 16:48:48 +01:00
Morris Jobke 15fa306ae8 Merge pull request #3785 from nextcloud/bump_autoloader
Bump autoloader
2017-03-09 09:27:12 -06:00
Björn Schießle c23c062c89 Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints
Announce trusted server endpoints
2017-03-09 14:39:18 +01:00
Roeland Jago Douma d6ce7ac465 Bump autoloader
Composer was updated so lets update the autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-09 14:21:38 +01:00
Andrius 708b62f223 Fix detecting deleted shares in object store
While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing.
2017-03-09 14:36:20 +02:00
Lukas Reschke 6d10a2aece Merge pull request #3754 from trustelem/user_saml-samesite-exclude
Extend Same Site cookie user_saml exemption rule
2017-03-09 12:53:21 +01:00
Roger Szabo 06bcb220b5 audit log the user-agent
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-03-09 18:31:25 +08:00
Bjoern Schiessle 43bca9f7f6 add and adjust unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 10:07:52 +01:00
Bjoern Schiessle 3584e54a89 announce public endpoints to sync trusted servers
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 10:07:52 +01:00
Bjoern Schiessle e08c3f1b1d add new routes for trusted servers which are more align with the other end-points
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-09 09:54:52 +01:00
Nextcloud bot a4aea572e4 [tx-robot] updated from transifex 2017-03-09 01:07:49 +00:00
Roeland Jago Douma 7dd760d737 Test is a file is a valid jpg file
During preview generation if we provide an invalid JPG file the system
errors out with a PHP Fatal Error. Now we can't catch Fatal Errors (in
5.6). I suspect that exif_imagetype to fall back to the extention.

However a valid jpg file has a size. So we request the size of the image
and just drop out if that returns false.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-08 21:48:30 +01:00
Artem Sidorenko 4541240da2 Exit with error code if posix ext missing or wrong user
similar to the console.php
2017-03-08 20:04:55 +01:00
Robin Appelman e61606a767 Allow searching for favorites
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-08 16:30:55 +01:00
Robin Appelman 2a8e922d67 Merge pull request #3360 from nextcloud/dav-search
Implement webdav SEARCH
2017-03-08 13:09:19 +01:00
Roeland Jago Douma 74ac5dffbd Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-locking
Add new user agent of windows 10 dav backend
2017-03-08 09:27:12 +01:00
Roeland Jago Douma abecae2388 Merge pull request #3725 from nextcloud/issue-fac-55-mimetype-detection-on-public-uploads
Fix mimetype detection on public uploads for the workflow engine
2017-03-08 08:55:33 +01:00
Nextcloud bot 98c56f9adb [tx-robot] updated from transifex 2017-03-08 01:07:47 +00:00
Joas Schilling d228acabf6 Set a status code when setting a body
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-07 17:31:32 +01:00
Joas Schilling a94f9d8d94 Add new user agent of windows 10 dav backend
Thanks Microsoft

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-07 17:24:26 +01:00
Marius Blüm 477316b3a4 Add security scan to tips & tricks section
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-03-07 16:41:03 +01:00
Vincent Vanackere be36513819 Extend Same Site cookie user_saml exemption rule
The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix
(on my config this was occuring using nginx to serve Nextcloud)

Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>
2017-03-07 16:22:57 +01:00
Joas Schilling b029ffca62 Merge pull request #3671 from nextcloud/1070-user-management-no-results
FIX: Add feedback on user settings when no results
2017-03-07 15:51:30 +01:00
Joas Schilling 13c98fe6cd Merge pull request #3747 from nextcloud/design/input-tel-styling
Apply text input styling to 'tel' inputs too
2017-03-07 15:30:32 +01:00
Robin Appelman c225c82fea Merge pull request #3744 from nextcloud/fix-avatar-buttons
Avatar button layout improvements
2017-03-07 14:19:12 +01:00
Christoph Wurst 920f611332 Apply text input styling to 'tel' inputs too
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-03-07 08:51:41 +01:00
Roeland Jago Douma a5a872c9d7 Merge pull request #3743 from nextcloud/MorrisJobke-patch-1
Only run drone on master/stable branches
2017-03-07 08:46:29 +01:00
Morris Jobke 741691835a Avatar button layout improvements
* fixes #3736

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-06 21:17:10 -06:00
Morris Jobke 1df26d438c Run drone only on master/stable branches
* fixes #3729

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-06 20:57:32 -06:00
Nextcloud bot e6dcbb39ac [tx-robot] updated from transifex 2017-03-07 01:07:40 +00:00
Frank Isemann 3c18096812 Serve robots.txt if the RewriteBase is configured 2017-03-06 21:55:29 +01:00
Roeland Jago Douma be45d6aac9 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-06 21:26:04 +01:00
Joas Schilling 76e52eb2f6 Fix admin panel missing some JS files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-06 12:05:31 +01:00
Joas Schilling e8be73f485 Fix mimetype detection on public uploads for the workflow engine
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-06 12:04:54 +01:00
Christoph Wurst b15c11b93b Use button instead of simple links
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-03-06 11:00:58 +01:00
Christoph Wurst 511df0ec99 Move log out and back codes link into 2fa box for better readability
Fixes https://github.com/nextcloud/server/issues/2538

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-03-06 10:48:26 +01:00
Nextcloud bot 15673bc601 [tx-robot] updated from transifex 2017-03-06 01:07:58 +00:00
Nextcloud bot 1d5e94a4f2 [tx-robot] updated from transifex 2017-03-05 01:07:46 +00:00
Nextcloud bot badb45fce4 [tx-robot] updated from transifex 2017-03-04 01:07:41 +00:00
giorgia 3afc16bf77 clean search when new user is added
Signed-off-by: giorgia <g.sambrotta@gmail.com>
2017-03-03 14:47:47 +01:00
giorgia abc48f9e91 add emptycontent div, show/hide emptycontent div, fix #1070
Signed-off-by: giorgia <g.sambrotta@gmail.com>
2017-03-03 14:46:06 +01:00
Roeland Jago Douma 53a484ede6 Merge pull request #3597 from nextcloud/remove-data-from-lookup-server
add posibility to remove all personal data from lookup server
2017-03-03 14:31:21 +01:00
Roeland Jago Douma 8e27b8197d Merge pull request #3684 from nextcloud/run-lang-update-only-once
Execute UpdateLanguageCode only once
2017-03-03 13:51:32 +01:00
Roeland Jago Douma f8c459f1a4 Merge pull request #3607 from nextcloud/api-to-resend-welcome-message
OCS API endpoint to resend welcome message
2017-03-03 13:50:30 +01:00
Roeland Jago Douma e54b9d3fcd Merge pull request #3678 from nextcloud/issue-3677-caldav-sharing-permission-problem
CalDAV sharing permissions should not depend on the order
2017-03-03 13:48:33 +01:00
Roeland Jago Douma 835b49d941 Make sure copy tooltip remains when we have no social providers
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 13:36:20 +01:00
Roeland Jago Douma fd71b8bde8 Move social buttons to menu
* If there are social sharing buttons move them and the copy action to a
menu
* If there are no social sharing buttons just leave the copy action
where it is directly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 13:27:06 +01:00
Joas Schilling 0beb78517f Fix DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-03 12:20:02 +01:00
Joas Schilling 9f82bb9b4f Merge pull request #3689 from nextcloud/cleanup-legacy-classes
Cleanup not used legacy classes
2017-03-03 12:04:27 +01:00
Joas Schilling 342ee51dad Make the test useful
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-03 12:01:38 +01:00
Joas Schilling dd646fdf58 Merge pull request #3687 from nextcloud/proper-transfer-ownership-date
Use a proper date format for transfer ownership
2017-03-03 11:56:59 +01:00
Joas Schilling 29e9b1f3d5 Merge pull request #3686 from nextcloud/downstream-27282
filelist only refreshed if directory changes
2017-03-03 11:55:53 +01:00
Roeland Jago Douma a85327fe87 Add social sharing
* Add socialshare manager
* Add social share field under link share

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 10:19:41 +01:00
Roeland Jago Douma e648b8cb6d Merge pull request #3682 from whitekiba/master
Remove deprecated OC_User::isLoggedIn
2017-03-03 09:23:42 +01:00
Morris Jobke 6174a514b7 Get rid of static OCS::notFound()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-03 00:41:21 -06:00
Morris Jobke d85a351e77 Cleanup not used legacy classes
* Person was removed via #2170
* other lcasses/interfaces are not used at all

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-03 00:31:33 -06:00
Morris Jobke 503a9160ae Use a proper date format for transfer ownership
* on Windows : is not allowed as filename and doesn't get synced then
* uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 22:36:18 -06:00
Morris Jobke 8e9b119c5f Merge pull request #3681 from nextcloud/dav-nonexisting-owner
handle non existing owners when handling dav requests
2017-03-02 21:55:51 -06:00
Morris Jobke 0b12eb0640 Execute UpdateLanguageCode only once
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 21:53:36 -06:00
noveens 93f9db4d59 filelist only refreshed if directory changes
check introduced at another method

comment added to explain one check

comment added to explain one check

unit tests added

small fixes in unit tests

missing semicolon added

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 21:43:44 -06:00
Nextcloud bot b55ce43ba5 [tx-robot] updated from transifex 2017-03-03 01:07:45 +00:00
Sebastian Wessalowski e399097e3a Remove deprecated OC_User::isLoggedIn
Signed-off-by: Sebastian Wessalowski <sebastian@wessalowski.org>
2017-03-02 22:59:39 +01:00
Nextcloud bot 53195b156c [tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Robin Appelman 8f289286a7 handle non existing owners when handling dav requests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-02 15:26:00 +01:00
Joas Schilling 0ef15f93c4 Merge pull request #1377 from nextcloud/improve-finish-l10n
Change language code from fi_FI to fi
2017-03-02 12:44:10 +01:00
Joas Schilling 2eb27c636d Make sure shares use read-write when available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 12:28:57 +01:00
Joas Schilling 6dbdca0721 Don't waste energy unless necessary
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 12:28:56 +01:00
Joas Schilling d8b769bd85 Add a unit test for the broken case
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 12:28:56 +01:00
Joas Schilling 2da490bf25 Unit test cleanup
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 12:28:56 +01:00
Joas Schilling 5d4cc4a17b Merge pull request #3676 from individual-it/trash_problem
fix for #3201
2017-03-02 09:47:52 +01:00
Joas Schilling a7da76ea8a Merge pull request #3674 from nextcloud/transifex-for-theming
Transifex config for theming app
2017-03-02 09:33:57 +01:00
Joas Schilling ba472f7ce0 Fix table name and add a test for more than 1 entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-02 09:11:47 +01:00
Artur Neumann b0980ee2b8 fix for #3201 2017-03-02 13:16:28 +05:45
Artur Neumann 4f071f61c6 Revert "fix mouse pointer"
This reverts commit a4e2dc3033.
2017-03-02 12:55:16 +05:45
Morris Jobke 1bcd396679 Change language code for languages with only one translation
* then the language is not that specific and get also matched for fi
* fallback from fi_FI to fi is supported - the other way around not
* contains repair script
* contains tests for repair script
* fixes #869

Order results to make postgres happy

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-01 22:35:28 -06:00
Morris Jobke 9b95ecb6a1 Transifex config for theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-01 22:05:25 -06:00
Morris Jobke 4a4067a378 Merge pull request #3666 from nextcloud/fix-return-type
Fix return type of share provider
2017-03-01 19:38:40 -06:00
Nextcloud bot a64c8637d9 [tx-robot] updated from transifex 2017-03-02 01:07:31 +00:00
Morris Jobke 766fa87cf8 Merge pull request #3370 from Flole998/Flole998-patch-1
Fix for Win Clients sometimes not connecting
2017-03-01 13:07:06 -06:00
Morris Jobke a3e638709b update 3rdparty submodule
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-01 12:33:25 -06:00
Robin Appelman d8c89688f4 autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:40 +01:00
Robin Appelman 709f64d396 add tests for filesearchbackend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:40 +01:00
Robin Appelman e6a896f2f0 add tests for searchQuery
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:40 +01:00
Robin Appelman df2063ee7b Implement webdav SEARCH
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-01 14:06:39 +01:00
Joas Schilling 7f54013fdb Fix return type of share provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-01 13:45:04 +01:00
Nextcloud bot aecec74a04 [tx-robot] updated from transifex 2017-03-01 01:07:42 +00:00
Morris Jobke 552921d429 Fix injection of defaults
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 16:30:34 -06:00
Morris Jobke 50f3efad6f OCS API endpoint to resend welcome message
* send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger
  the welcome message to be send
* fixes #3367

example curl statement:

  curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H  "OCS-APIRequest: true" -u admin:password -X POST

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 16:30:33 -06:00
Roeland Jago Douma 5fc924f6c9 Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uri
Fix saving backup codes by using a correct data uri
2017-02-28 22:03:38 +01:00
Roeland Jago Douma 383e30e57e Merge pull request #3650 from nextcloud/bugfix/tokenprovider-asserted-method-name
DefaultTokenProviderTest mocked/asserted the wrong method
2017-02-28 20:24:11 +01:00
Morris Jobke aa4d9a0e43 Merge pull request #3651 from nextcloud/refactor/provisioning-usercontroller-test
Refactor provision api app's UserControllerTest
2017-02-28 13:12:41 -06:00
Robin Appelman 706131b394 add icewind/searchdav
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-28 14:24:18 +01:00
Lukas Reschke b5a6f03362 Merge pull request #3643 from nextcloud/replace-deprecated-tipsy
Replace deprecated $.tipsy(...) by $.tooltip(...)
2017-02-28 10:49:14 +01:00
Christoph Wurst 8e370bbf28 Refactor provision api app's UserControllerTest
* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-28 10:40:49 +01:00
Christoph Wurst e782f90d98 DefaultTokenProviderTest mocked/asserted the wrong method
It's 'getRemember' instead of 'getRememberMe', hence some warnings
were generated by phpunit.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-28 10:26:19 +01:00
Christoph Wurst 2f980ca76c Fix saving backup codes by using a correct data uri
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-28 10:20:30 +01:00
Morris Jobke b72b02778d Merge pull request #2997 from nextcloud/fix_2957
Allow groups with / in sabre
2017-02-28 00:34:08 -06:00
Morris Jobke 413d671d9e Merge pull request #3635 from individual-it/fix_quota_validation
better quota validation
2017-02-28 00:27:51 -06:00
Morris Jobke 86149508d0 fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 00:14:34 -06:00
Artur Neumann 9790fe7f5d make values with white spaces possible
a user might enter values with white spaces, and that should be possible
and valid

Signed-off-by: Artur Neumann <info@individual-it.net>
2017-02-28 08:25:34 +05:45
Artur Neumann f1fccaca06 better quota validation
this fixes #3634

1. fixed computerFileSize to be more picky about incorrect values
2. more tests for computerFileSize
3. use computerFileSize to validate user quota

Signed-off-by: Artur Neumann <info@individual-it.net>
2017-02-28 07:38:11 +05:45
Nextcloud bot 7fc3129f0c [tx-robot] updated from transifex 2017-02-28 01:07:54 +00:00
Christoph Wurst 3e7e49884e Replace deprecated $.tipsy(...) by $.tooltip(...)
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-27 22:25:05 +01:00
Roeland Jago Douma c75b5a5614 Properly handle groups with a /
If a group contains a slash the principal URI becomes
principals/groups/foo/bar. Now the URI is plit on '/' so this creates
issues ;)

Fixes #2957

* Add tests for groups with /

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-02-27 17:07:18 +01:00
Roeland Jago Douma 0195740147 Merge pull request #3618 from nextcloud/fix-install-page-warning
Remove not needed rule for .warning
2017-02-27 15:11:56 +01:00
Nextcloud bot f3a7b7eaa3 [tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Morris Jobke 9b36edd373 Merge pull request #3623 from nextcloud/daita-patch-1
Fix condition
2017-02-26 17:03:36 -06:00
Maxence Lange cfb40941c4 Fix condition
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-26 11:45:17 -06:00
Nextcloud bot 0beef8f4e1 [tx-robot] updated from transifex 2017-02-26 01:24:13 +00:00
Marcin Czarnecki 9f1fbc2c98 Update: feedback before redirect
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
2017-02-25 19:16:22 +00:00
vkuimov db6eb85ad2 don't setted status when file is lock 2017-02-25 16:12:53 +00:00
Nextcloud bot 556b958af2 [tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Morris Jobke 8a7b8f966e Merge pull request #3489 from nextcloud/give-hint-about-opcache
Show info in admin settings about PHP opcache if disabled
2017-02-24 13:10:47 -06:00
Morris Jobke fb15553378 Remove not needed rule for .warning
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-24 11:04:48 -06:00
Lukas Reschke dd6d2893a6 Merge pull request #3588 from GreenArchon/issue_#3461
Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
2017-02-24 17:25:21 +01:00
Roeland Jago Douma a113ca68eb Merge pull request #3598 from nextcloud/issue-3583-shared-addressbooks-fail-on-legacy-endpoint
Use the correct principal for shared addressbooks
2017-02-24 16:36:39 +01:00
Roeland Jago Douma fa7e30fb20 Merge pull request #3612 from KB7777/patch-1
Update Setup.php
2017-02-24 16:33:42 +01:00
KB7777 7347849bf9 Update Setup.php 2017-02-24 12:13:26 +01:00
Joas Schilling d0980bec73 Merge pull request #3287 from nextcloud/readd_appstoreenabled_switch
Add back appstoreenabled config switch
2017-02-24 10:07:25 +01:00
Joas Schilling 5e9a2c29b3 Merge pull request #3603 from nextcloud/update-icon
Bring back checkmark icon on successful update
2017-02-24 09:58:05 +01:00
Joas Schilling b26568133f Merge pull request #3605 from nextcloud/single-user
Clean up single user mode
2017-02-24 08:52:26 +01:00
Morris Jobke f3bfacc976 Fix unit tests and improve appstore logic
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-24 08:34:14 +01:00
Steffen Lindner cfb6223de7 Add back appstoreenabled config switch
Signed-off-by: Steffen Lindner <mail@steffen-lindner.de>
2017-02-24 08:31:56 +01:00
Morris Jobke 1d0710ce3f Bring back checkmark icon on successful update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-24 00:06:21 -06:00
Nextcloud bot 97b6c1496e [tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Morris Jobke ee52313e76 Merge pull request #3589 from nextcloud/remove-unneeded-repair-step
Remove unneeded repair steps
2017-02-23 15:57:21 -06:00
Morris Jobke 254c98bb9e Merge pull request #3576 from robert-scheck/timezone
According to issue #3553, the default logtimezone is always UTC
2017-02-23 15:36:50 -06:00
Lukas Reschke bc2f23a0fc Merge pull request #2602 from nextcloud/resize-the-controls-after-the-sidebar-slided-in
Increase debounce time to make sure controls are resized after the sidebar disappeared
2017-02-23 15:46:06 +01:00
Joas Schilling 6bd4e1f65b Use the correct principal for shared addressbooks
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-23 14:16:00 +01:00
Bjoern Schiessle dda15b74cb add posibility to remove all personal data from lookup server
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-23 12:27:24 +01:00
Lukas Reschke 387a77e7e0 Merge pull request #3590 from individual-it/correct_text_when_disabling_app
show correct text when disabling App
2017-02-23 10:32:19 +01:00
Joas Schilling 8bfa50bd12 Merge pull request #3575 from nextcloud/better-thumbnail-quality
Use 90% JPEG quality for thumbnails and previews by default
2017-02-23 09:54:32 +01:00
Artur Neumann b138d4fdee show correct text when disabling App
during the process of disabling an App the button would show "Enabling
app …"
This is corrected by this patch

Signed-off-by: Artur Neumann <info@individual-it.net>
2017-02-23 11:47:38 +05:45
Morris Jobke cee8853658 Show info in admin settings about PHP opcache if disabled
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 23:45:48 -06:00
Morris Jobke 9533f4e5ed Clean up single user mode
Single user mode basically disables WebDAV, OCS and cron execution. Since
we heavily rely on WebDAV and OCS also in the web UI it's basically useless.
An admin only sees a broken interface and can't even change any settings nor
sees any files. Also sharing is not possible.

As this is at least the case since Nextcloud 9 and we haven't received any
reports for this it seems that this feature is not used at all so I removed it.

The encryption commands now rely on the well tested maintenance mode.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 23:02:31 -06:00
Morris Jobke 2bbf3b18d9 cleanup old and not needed repair steps to speed up the update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 22:35:18 -06:00
Morris Jobke c2d3e12e23 Remove unneeded UpdateCertificateStore.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 21:26:59 -06:00
Nextcloud bot 54317e80c0 [tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Frédéric Fortier 55a37c1db9 Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
2017-02-22 20:03:32 -05:00
Robert Scheck 568ff4ba38 According to issue #3553, the default logtimezone is always UTC
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2017-02-23 00:15:45 +01:00
Morris Jobke 833ceb0dd0 Merge pull request #3580 from nextcloud/password-reset-wording
detail wording: password reset instead of recovery
2017-02-22 16:32:36 -06:00
Björn Schießle 621f920d68 Merge pull request #3567 from nextcloud/autocomplete-settings
some sharing settings
2017-02-22 16:30:21 +01:00
Bjoern Schiessle 11e5a3dcf4 fix typo
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-22 16:28:42 +01:00
Jan-Christoph Borchardt dca4346c45 detail wording: password reset instead of recovery
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-02-22 15:17:45 +01:00
Bjoern Schiessle fe46c6f743 use (int) instead of intval for performance reasons
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-22 15:14:36 +01:00
Joas Schilling 079888f918 Fix code quality a bit
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 14:53:15 +01:00
Joas Schilling 1e281bc616 Use 90% JPEG quality for thumbnails and previews by default
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 14:53:15 +01:00
Lukas Reschke a2e16fd5ba Merge pull request #3418 from nextcloud/add-groups-to-userinfo
add groups to user info output
2017-02-22 12:26:47 +01:00
Lukas Reschke 9e21a555cb Merge pull request #3573 from nextcloud/correctly-catch-the-exception-from-pathinfo
Catch exception from path info
2017-02-22 12:15:50 +01:00
Joas Schilling 899af7831e Catch exception from path info
We don't really care when the path info can not be gathered correctly.
we will simply not use SCSS then but the CSS fallback.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-22 11:08:58 +01:00
John Molakvoæ 182bfd9f23 Merge pull request #3570 from nextcloud/fix-share-loading
Fix position of share autocomplete loading icon
2017-02-22 10:20:56 +01:00
Lukas Reschke db80fbd1cb Merge pull request #3413 from nextcloud/theming-appdata
Move theming images to AppData
2017-02-22 10:16:33 +01:00
Lukas Reschke 54a5fe2aaf Merge pull request #3566 from nextcloud/setUpScenario1
Use clearer name setUpScenario
2017-02-22 10:10:57 +01:00
Nextcloud bot a08dfd9951 [tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Morris Jobke 577adf0794 Merge pull request #3568 from nextcloud/fix-pdfviewer-margin
fix bottom margin of shared pdfviewer links
2017-02-21 17:44:07 -06:00
Morris Jobke f0b588621c Fix position of share autocomplete loading icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:39:32 -06:00
Morris Jobke 02ea84f50f properly include class
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:24:40 -06:00
Morris Jobke 8e3d0fecd2 Use intval() for validation of config options
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:22:06 -06:00
Morris Jobke 3284efd199 Improve the UX for sharing settings
* shows a info when list is potentially truncated
* shows a warning when characters length is not enough

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:07:07 -06:00
John Molakvoæ 2836b54236 Merge pull request #3557 from marncz/master
Fixed path in other folders search
2017-02-21 20:20:17 +01:00
Jan-Christoph Borchardt afed96ea79 fix bottom margin of shared pdfviewer links
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-02-21 20:09:20 +01:00
Bjoern Schiessle 869ea38ffe allow to configure a min-length of search strings for auto-compeltion and a max number for of results returned
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-21 18:31:20 +01:00
Phil Davis cbb735544a Use clearer name setUpScenario
Signed-off-by: Phil Davis <phil.davis@inf.org>
2017-02-21 21:43:10 +05:45
Frédéric Fortier cc511ac7b8 Typecast filecache 'storage' as int to return it as documented, fixes #3461
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
2017-02-20 22:23:27 -05:00
Nextcloud bot d754227b4c [tx-robot] updated from transifex 2017-02-21 01:08:46 +00:00
Marcin 20ad3f33d0 Fixed path in other folders search
Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>
2017-02-21 00:38:46 +00:00
Lukas Reschke a4266f59ae Merge pull request #3521 from nextcloud/ldap-fix-uuid-attr-detection
Fix Borken UUID Attribute Detection
2017-02-20 21:34:55 +01:00
Lukas Reschke c20409373b Merge pull request #3542 from nextcloud/add-crl-for-old-rainloop-certificate
Add CRL entry for old rainloop certificate
2017-02-20 21:24:00 +01:00
Lukas Reschke fba2a9ffdc Merge pull request #3550 from nextcloud/fix-misleading-wording
Fix misleading wording: searching is affected, not user access.
2017-02-20 21:16:31 +01:00
Lukas Reschke 463d39c307 Merge pull request #3551 from nextcloud/fix-search-result-thumbnails
Fix thumbnail size of search results
2017-02-20 21:00:42 +01:00
Morris Jobke 89233af487 Fix thumbnail size of search results
* fixes #3466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-20 12:48:40 -06:00
Arthur Schiwon 866b218f37 Fix misleading wording: searching is affected, not user access.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-20 19:26:16 +01:00
Morris Jobke cab27eabc6 Merge pull request #3544 from nextcloud/iservercontainer-container
IServerContainer is effectively an IContainer
2017-02-20 11:02:14 -06:00
Julius Haertl e5ddb40a3e Add test for creating AppData folder
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-20 15:48:22 +01:00
Lukas Reschke d3f774d035 Merge pull request #3505 from robert-scheck/autoindex
Only request "IndexIgnore" if mod_autoindex is loaded
2017-02-20 14:25:09 +01:00
Robert Scheck 25a2cb8c6e Only request "IndexIgnore" if mod_autoindex is loaded
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2017-02-20 13:09:15 +01:00
Lukas Reschke 24fc7dc30f Merge pull request #3257 from nextcloud/updated-guest-checkboxes
Fix checkboxes on login
2017-02-20 13:06:47 +01:00
Christoph Wurst cb322d84e4 IServerContainer is effectively an IContainer
This relation was not explicitly declared in the class description.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-20 11:44:40 +01:00
Lukas Reschke 7a174c1b4a Add CRL entry for old rainloop certificate
Certificate has been lost as per https://github.com/nextcloud/app-certificate-requests/pull/47 - let's revoke the old one thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-20 11:10:59 +01:00
Nextcloud bot 0453a7dabd [tx-robot] updated from transifex 2017-02-20 01:07:37 +00:00
Nextcloud bot 51f06bb1f8 [tx-robot] updated from transifex 2017-02-19 01:07:37 +00:00
Nextcloud bot 6af8ba15ae [tx-robot] updated from transifex 2017-02-18 01:08:23 +00:00
Arthur Schiwon ce97ab92c6 add tests to DB group
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:12:30 +01:00
Arthur Schiwon 42ddb12fd9 Background jobs can take 4k of characters only. We find a good batch size.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:06:25 +01:00
Arthur Schiwon 497ee3e3e6 Add repair steps
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 18:45:33 +01:00
Arthur Schiwon 45615cc940 add integration test for uuid attr detection
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 12:05:51 +01:00
Nextcloud bot c1bb89d65b [tx-robot] updated from transifex 2017-02-17 01:07:58 +00:00
Arthur Schiwon f87812fdd6 Fix determining the UUID attribute, default of the override is null
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:06:10 +01:00
Arthur Schiwon b740a21399 Fix integration test by not relying on Fake instances
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:04:42 +01:00
Morris Jobke 2dfc8d1f46 Merge pull request #3515 from nextcloud/revert-3214-cache-storage-info
Revert "cache the storage info for 5 min"
2017-02-16 12:02:06 -06:00
Morris Jobke 2b898bd82c Revert "cache the storage info for 5 min" 2017-02-16 11:58:45 -06:00
Lukas Reschke cf582a6d14 Merge pull request #3439 from nextcloud/oc-26963
Make sure invalid images don't flood the log file
2017-02-16 16:34:18 +01:00
Julius Haertl 3f0134622d Use createMock
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
Julius Haertl b2cbe3530d Use ::class in tests and correct import
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
Julius Haertl 88a0ef7d4a Add tests for theming migration step
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Julius Haertl 345d1f1291 Adapt ThemingController tests
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Julius Haertl 60d77ceccb Add repair step to move existing theming images
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Julius Haertl 6a9d5d60dc Move theming images to AppData
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Lukas Reschke cdc48d301e Merge pull request #3507 from nextcloud/if-backend-implements-get-display-name-dont-force-one
Don't force displayname if backend already provides one
2017-02-16 14:20:06 +01:00
Lukas Reschke 92c74d2f9a Don't force displayname if backend already provides one
`\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes.

The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-16 13:55:48 +01:00
John Molakvoæ f25c89461c Merge pull request #2287 from nextcloud/registrationEmail
Send password/activation link to new user
2017-02-16 07:16:45 +01:00
Nextcloud bot 47c6a8019f [tx-robot] updated from transifex 2017-02-16 01:07:44 +00:00
Morris Jobke 3382950297 add unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 18:07:21 -06:00
Roeland Jago Douma abb496a439 Add l10n
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-02-15 17:45:38 -06:00
Morris Jobke 2e88bec14b Fix setup issue and refine error messages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 17:45:38 -06:00
tobiasKaminsky c3fe8f6cf2 use random password if "password link" is enabled
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 17:45:35 -06:00
tobiasKaminsky be139c85a8 empty password only allowed if password link is sent
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 17:45:29 -06:00
tobiasKaminsky a37f29964f add setting for "send password link"
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 17:45:20 -06:00
tobiasKaminsky 3c7755fc66 send email to new user with password forgotten link to create own password
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-15 17:45:12 -06:00
blizzz 19fc68cbdc Merge pull request #2606 from temparus/master
Add preLoginValidation hook
2017-02-15 21:47:47 +01:00
Roeland Jago Douma 79a16bc2d3 Merge pull request #3495 from nextcloud/dav-protected
Make it easier to subclass DAV storage
2017-02-15 20:49:06 +01:00
Roeland Jago Douma b1c4b445da Merge pull request #3449 from nextcloud/notify-subfolder-self-test
Make the notify self test for subfolders more reliable
2017-02-15 20:33:05 +01:00
Roeland Jago Douma 17c07e5caf Merge pull request #3447 from nextcloud/getmetadata-permissions-mask
also apply permissions mask in getMetaData
2017-02-15 20:22:08 +01:00
Roeland Jago Douma f60d95840e Merge pull request #3262 from nextcloud/jail-scanner-storage-id
Make sure we use the correct storage id and parent id when scanning a jailed storage
2017-02-15 20:21:03 +01:00
Roeland Jago Douma 2d8b7b875b Merge pull request #2704 from nextcloud/2fa-fix-backup-codes-print
print the backup codes tab and not the current one
2017-02-15 20:18:48 +01:00
John Molakvoæ (skjnldsv) 4dec5a7646 Fix checkboxes on login
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-15 17:16:34 +01:00
Morris Jobke 52ef851da3 Merge pull request #3421 from espro/freeipa-uuid-fix
Update uuidAttributes list to include FreeIPA's ipauniqueid
2017-02-15 08:07:58 -06:00
Robin Appelman 25dc140511 Make it easier to subclass DAV storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-15 14:00:00 +01:00
blizzz cd49eb36e8 Merge pull request #3485 from nextcloud/Popovermenu-files-css-fix
Popovermenu files css fix
2017-02-15 12:33:08 +01:00
blizzz 44186cab85 Merge pull request #3473 from nextcloud/fix-addressbook-deletion
Address book data lost when any user receiving a share is deleted
2017-02-15 11:34:03 +01:00
blizzz 813802238b Merge pull request #3487 from nextcloud/fix-files-header-name
Fix app name of files app
2017-02-15 11:30:30 +01:00
Nextcloud bot 41276f720b [tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Morris Jobke 04c9a869ca Merge pull request #3480 from nextcloud/screensharing-icon
add screensharing icon
2017-02-14 17:45:11 -06:00
Morris Jobke b5b541d084 Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection
Fix DI of the cloud id manager into apps
2017-02-14 17:42:53 -06:00
Morris Jobke b954c2f186 Fix app name of files app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-14 17:36:23 -06:00
John Molakvoæ (skjnldsv) 31d56155d4 Css fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-15 00:09:32 +01:00
Jan-Christoph Borchardt d47f423e8b add screensharing icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-02-14 20:58:49 +01:00
Jan-Christoph Borchardt 9f74858537 Merge pull request #3341 from nextcloud/transparent-white-checkbox
Transparent white checkbox
2017-02-14 19:32:39 +01:00
John Molakvoæ (skjnldsv) 7e9411b929 this is public
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 16:56:56 +01:00
Morris Jobke c5dffc465c Merge pull request #3472 from nextcloud/enable-avatars-always
Always enable avatars
2017-02-14 09:22:02 -06:00
Lukas Reschke 257e28f46d Merge pull request #3465 from nextcloud/storage-log-locks
Add option to enable locking debug logging
2017-02-14 15:08:21 +01:00
Joas Schilling 0be2921966 Fix DI of the cloud id manager into apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-14 12:47:46 +01:00
John Molakvoæ (skjnldsv) 57122e8d89 Test fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 10:47:07 +01:00
John Molakvoæ (skjnldsv) 36b8558ff6 tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 09:33:04 +01:00
John Molakvoæ (skjnldsv) b8fcd3ce27 getUsersOwnAddressBooks
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 09:21:33 +01:00
Nextcloud bot 7113af3f91 [tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Morris Jobke 69c9ca4522 Merge pull request #3444 from nextcloud/recognize-bat-and-cmd
Recognize .bat and .cmd files
2017-02-13 18:09:12 -06:00
Morris Jobke 7f73ee0764 Add missing PHPDoc and properly throw exception
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 18:03:35 -06:00
Morris Jobke 200a28255e Always enable avatars
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
Lukas Reschke 5b9f96a434 Merge pull request #3324 from nextcloud/fix-2431
LDAP's checkPassword should only catch when a user was not found, fixes #2431
2017-02-13 23:21:08 +01:00
Lukas Reschke 181b298d7c Merge pull request #3448 from kuimovvg/master
bug when connect to yandex webdav server
2017-02-13 23:00:44 +01:00
Lukas Reschke a422a59f99 Add storage to log item as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-13 22:49:44 +01:00
Morris Jobke fa684c0ef0 Add comment about log.condition
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 15:32:57 -06:00
Robin Appelman 8c1ed7507a Add option to enable locking debug logging
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-13 15:03:46 +01:00
Nextcloud bot 88047aaea7 [tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot f9d94edb0f [tx-robot] updated from transifex 2017-02-12 01:07:26 +00:00
Nextcloud bot 01b3da612b [tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Morris Jobke dfaaebd765 Merge pull request #3417 from nextcloud/push-notification
Push notification
2017-02-10 16:00:47 -06:00
Robin Appelman f27113a6ee also apply permissions mask in getMetaData
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 22:36:12 +01:00
Morris Jobke abf0606054 Merge pull request #3430 from nextcloud/fix-ios-client-detection
Fix detection of the new iOS app
2017-02-10 14:24:45 -06:00
blizzz b8f08f1585 Merge pull request #3443 from nextcloud/add-integration-tests-for-dav
Add integration tests for legacy DAV endpoints
2017-02-10 19:00:17 +01:00
Robin Appelman 5acebb911b fix self test for non leading slash
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 18:04:59 +01:00
Robin Appelman d9a6353bc1 Make the notify self test for subfolders more reliable
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 17:38:29 +01:00
vkuimov 71a022640b bug when connect to yandex webdav server
server think that request like 
<?xml version="1.0" encoding="UTF-8"?> 
<d:propfind xmlns:d="DAV:">
<d:prop/> 
</d:propfind>

is 400: Bad Request
2017-02-10 16:31:49 +00:00
Victor Dubiniuk 2585f195da Check if color exists in palette before using it
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:27:51 +01:00
Brent Bloxam f7b8a31d63 Update uuidAttributes list to include FreeIPA's ipauniqueid
Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
2017-02-10 10:23:13 -05:00
Lukas Reschke 929648ce2c Add integration tests for legacy DAV endpoints
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:18:04 +01:00
blizzz 354bbd50a7 Merge pull request #3371 from m3ntalsp00n/reload_countdown
showUpdate funciton allows updated messages
2017-02-10 14:47:33 +01:00
Joas Schilling ade91c8fe2 Recognize .bat and .cmd files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 14:25:25 +01:00
Joas Schilling 69046c6662 Make sure invalid images don't flood the log file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 13:44:16 +01:00
Björn Schießle b4ade76665 Merge pull request #3424 from nextcloud/fix-upgrade-path
Fix return value of getAllowedPreviousVersions()
2017-02-10 11:48:30 +01:00
Björn Schießle 4ea33fb453 Merge pull request #3425 from nextcloud/set-vendor-during-install
Set vendor during install
2017-02-10 11:45:50 +01:00
Björn Schießle a88fc0c283 Merge pull request #3181 from nextcloud/fix-favorite-activity-mail
Make sure the file information is available when sending the email
2017-02-10 11:35:45 +01:00
Joas Schilling dd5cded898 Merge pull request #3429 from nextcloud/oparoz-issuetemplate
Fix issue template log formatting
2017-02-10 10:30:01 +01:00
Joas Schilling 33fb86f68b Fix detection of the new iOS app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:10:21 +01:00
Olivier Paroz 08ced5bc7c Fix log formatting 2017-02-10 09:08:05 +01:00
Morris Jobke d548329543 Set vendor during install
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:37:00 -06:00
Morris Jobke b8c749b903 Fix return value of getAllowedPreviousVersions()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:24:24 -06:00
Morris Jobke 397feb9e8d Merge pull request #3422 from nextcloud/transifex
add transifex config for sharebymail
2017-02-09 20:14:10 -06:00
Morris Jobke 8a74ab88d8 add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:53:32 -06:00
Nextcloud bot c2e61362cc [tx-robot] updated from transifex 2017-02-10 01:07:02 +00:00
Bjoern Schiessle 2ca8339d01 add groups to user info output
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-09 16:23:10 +01:00
Joas Schilling efdc51c155 Make sure to use the right appdata directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:03:00 +01:00
Joas Schilling 7c47f822a1 Save the used token id in the session so it can be used later on
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:02:59 +01:00
Robin Appelman bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
Robin Appelman 0d8d658b7e fix copyright headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:32:36 +01:00
Robin Appelman f6cd5200a2 clean cloud ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:31:06 +01:00
Lukas Reschke 4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165
Prevent migration from ownCloud 11 to Nextcloud 12
2017-02-09 13:29:08 +01:00
Joas Schilling ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space
return unknown free space from nullstorage
2017-02-09 13:17:54 +01:00
Lukas Reschke 51f0555b5c Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
Don't log the password on confirmPassword when LDAP throws an exception
2017-02-09 12:19:53 +01:00
Björn Schießle f33760c7f1 Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table
Update the email in the accounts table as well
2017-02-09 12:10:45 +01:00
Joas Schilling ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
oc_token should be nc_token
2017-02-09 10:07:59 +01:00
Morris Jobke 5e408aeb6c Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-08 20:39:34 -06:00
Nextcloud bot 3c4b539fdf [tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Robin Appelman ad5d04ccbe return unknown free space from nullstorage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 16:38:00 +01:00
Robin Appelman ae66cf8d37 add tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman 976cff780b register cloudidmanager for files_sharing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman e7e614d801 log ocs exceptions
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman a359d0d7c7 remove test for removed code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Robin Appelman fa49c4a13b Add a single public api for resolving a cloud id to a user and remote and back
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Lukas Reschke 1a591cea97 Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array
Make sure ownCloud 8.2 activities also can get displayed
2017-02-08 14:47:45 +01:00
Joas Schilling 460b667f80 Update the email in the accounts table as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 13:52:55 +01:00
Joas Schilling f5c42fe0c4 Merge pull request #3403 from nextcloud/rename-dbpassword-toggle
Rename database password toggle
2017-02-08 12:16:53 +01:00
Joas Schilling 54e39d4b93 Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
m3ntalsp00n 01963b4d72 Fix indentation and l10n compliance.
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-08 16:55:31 +10:00
Nextcloud bot 1aba2d9ed8 [tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Morris Jobke f1c4f4c020 Rename database password toggle
* otherwise submitting the form with the password show will be overwritten
* see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59
* seems to be a legacy fallback
* fixes #3381

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-07 16:59:12 -06:00
Joas Schilling d0e6235b03 Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:16:11 +01:00
Joas Schilling d79838ac9b Add tests for getUser()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:01:28 +01:00
Joas Schilling 881c7275a2 Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:49:32 +01:00
Joas Schilling c031c77e3c Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:30:23 +01:00
Nextcloud bot 5e4bbb394c [tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Sandro Lutz 9b6f99ab08 Update license header
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 01:25:39 +01:00
Morris Jobke 5157f16d28 Merge pull request #3352 from nextcloud/public-page-guest-css-loader
Fix public page css fallback loading
2017-02-06 18:15:56 -06:00
Sandro Lutz fa1d607bfa Merge remote-tracking branch 'nextcloud/master'
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:15:30 +01:00
Sandro Lutz ff3fa538e4 Add missing use statement for PublicEmitter
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:12:19 +01:00
John Molakvoæ (skjnldsv) 5383cc6170 TOTP css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-06 22:26:01 +01:00
Robin Appelman b55f5af7ea Merge pull request #3364 from nextcloud/sass-logging
Lower log levels of resource locator
2017-02-06 12:52:57 +01:00
Nextcloud bot fa96b9e356 [tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot e4a74568e6 [tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Marius Blüm 9ce8437b8b Merge pull request #3353 from nextcloud/mobile-view-files-fix
Fix files mobile view
2017-02-04 21:00:40 +01:00
m3ntalsp00n dd9ee2db6f fix tests, longer wait time, update notification stub
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 18:51:52 +10:00
m3ntalsp00n fd40613d8e showUpdate funciton allows updated messages
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
2017-02-04 15:47:09 +10:00
Nextcloud bot 03bbda913d [tx-robot] updated from transifex 2017-02-04 01:07:20 +00:00
Flole998 075d39e61a Fix for Win Clients sometimes not connecting
Fix for Win Clients sometimes not connecting
2017-02-03 23:47:18 +01:00
Morris Jobke 942465c8b1 fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-03 11:52:01 -06:00
Robin Appelman 3d8a300b77 Lower log levels of resource locator
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-03 13:09:33 +01:00
Nextcloud bot 49bce91404 [tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Christoph Wurst 5e728d0eda oc_token should be nc_token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-02 21:56:44 +01:00
Morris Jobke 949fbdef33 Merge pull request #3359 from nextcloud/fix-sharing-app-description
Fix Sharing app description
2017-02-02 14:47:45 -06:00
Joas Schilling d318e2b005 Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
Nextcloud bot b946ec9d6c [tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Sandro Lutz 20f878b014 Fix typo for UserManager variable
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:54:00 +01:00
Sandro Lutz 6feff0ceba Add check if UserManager is of type PublicEmitter before calling preLogin hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:50 +01:00
Sandro Lutz e30d28f7eb Change where preLogin hook gets called
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:42 +01:00
Sandro Lutz 6ab0a3215d Remove preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:29 +01:00
Sandro Lutz e14d50eb1f Fix indentation
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:47 +01:00
Sandro Lutz 4ebcd5ac0b Add preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:50:25 +01:00
John Molakvoæ (skjnldsv) e0e5b32f94 Fix files mobile view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:39:27 +01:00
John Molakvoæ (skjnldsv) 61442e2c33 Various fixes guest css
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:10:52 +01:00
John Molakvoæ (skjnldsv) 2c9d7eeb76 Fix public page css fallback loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:03:51 +01:00
Nextcloud bot 1952560ac7 [tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
John Molakvoæ (skjnldsv) 8d5bb0b908 Transparent white checkbox
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-31 19:29:30 +01:00
Morris Jobke db5af891c3 Merge pull request #3321 from nextcloud/revert-unintentional-change-of-log-timestamp-format
Revert unintentional log timestamp format change
2017-01-31 08:44:06 -06:00
Morris Jobke 5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
2017-01-30 19:30:04 -06:00
Andreas Pflug 07b203d12f Merge branch 'master' of https://github.com/nextcloud/server into ldap_no-memberof-with-memberuid 2017-01-31 02:27:29 +01:00
Morris Jobke e50320dc71 Merge pull request #3169 from nextcloud/update-doctrine
Update doctrine
2017-01-30 19:23:16 -06:00
Nextcloud bot 9a13fac418 [tx-robot] updated from transifex 2017-01-31 01:07:05 +00:00
Andreas Pflug b64e48335f Don't try to use memberof on posixgroups, since it doesn't support
memberUid attributes.

Signed-off-by: Andreas Pflug <dev@admin4.org>
2017-01-31 01:40:09 +01:00
Morris Jobke 5618287b68 Merge pull request #3282 from nextcloud/header-menu-arrow-up
Merge similar properties and standardize the arrow to the menu class
2017-01-30 17:23:10 -06:00
Joas Schilling 4e0c50fdd6 Update doctrine
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 17:22:33 -06:00
Morris Jobke 687e38c409 Merge pull request #2970 from nextcloud/notify-self-test
Add self-test for files_external:notify
2017-01-30 17:15:57 -06:00
Morris Jobke 2a6006b927 Fix config.sample.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-30 16:52:30 -06:00
blizzz f70f427a63 Merge pull request #3298 from nextcloud/downstream-26928
remove obsolete hack (#26928)
2017-01-30 18:01:06 +01:00
Arthur Schiwon 9983e05121 LDAP's checkPassword should only catch when a user was not found, fixes #2431
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-30 17:06:51 +01:00
Joas Schilling 0a837ac64e Revert unintentional log timestamp format change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-30 15:06:23 +01:00
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Christoph Wurst 9a036a2ae3 Merge pull request #3260 from nextcloud/various-scss-fixes
Various scss fixes
2017-01-30 11:34:39 +01:00
Nextcloud bot bbcb1dd2e0 [tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot f4de328695 [tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
duritong dbf4a4b844 only chmod logfile if necessary
otherwise e.g. on SELinux this will log an error, so we better avoid it if not necessary.
2017-01-29 00:55:39 +01:00
Nextcloud bot b614547ff8 [tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Jörn Friedrich Dreyer 6fd7d4efd0 remove obsolete hack (#26928)
* remove obsolete hack

> // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961
was closed 4 years ago. we could also use the Common implementation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-27 12:20:48 -06:00
Morris Jobke 8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
Add navigation via info.xml (#26785)
2017-01-27 11:25:26 -06:00
Joas Schilling 05884bcd7c Merge pull request #3178 from nextcloud/default-value-logdateformat
fix default value for logdateformat
2017-01-27 12:08:57 +01:00
Robin Appelman 90c011379c update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:51:00 +01:00
Robin Appelman 76f8247516 Add since
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:48 +01:00
Robin Appelman d14ff70050 add unit tests for smb notify backend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:45 +01:00
Robin Appelman 72eeb8fd22 add notify self test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:41 +01:00
Robin Appelman c7536f7877 switch occ files_external:notify to new notify mechanism
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:37 +01:00
Robin Appelman 269747985e Add a more powerful notify mechanism
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:33 +01:00
Robin Appelman 0aa211eefb Add missing smb files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:29 +01:00
Lukas Reschke b5990b740d Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitive
Make sure different webroots use different cached paths
2017-01-27 10:14:22 +01:00
Joas Schilling 27f8a832e4 Force to specify the name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-27 09:44:11 +01:00
Morris Jobke 98dc58356f Merge pull request #3284 from nextcloud/remove-avatar-fixup
remote now unneeded AvatarPermissions repair step
2017-01-26 20:14:24 -06:00
Nextcloud bot a5aeddc810 [tx-robot] updated from transifex 2017-01-27 01:07:18 +00:00
Morris Jobke 426c8e3be1 Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug
fix shared-as-busy events for owner
2017-01-26 17:30:51 -06:00
Morris Jobke 382e20f573 Merge pull request #3249 from nextcloud/add-clear-search-button
Add clear search button
2017-01-26 15:42:52 -06:00
Morris Jobke e21170bd1a Merge pull request #3246 from nextcloud/fix-sqlite-dependency
Remove useless dependency on SQLite (non-PDO)
2017-01-26 15:41:11 -06:00
John Molakvoæ (skjnldsv) 07cbdbff52 Blue shadow fix 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 20:35:22 +01:00
John Molakvoæ (skjnldsv) 9513e7a14b Blue left shadow fix #3288
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 20:26:15 +01:00
Robin Appelman c76fe2b4f5 remote now unneeded AvatarPermissions repair step
Avatars are now stored in appdata

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 19:24:55 +01:00
Lukas Reschke 43315e27f4 Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-nonce-browser
Use correct theming when returning the defaults
2017-01-26 18:44:48 +01:00
Lukas Reschke 29f5ab1758 Merge pull request #3238 from nextcloud/dav-test
Make DAV external storage test more reliable
2017-01-26 18:43:36 +01:00
Lukas Reschke dd0d469833 Merge pull request #3272 from nextcloud/fix_user_controller
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
2017-01-26 18:37:36 +01:00
John Molakvoæ (skjnldsv) 3017bae892 Merge similar properties and apply arrow to menu class
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 15:50:18 +01:00
John Molakvoæ (skjnldsv) 7b4b45306b Js magic to reset search
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 15:33:05 +01:00
Roeland Jago Douma ce240a45e6 Merge pull request #3160 from nextcloud/streams52
update icewind/streams to 0.5.2
2017-01-26 14:55:37 +01:00
Robin Appelman c9ecd64d36 update icewind/streams to 0.5.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 12:19:32 +01:00
Georg Ehrke 97d3020027 fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-01-26 12:06:07 +01:00
Lukas Reschke 3afd3c3a3d Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth
add brute force protection for public link authentication
2017-01-26 12:05:16 +01:00
Bjoern Schiessle 3e6c40eeb4 make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:31:08 +01:00
Morris Jobke 3a603ab8b4 Merge pull request #3264 from nextcloud/ldap-deny-long-dns
Gracefully deny users or groups with too long DNs
2017-01-26 01:15:43 -06:00
Morris Jobke e7523b07bd Merge pull request #3197 from nextcloud/enable-scss-for-all-apps
Enable every app to generate their scss file
2017-01-25 22:53:23 -06:00
Morris Jobke feab1e5b94 Merge pull request #3162 from nextcloud/ldap-ocs
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
Morris Jobke 4536ead454 Remove useless dependency on SQLite (non-PDO)
* we only require the PDO driver
* fixes #481

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-25 22:23:05 -06:00
Morris Jobke 3be746d660 Merge pull request #3208 from nextcloud/issue-3125-bring-user-management-endpoints-in-line
Error out when subadmin doesn't select any group
2017-01-25 22:16:25 -06:00
Morris Jobke 659d4b8d32 Merge pull request #3252 from nextcloud/remove-activity-icon-hacking
Remove the icon since it's defined by the app itself
2017-01-25 19:19:44 -06:00
Morris Jobke 694fa879fb Merge pull request #3255 from nextcloud/fix-password-form
fix personal page password form layout
2017-01-25 19:19:26 -06:00
Nextcloud bot 05e3aa491a [tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Morris Jobke d319d6f9d4 Merge pull request #3258 from nextcloud/you-get-a-copyright-you-get-a-copyright-everybody-gets-a-copyright
Copyright of scss files
2017-01-25 19:00:55 -06:00
Morris Jobke 6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
John Molakvoæ (skjnldsv) 4f78c06391 Removed invalid authors
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 18:27:41 +01:00
Bjoern Schiessle ed55b87b65 add brute force protection for public link authentication
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
Arthur Schiwon 03ae7b654f Gracefully deny users or groups with too long DNs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-25 17:10:51 +01:00
Robin Appelman 2520a4831b Make sure we use the correct storage id when scanning a jailed storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-25 17:03:45 +01:00
Björn Schießle ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
add data from the users profile to the provisioning api
2017-01-25 15:44:36 +01:00
John Molakvoæ (skjnldsv) 4e91759825 No more height css calc for app-navigation children
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:39:54 +01:00
Björn Schießle 5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links
allow editing single files shared as public link
2017-01-25 15:35:57 +01:00
John Molakvoæ (skjnldsv) 87fd41dba2 Fix popover conflicts with app-navigation li (color & opacity)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:22:51 +01:00
John Molakvoæ (skjnldsv) 179bd5824f Border radius fix on popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 15:13:38 +01:00
John Molakvoæ (skjnldsv) bf6505f30c Everyone gets a copyright!
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 14:13:28 +01:00
Jan-Christoph Borchardt 3384b2f53c fix personal page password form layout
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-25 12:05:43 +01:00
Björn Schießle f469b3e958 Merge pull request #3223 from nextcloud/fix-public-page-style
Fix public page style
2017-01-25 11:45:36 +01:00
Jan-Christoph Borchardt 8c732e376b properly compress close-white.svg 2017-01-25 11:28:43 +01:00
Joas Schilling 95ef625a9d Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 11:24:42 +01:00
Bjoern Schiessle 5086335643 unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 11:20:35 +01:00
Joas Schilling 10a55e6006 Merge pull request #3241 from nextcloud/fix-padding-settings
Fix left padding for settings sidebar
2017-01-25 11:12:48 +01:00
Joas Schilling 7e3bd63a70 Remove the icon since it's defined by the app itself
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 10:50:31 +01:00
John Molakvoæ (skjnldsv) 5834ab1ffd Scour opt
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 09:19:49 +01:00
John Molakvoæ (skjnldsv) d0e88e328c Add clear search button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-25 09:15:37 +01:00
Christoph Wurst 77fcee7979 Merge pull request #3239 from nextcloud/added-inline-button
fix #3235
2017-01-25 08:53:22 +01:00
Christoph Wurst 933fd9c94d Merge pull request #3240 from nextcloud/storage-interface-tweaks
minor storage interface tweaks
2017-01-25 08:52:32 +01:00
John Molakvoæ 5d985deb4d Merge pull request #3215 from nextcloud/fix-search-border
Fix #3205
2017-01-25 08:04:41 +01:00
Morris Jobke 95ab46e3d2 Merge pull request #3030 from nextcloud/filesapi-renamefailcase
Fix files node API failed rename/copy
2017-01-24 21:23:59 -06:00
Nextcloud bot c3e57d228f [tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke 8f5c62c99f Merge pull request #3204 from nextcloud/remove-button-shadow
remove button shadow effect, fix #3203
2017-01-24 13:34:12 -06:00
Morris Jobke fa5cb9c875 Merge pull request #3227 from nextcloud/fix-avatar-user-menu-header
Fixed menu arrow, padding and avatar position, fix #3217
2017-01-24 13:30:04 -06:00
Morris Jobke f9c3639607 add icon for encryption settings on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:59:36 -06:00
Morris Jobke e46410e856 Add icon to admin page sidebar for LDAP
* follow up to nextcloud/server#3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:54:32 -06:00
Christoph Wurst ca6f5735b1 Merge pull request #3226 from nextcloud/header-app-menu-flex-fix
Fix header layout issue on narrow screens #3225
2017-01-24 18:15:22 +01:00
Morris Jobke b5d171a3ed Fix left padding for settings sidebar
* followup to #3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 11:00:31 -06:00
Morris Jobke e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
John Molakvoæ (skjnldsv) dcad6032b1 Appdata var fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 17:46:20 +01:00
John Molakvoæ (skjnldsv) a440c3e94c Remove unused webroot
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 17:27:35 +01:00
Robin Appelman f73527c42f minor storage interface tweaks
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-24 16:58:04 +01:00
Robin Appelman 38ec2a35f2 Make DAV external storage test more reliable
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-24 16:56:24 +01:00
John Molakvoæ (skjnldsv) befc49d937 fix #3235
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 16:54:51 +01:00
Bjoern Schiessle fee42647fb add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 14:23:18 +01:00
Robin Appelman f55260bc83 Merge pull request #3214 from nextcloud/cache-storage-info
cache the storage info for 5 min
2017-01-24 13:49:45 +01:00
Bjoern Schiessle 92d7dd4781 allow editing single files shared as public link
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 13:41:27 +01:00
Robin Appelman cbc18b7c8b hash the path used for the cache key to prevent key length problems
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-24 11:18:05 +01:00
Nextcloud bot 30e9d67ee9 [tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Morris Jobke c0341f3459 Merge pull request #3192 from nextcloud/fix-app-settings-layout-minor
Fix gap by filter svg and empty search message overflow
2017-01-23 18:29:36 -06:00
Jan-Christoph Borchardt 38f684aadf fix positioning details of icons in navigation
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-24 01:00:00 +01:00
John Molakvoæ (skjnldsv) c30cf00ec3 Fixed menu arrow, padding and avatar position, fix #3217
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 00:25:09 +01:00
John Molakvoæ (skjnldsv) d992af82b2 Fix #3225
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-24 00:03:45 +01:00
Robin Appelman d4d116503c Merge pull request #3212 from mwalbeck/mimetype-hidden-files
Mimetype detection for hidden files
2017-01-23 21:45:16 +01:00
Morris Jobke f19feccf9f Merge pull request #3209 from nextcloud/fix-theming-typo
Fix typo in theming description
2017-01-23 13:54:52 -06:00
Morris Jobke 9b0c6c0eff Merge pull request #3157 from nextcloud/fcloseafterkill
[uc] Prevent PHP request to get killed when using fclose callback (#26775)
2017-01-23 13:51:43 -06:00
Morris Jobke a13ea677ed add comment about ISO 8601 and PHP 🙈
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-23 13:39:08 -06:00
Morris Jobke 30c32e0b16 Merge pull request #3220 from nextcloud/direct-link-open-sidebar
open the sidebar when opening a permalink
2017-01-23 12:57:52 -06:00
Morris Jobke 1bc3a26042 Fix white flashing of search background
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-23 12:54:20 -06:00
John Molakvoæ (skjnldsv) 15134af5f3 Fix #3205
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-23 12:54:20 -06:00
Morris Jobke 46ef0f832d Fix public page style
* checks if the user is on the login page or not instead of check if the user is logged in
* fixes #3207

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-23 12:42:59 -06:00
Morris Jobke d80bc6c72b Merge pull request #2924 from nextcloud/flexbox-header
Use flexbox for header and rearrange some elements
2017-01-23 12:16:27 -06:00
Marius Blüm a460acb823 Increase debounce time to make sure controls are resized after the sidebar disappeared
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-01-23 11:49:16 -06:00
Robin Appelman 0f698e2021 open the sidebar when opening a permalink
Also works for search results

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 18:06:24 +01:00
Magnus Walbeck 3d99ec6832 Reduced code for filename trim
Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
2017-01-23 17:14:39 +01:00
John Molakvoæ (skjnldsv) 927f04418d Add class
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-23 15:40:54 +01:00
Robin Appelman e38a978623 cache the storage info for 5 min
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 14:52:50 +01:00
Magnus Walbeck eadc1ac637 Mimetype detection for hidden files
Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
2017-01-23 13:28:35 +01:00
Joas Schilling 4bb8731089 Fix typo in theming description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-23 12:35:58 +01:00
Vincent Petry 0aaf209c66 Prevent PHP request to get killed when using fclose callback (#26775)
* Prevent PHP request to get killed when using fclose callback

* Add ignore_user_abort everywhere where the time limit is set to 0

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 12:33:20 +01:00
Joas Schilling 5d486478d3 Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group
Subadmin check on removing user from group
2017-01-23 12:10:06 +01:00
Joas Schilling 18d7701d09 Prevent migration from ownCloud 11 to Nextcloud 12
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-23 12:04:46 +01:00
Joas Schilling 73856ac639 Error out when subadmin doesn't select any group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-23 11:58:58 +01:00
Jan-Christoph Borchardt 1936b56103 remove button shadow effect, fix #3203
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-23 09:23:03 +01:00
Christoph Wurst ac6d501657 fix appname position
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
Christoph Wurst bfc4590c28 fix searchbox position
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
Christoph Wurst 47c63e6a3e fix public sharing buttons
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
Christoph Wurst a1f9425e65 fix log and app name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
Christoph Wurst bfa50a4444 more cleanup
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
Christoph Wurst 7c824a6177 fix scss
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:03:05 +01:00
Christoph Wurst b590658221 use less space for the left part of the header
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:03:05 +01:00
Christoph Wurst 202509251c Use flexbox for header and rearrange some elements
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:03:03 +01:00
Morris Jobke 16afaa783b Merge pull request #3118 from nextcloud/newFileMenu-css-guidelines
Fit newFileMenu to css guidelines
2017-01-22 20:39:16 -06:00
Nextcloud bot 8024f5a17f [tx-robot] updated from transifex 2017-01-23 00:17:39 +00:00
John Molakvoæ 7eec5e0c27 Merge pull request #3190 from nextcloud/fix-sharing-popover
Fix #3174
2017-01-22 20:40:48 +01:00
John Molakvoæ (skjnldsv) 4ceb2bf84c Enable every app to generate their scss file
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 19:33:45 +01:00
John Molakvoæ (skjnldsv) 0fc0bcf6b3 Popover newFolder input fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv) 3d86275f1e Popover positionning fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv) 961fcfa1fb Popover positionning and classes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:08 -06:00
John Molakvoæ (skjnldsv) 418ebfbdf4 fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:08 -06:00
Morris Jobke 0d6e3ca86b Merge pull request #3187 from nextcloud/inputs-scss-optimisation
Inputs.scss rewritting and optimisation
2017-01-22 11:41:49 -06:00
Lukas Reschke bde1150d04 Merge pull request #3004 from nextcloud/fix-installation-css
Fixed installation page
2017-01-22 18:28:33 +01:00
John Molakvoæ (skjnldsv) 08361e61d2 App navigation utils buttons shadow fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:57:10 +01:00
John Molakvoæ (skjnldsv) 4c47b8e3a3 Fixed public share download button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:32:51 +01:00
John Molakvoæ (skjnldsv) 17f8067db5 Fix Navigation menu shadow and added rules for icon in button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:30:38 +01:00
John Molakvoæ (skjnldsv) 0a400c4259 Fixed sharing js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:26:59 +01:00
John Molakvoæ (skjnldsv) 6a617fa721 Fixed public share header buttons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:25:02 +01:00
John Molakvoæ (skjnldsv) 913834be86 Fix download button on public share
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:47:58 +01:00
John Molakvoæ (skjnldsv) 56b9203bf9 Select2 search input fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:42:03 +01:00
John Molakvoæ (skjnldsv) ba8a9a9cd2 Login and authenticate inputs fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:38:07 +01:00
John Molakvoæ (skjnldsv) 7fd2257141 Disabled state fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:37:23 +01:00
John Molakvoæ (skjnldsv) 94a5290366 White checkmark fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:30:13 +01:00
Felix A. Epp 82bfe3b479 Fix gap by filter svg and empty search message overflow
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-01-22 14:46:39 +01:00
John Molakvoæ (skjnldsv) 466298d121 Fix login
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 05:45:49 +01:00
Nextcloud bot 012e521239 [tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
John Molakvoæ (skjnldsv) 23dc0aae87 Fixed edit icon position
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:51:48 +01:00
John Molakvoæ (skjnldsv) 9619584383 Fixed strengthify wrapper
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:47:20 +01:00
John Molakvoæ (skjnldsv) da4c6ab326 Fixed multiselect focus
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:33:43 +01:00
John Molakvoæ (skjnldsv) 7882976a14 Remove quota focus and unwanted state classes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:25:48 +01:00
John Molakvoæ (skjnldsv) 0f353b2f67 Fixed strengthify wrapper
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:21:46 +01:00
John Molakvoæ (skjnldsv) a4c74d5992 Fixed show password
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:19:34 +01:00
John Molakvoæ (skjnldsv) f40e5b73f7 Fix #3174
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:06:57 +01:00
John Molakvoæ (skjnldsv) 9689e46d99 Removed old svg and added new ones
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:06:42 +01:00
John Molakvoæ (skjnldsv) f68ff25cc0 Going back to svg for the checkmark and the mixed mark
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:05:20 +01:00
John Molakvoæ (skjnldsv) 05f3990616 Inputs.scss rewritting and optimisation, fix #3121
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 18:17:53 +01:00
Morris Jobke d16051fa6f fix test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-20 23:12:45 -06:00
Nextcloud bot d0c6179ec1 [tx-robot] updated from transifex 2017-01-21 01:07:47 +00:00
Arthur Schiwon 680fef76f8 remove outdated scenario
covered by "Delete a non-existing configuration"

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 23:41:20 +01:00
Arthur Schiwon 91ed70f094 fix deletion for configIDs < s10
Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 23:01:46 +01:00
Arthur Schiwon 9ca4065ef5 LDAP PUT command now supports setting multiple keys at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 22:01:08 +01:00
Joas Schilling 33ca69166a Merge pull request #3177 from nextcloud/default-value-mail_smtpmode
Fix default of mail_smtpmode
2017-01-20 14:32:52 +01:00
Joas Schilling a113f951d6 Adjust the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-20 12:55:48 +01:00
Joas Schilling fef4462904 Make sure the file information is available when sending the email
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-20 12:52:56 +01:00
Arthur Schiwon 08b31fcb7d enable user_ldap app for tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-20 10:10:37 +01:00
Morris Jobke 2316083256 fix default value for logdateformat - fixes #3107
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 20:08:15 -06:00
Morris Jobke 12e3b357d4 Fix default of mail_smtpmode - fixes #3102
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:59:53 -06:00
Morris Jobke a4ad8af6e3 Add proper default value for datadir
* better safe than sorry
* fixes #3091

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:49:41 -06:00
Nextcloud bot 48a3f2a8a2 [tx-robot] updated from transifex 2017-01-20 01:07:41 +00:00
Morris Jobke 4253a9bde3 update autoloader static class files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 16:12:09 -06:00
Morris Jobke 8565011b8d Merge pull request #3144 from nextcloud/use-data-download-response
Use DataDownloadResponse
2017-01-19 15:36:31 -06:00
Morris Jobke 31a0821863 fix indentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 13:06:50 -06:00
Arthur Schiwon 22528f492f also, let ldap integration tests run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 17:12:00 +01:00
Joas Schilling 246affb1a0 Use correct theming when returning the defaults
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 16:55:09 +01:00
Joas Schilling 13a5c5d64c Merge pull request #3152 from nextcloud/add-brute-force-protection
Add brute force protection to some public APIs
2017-01-19 15:57:49 +01:00
Joas Schilling 5812e99f1d Fix app section tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 15:30:40 +01:00
Arthur Schiwon 1f7b08bd19 LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 15:19:20 +01:00
Robin Appelman e9badb9f83 Revert "update icewind/streams to 0.5.2"
This reverts commit d5728b3f11.
2017-01-19 14:41:20 +01:00
Robin Appelman d5728b3f11 update icewind/streams to 0.5.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-19 14:39:40 +01:00
Arthur Schiwon f2c9d04eac test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 12:48:50 +01:00
Arthur Schiwon 01d469dfea add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 11:09:04 +01:00
Joas Schilling 80b800128d Fix the manager tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 11:02:56 +01:00
Joas Schilling 17a7eaabcd Add the icons for shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
Joas Schilling c3985aba70 Add the icon for the default sections
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:21 +01:00
Joas Schilling 8c8354399a Allow apps to specify an icon with the sections via the API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:21 +01:00
Morris Jobke 381e58d7d4 add viewBox to not run into scaling issues
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 10:42:21 +01:00
Jan-Christoph Borchardt b6bfc4e801 add icons to admin settings navigation
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-19 10:42:21 +01:00
Jan-Christoph Borchardt 6697415d49 add icons to personal settings navigation
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-19 10:42:21 +01:00
Bjoern Schiessle 3882a8d648 some code cleanup while working on the file
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:46 +01:00
Bjoern Schiessle cd8104dfb0 add brute force protection to 'mount public link' operation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:46 +01:00
Bjoern Schiessle 927d3865a0 add brute force protection to password reset to make it harder to guess user logins
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:45 +01:00
Arthur Schiwon 18a75bec0d fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
John Molakvoæ 2cfedb3623 Merge pull request #3150 from nextcloud/highlight-active-navigation
highlight active navigation entry better, fix #2096
2017-01-19 06:47:30 +01:00
Morris Jobke 3798f842c0 theme app navigation menu highlight color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-18 21:42:50 -06:00
Lukas Reschke 2d73a003d7 Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverage
2fa backup codes test coverage
2017-01-19 02:26:39 +01:00
Lukas Reschke 5809164163 Merge pull request #3050 from nextcloud/header-scss-optimisation
Header scss optimisation
2017-01-19 02:25:26 +01:00
Nextcloud bot f58f3d7aab [tx-robot] updated from transifex 2017-01-19 01:08:09 +00:00
Jan-Christoph Borchardt ad1385a8e1 highlight active navigation entry better, fix #2096
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-01-19 01:49:54 +01:00
Arthur Schiwon a515de54e7 LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
Morris Jobke 61d4198ae1 Merge pull request #3133 from nextcloud/j-ed-master
added parameter default values
2017-01-18 15:03:39 -06:00
Arthur Schiwon 689df9a843 LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
Christoph Wurst 65f303164f fix file ending
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 2f30a71b19 make sure files end with emtpy line
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 85e4febc24 ignore code we're unable to test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 3b4b49fa95 test activity provider
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 6f6eb5b301 increase GenericProvider's test coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Morris Jobke 40c64e6a9c Merge pull request #3142 from senden9/patch-1
Fix style in comment
2017-01-18 10:38:23 -06:00
Morris Jobke a3f835872f Merge pull request #3120 from nextcloud/brute-force-protection-api
brute force protection for api calls
2017-01-18 10:23:26 -06:00
Lukas Reschke be3ec7ffb7 Use DataDownloadResponse
1. As documented
2. No need to show this inline, downloading has security advantages

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-18 17:00:09 +01:00
Stefano Probst 9df58081d6 Fix style in comment
Add missing grave accent to fix the highlighting in the documentation.
2017-01-18 16:39:44 +01:00
Lukas Reschke 29d2ca5991 Merge pull request #3078 from nextcloud/2fa-backup-codes-entropy
Increase 2fa backup codes entropy
2017-01-18 16:08:59 +01:00
Bjoern Schiessle cdf01feba7 add action to existing brute force protection
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle 0271ae3b46 add some unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle 32e0ec3e58 handle optional annotation parameters
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:16 +01:00
Joas Schilling 29a0a23918 Fix the regex for annotations with values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 15:25:16 +01:00
Bjoern Schiessle df296249d6 introduce brute force protection for api calls
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-18 15:25:15 +01:00
Joas Schilling 916cc57b0e Remove the old ajax file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:36:23 +01:00
Joas Schilling 89801f76ea Use the provisioning api in the user management to handle group memberships
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:35:30 +01:00
Joas Schilling 5d1f7e5a7b Allow subadmins to add people to groups via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:34:38 +01:00
Joas Schilling d80a4453af Make sure subadmins can not delete users from their last subadmin group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:56:24 +01:00
Joas Schilling 55db07a20b Fix CamelCasing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:45:26 +01:00
Joas Schilling ae77067a07 No need to check the subadmin again
The user needs to be a subadmin of the group,
otherwise they are not allowed to remove anyone from the group

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:43:52 +01:00
Nextcloud bot 4bbd52b3f9 [tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Morris Jobke 08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem
Escape the name for the jquery selector
2017-01-17 18:40:11 -06:00
j-ed cd84cba32b added parameter default values
based on a source code analysis (looking for getSystemValue() function) I added the default values of the prameters

Update config.sample.php

replaced three backticks by two.

applied various fixes

- removed default value for 'objectstore' because it has not default value.
- removed default value for 'tempdirectory' because it is unset.
- changed default value for 'theme' to "Defaults to the theming app which is shipped since Nextcloud 9"
- fixed typo in default value of 'minimum.supported.desktop.version', after double-checking the version
  number in /apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php:71.

Signed-off-by: Juergen Edner <juergen@eisfair.org>
2017-01-17 18:29:38 -06:00
Lukas Reschke 4009d3db03 Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive
Make sure the spreed TURN server secret stays a secret
2017-01-17 14:49:43 +01:00
Joas Schilling ce973929e8 Merge pull request #3075 from nils/debug-no-versionhash
Do not add version hash in debug mode
2017-01-17 11:44:50 +01:00
Joas Schilling 35b8f03c07 Merge pull request #3106 from nextcloud/spreed-calls-are-objects
Define spreed calls
2017-01-17 11:42:13 +01:00
Joas Schilling 30b9262a5a Make sure the spreed TURN server secret stays a secret
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:29:10 +01:00
Björn Schießle 61c68d4ebe Merge pull request #3114 from nextcloud/menuitem-fix
Add menuitem to popover menu
2017-01-17 11:12:49 +01:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
Christoph Wurst 012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs
Filter out sensitive appconfig values
2017-01-17 11:01:42 +01:00
Christoph Wurst 3295fe2eb7 add title to backup codes print page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 10:32:28 +01:00
Christoph Wurst e111015afa print and close the new tab, not the current one when printing backup codes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 10:32:28 +01:00
John Molakvoæ 75587cf135 Add menuitem to popover menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-17 10:11:08 +01:00
Joas Schilling 377e536417 Add call-type in case the information shall be used for styling or something else in the future
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 10:08:02 +01:00
Christoph Wurst 86a5d5b399 fix show-more-icon position
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:23:59 +01:00
Christoph Wurst 3ee5c7ea4e minor version bump
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:17:56 +01:00
Morris Jobke 6ba7ba6e0c add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-16 22:25:27 -06:00
Morris Jobke aadfadfcf1 fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-16 22:22:05 -06:00
Nextcloud bot b1a82969e6 [tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Morris Jobke 250b7119b7 Merge pull request #3096 from nextcloud/update-theme-urls
Prevent Example-Theme from using invalid URLs
2017-01-16 11:42:08 -06:00
Joas Schilling 745b707cd9 Define spreed calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-16 18:41:00 +01:00
Marius Blüm 5e2995923d Prevent Example-Theme from using invalid URLs
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-01-16 17:52:28 +01:00
Joas Schilling 182f570b04 Merge pull request #3070 from dnel/Clarify-English-setting
Clarify that English refers to US English
2017-01-16 15:17:09 +01:00
Joas Schilling 76bc3bcdef Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-16 15:00:54 +01:00
Christoph Wurst 6726c98bbd use constant and clean up unit test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 13:14:15 +01:00
Björn Schießle 6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name
generate correct path for owner and use the display name instead of t…
2017-01-16 12:29:16 +01:00
Christoph Wurst 3b76699c9c Increase 2fa backup codes entropy
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 11:24:03 +01:00
Nextcloud bot 203436b16b [tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Nils ba3506c431 [Enhancement] Do not add version hash in debug mode
Signed-off-by: Nils <git@to.nilsschnabel.de>
2017-01-15 13:29:32 +01:00
Lukas Reschke ddfc7e6a3f Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-13 18:58:18 +01:00
Lukas Reschke 6a047a045a Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-13 18:58:18 +01:00
Morris Jobke 4d7dee5996 Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-13 18:33:43 +01:00
Joas Schilling fcfb4205bc Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
Joas Schilling 1a7d713883 Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:43 +01:00
Joas Schilling d26b902a13 Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Joas Schilling 587eca3ccd Remove the magic parsing of the description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Joas Schilling 1e453576dd Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Joas Schilling e7a2151c4d Add marked
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Joas Schilling c371e2f532 Merge pull request #3062 from nextcloud/user-settings-tooltip
use tooltip in user list
2017-01-13 16:53:18 +01:00
John Molakvoæ 8d8aff1bce Merge pull request #3024 from nextcloud/apps-scss-optimisation
Apps scss optimisation
2017-01-13 16:31:16 +01:00
John Molakvoæ 127024d89d Merge pull request #3048 from nextcloud/share-scss-optimisation
Share scss optimisation
2017-01-13 16:03:17 +01:00
John Molakvoæ (skjnldsv) ce9c833c5b App navigation utils button fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-13 15:31:42 +01:00
David Nelson deb05a9f9d Update personal.php 2017-01-13 14:01:46 +00:00
Joas Schilling 0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests
Cleanup js tests
2017-01-13 14:47:06 +01:00
Joas Schilling 91beb178a7 Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation
Change the row-format before changing the collation
2017-01-13 14:43:06 +01:00
Christoph Wurst c70b3f0e46 use tooltip in user list
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 14:01:15 +01:00
Christoph Wurst dd88e70dff fix image warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:49:37 +01:00
Christoph Wurst c82befbc00 allow/fix loading of fonts
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:46:06 +01:00
Christoph Wurst da28a1612e expect warning to be shown
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:33:12 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Christoph Wurst 9d56d5e94d add spies for l10n warnings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-13 11:20:19 +01:00
John Molakvoæ (skjnldsv) 0ec6ea5ace Copyright and code format
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 19:49:09 +01:00
Joas Schilling 77b5d7bc86 Change the row-format before changing the collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 16:54:29 +01:00
Joas Schilling 77577b952b Make sure different webroots use different cached paths
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 15:58:18 +01:00
John Molakvoæ (skjnldsv) 052eb98c18 Header scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 15:18:21 +01:00
John Molakvoæ (skjnldsv) bab09dc5d4 Share scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 15:02:14 +01:00
Vincent Petry 269b652754 Add tests for move/copy hooks in Node API
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
Vincent Petry e667b28298 Fix files node API failed rename/copy
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.

Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
Bjoern Schiessle 27357569b6 generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Joas Schilling 5dc6899d1a Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
Morris Jobke 00c3f807db Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
Fit federationScopeMenu to guidelines
2017-01-12 10:09:30 +01:00
Nextcloud bot 09a46b7bd6 [tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
John Molakvoæ a3e31116b1 Update federationscopemenu.js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:20:01 +01:00
John Molakvoæ (skjnldsv) 67c4f3d07c App-navigation action layout fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:01:54 +01:00
Christoph Wurst 140555b786 always allow remembered login
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f84eb89fc fix constructor params in failing test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 21d3fe5883 do not hard-require the token provider
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f74ecd94a use login hook credentials as fallback
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst e4abb9cb6e migrate 'password::sessioncredentials' extern storage auth to credential store
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 3316a9d294 fix @since annotations (9.1->12)
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 46adb3eced replace session implementation if it changes at runtime
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 730442cd8f add @since annotations and document methods
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:10 +01:00
Christoph Wurst a6dca9e7a0 add login credential store
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:09 +01:00
John Molakvoæ fab82e9780 Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
Systemtags scss optimisation
2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv) dda4b3b272 Fix padding if empty button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 18:37:59 +01:00
John Molakvoæ 3463c134a9 Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
Multiselect scss optimisation
2017-01-11 18:24:15 +01:00
Morris Jobke b6c00a3f51 Merge pull request #3026 from nextcloud/icons-scss-optimisation
Icons scss optimisation
2017-01-11 16:52:27 +01:00
Roeland Jago Douma 96d2f2f124 Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
Tooltip scss optimisation
2017-01-11 16:38:18 +01:00
Nextcloud bot c35ea15916 [tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Vincent Petry eb5ea0e260 Refactor files node API for more code reuse
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-11 14:53:42 +01:00
John Molakvoæ (skjnldsv) dfee6ffaca Systemtags scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv) 2899f34c4c Tooltip scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv) 8317a71fee Multiselect scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv) 2a2d4390c6 Comments and delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv) 27a1dadea4 Loader and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:12:39 +01:00
John Molakvoæ (skjnldsv) c87d48700c Second optimisation and readability
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 735423e399 Copyright
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 3e36899778 Comments and cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 5b4d5aba41 Quote fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:41 +01:00
John Molakvoæ (skjnldsv) 2d56cceb87 popover menu restructuration & unification
fix #2798

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:05:15 +01:00
Roeland Jago Douma bc26f78eb1 Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception
Downstream add two factor exception
2017-01-11 13:06:01 +01:00
Roeland Jago Douma 005ce8aaf6 Merge pull request #3007 from Loki3000/master
Remove non required db requests
2017-01-11 12:37:54 +01:00
Joas Schilling ce7836378c Filter out sensitive appconfig values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-11 11:42:36 +01:00
Roeland Jago Douma c7f0063a70 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-11 11:02:11 +01:00
Christoph Wurst 243c9c0941 fix coding style and increase code coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel b8d41752ca Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel ee8c617a6d Update TwoFactorException.php
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:54 +01:00
Cornelius Kölbel e077e01bf2 Add a TwoFactorException
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.

Working on #26593

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-11 11:01:52 +01:00
Roeland Jago Douma c4e51fd055 Merge pull request #3020 from nextcloud/2944
[#2944] Update mobile.css
2017-01-11 09:34:32 +01:00
Rodrigo Almeida 4f3da2bee4 Update mobile.css 2017-01-11 09:12:08 +01:00
Roeland Jago Douma 447e388ce9 Merge pull request #2744 from nextcloud/oc_26324
[downstream] Fix DAV stat cache to properly cache 404
2017-01-11 08:16:40 +01:00
Roeland Jago Douma f515c6db4a Merge pull request #2745 from nextcloud/oc_26590
[downstream] Skip local shares in bkg scan and occ files:scan (#26590)
2017-01-11 08:16:12 +01:00
Roeland Jago Douma a90cbb0f09 Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully
Handle log_type "nextcloud" more gracefully
2017-01-11 08:14:24 +01:00
John Molakvoæ (skjnldsv) ef9e2e4e7d Added loader and fixed tabs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:57:25 +01:00
John Molakvoæ (skjnldsv) e4b3ba6590 Create unified css file and merge all needed data into this file
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 17:50:29 +01:00
Bjoern Schiessle fcda3a20f4 create new encryption keys on password reset and backup the old one
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Roeland Jago Douma 40239decb1 Merge pull request #3012 from nextcloud/fix-karma-image-warnings
show fewer warnings in karma test runs
2017-01-10 16:29:39 +01:00
Roeland Jago Douma 00b17c3af5 Only check for local shared storages
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-10 16:14:21 +01:00
Vincent Petry 706655ef20 Skip local shares in bkg scan and occ files:scan (#26590)
Local shares should only be scanned when doing it for the owner to
avoid repeatedly rescanning the same shared storage over and over again
for every recipient.
2017-01-10 16:11:45 +01:00
Loki3000 7e06f051c9 remove non required sql requests
```
SELECT `appid`, `configkey`, `configvalue` FROM `preferences` WHERE `userid` = '';
```
2017-01-10 17:16:56 +03:00
Loki3000 8ab16f87ac spaces added 2017-01-10 16:44:14 +03:00
Loki3000 6a74f7db11 spaces added 2017-01-10 16:43:43 +03:00
Loki3000 5c77923360 allowed '0' uid 2017-01-10 16:39:10 +03:00
Loki3000 b7e6c5ecdf allowed '0' uid 2017-01-10 16:37:18 +03:00
Morris Jobke b727edf17e Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
Make sure the used event type and the setting/filter are the same
2017-01-10 14:28:30 +01:00
Morris Jobke 30689f338f Merge pull request #2914 from nextcloud/logrotate-logfile
Get the logfile location while running the logrotate cron job instead…
2017-01-10 14:28:09 +01:00
Roeland Jago Douma aee11009bd Merge pull request #3000 from nextcloud/cache-no-store
set 'no-store' cache header if we do not want FF to cache
2017-01-10 14:07:13 +01:00
Christoph Wurst e6a3e8bcd0 show fewer warnings in karma test runs
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 13:50:22 +01:00
Morris Jobke 4dd2a1e679 Merge pull request #2943 from nextcloud/kill_old_preview_code
Cleanup old preview code
2017-01-10 13:50:14 +01:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Joas Schilling 7fa063ceca Better fallback for unknown log types
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:59:13 +01:00
Roeland Jago Douma 3fa715c2ab Merge pull request #3005 from nextcloud/dev-manual-12
fix dev manual link
2017-01-10 12:54:20 +01:00
Joas Schilling a70a081fff Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:28:55 +01:00
Loki3000 74a2938f8e fix spaces 2017-01-10 14:21:23 +03:00
Christoph Wurst 45c6301772 fix controller test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:54:45 +01:00
Loki3000 5262779101 fix brackets 2017-01-10 13:29:35 +03:00
John Molakvoæ (skjnldsv) 96d355984d Revert styles scss changes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 11:24:06 +01:00
Loki3000 b0ff59d42f remove non required db requests 2017-01-10 13:09:33 +03:00
John Molakvoæ (skjnldsv) 67467873c2 Removed jquery scss
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-10 11:06:03 +01:00
Loki3000 33259b41cd remove non required db requests 2017-01-10 13:05:21 +03:00
Christoph Wurst 5a06dfaca1 fix dev manual link
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 11:02:05 +01:00
Morris Jobke 97a63ad689 Merge pull request #2982 from nextcloud/better-notification-links
Set the link of the notification on render instead of creation
2017-01-10 10:27:01 +01:00
Roeland Jago Douma b847dfcee9 Merge pull request #2925 from nextcloud/remove-close-wrapper
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
Christoph Wurst e3815b382d fix data response test expected cache headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-10 10:13:08 +01:00
Morris Jobke bc8e565e2a Merge pull request #2998 from Loki3000/master
Default cache value for null user
2017-01-10 10:06:48 +01:00
Loki3000 135198bf0d Default value for null user
For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.
2017-01-09 23:34:23 +03:00
Christoph Wurst fe6416072d set 'no-store' cache header if we do not want FF to cache
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-09 21:29:59 +01:00
Lukas Reschke 307d45e3bd Merge pull request #2987 from nextcloud/no-empty-bundle
dont write a certificate bundle if the shipped ca bundle is empty
2017-01-09 21:10:11 +01:00
Morris Jobke 9a5b9d8555 Merge pull request #2992 from nextcloud/fix_subdir_install_style
Fix subdir install style
2017-01-09 18:37:08 +01:00
Robin Appelman 817e974c5f dont write a certificate bundle if the shipped ca bundle is empty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-09 16:51:27 +01:00
Lukas Reschke 05d27ec148 Merge pull request #2985 from nextcloud/fix-trusted-domain-error
Allow access to CSS resources
2017-01-09 16:29:09 +01:00
Roeland Jago Douma dec4b26355 Fix subdir install style
* We need to pass the serverroot so that it can include the right files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-09 16:19:54 +01:00
Joas Schilling fee18d6c78 Merge pull request #2814 from nextcloud/appstore_etag_validation
Add ETag validation to appstore requests
2017-01-09 14:56:20 +01:00
Lukas Reschke 69f3430552 Allow access to CSS resources
Fixes https://github.com/nextcloud/server/issues/2984

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-09 12:53:58 +01:00
Joas Schilling b29149402c Fix update notification tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
Joas Schilling bb84db02cb Cleanup comment tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
Joas Schilling 315645ada3 Only add the link when the user can follow it.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
Joas Schilling acbf0d151f Set the link of the notification on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +01:00
Joas Schilling e675c2a66c Set the comment link on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
Joas Schilling e7ff1ba548 Add tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 10:55:40 +01:00
Nextcloud bot 4f9ff96f79 [tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Roeland Jago Douma 6347d97c7f Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
Only allow admins to delete tags
2017-01-06 16:17:09 +01:00
Robin Appelman 54f96e5f58 Get the logfile location while running the logrotate cron job instead of when registering the job
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 16:10:07 +01:00
Roeland Jago Douma 4a2fbe9a5b Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable
Remove group restrictions when those are not allowed anymore
2017-01-06 15:38:13 +01:00
Robin Appelman e40ecc1aa1 update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:33 +01:00
Robin Appelman 5774d3e82c replace close:// streamwrapper with CallBackWrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
Morris Jobke 3ab22c2df5 Merge pull request #2948 from nextcloud/allow-global-composer-to-be-used
Allow to use a global composer instance
2017-01-06 15:31:24 +01:00
Roeland Jago Douma 73fcb69cad Merge pull request #2934 from nextcloud/quota-stream-non-global
remove the need to register the quota streamwrapper globally
2017-01-06 15:25:20 +01:00
Morris Jobke ced5fbcc9c Merge pull request #2968 from nextcloud/update-3rdparty
Update 3rdparty
2017-01-06 15:21:56 +01:00
Roeland Jago Douma ae934cbdab Merge pull request #2966 from nextcloud/ldif-mime-support
recognize LDIF (and schema) file types
2017-01-06 14:42:17 +01:00
Morris Jobke 365fa45ced Update 3rdparty after the merge of #2050
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-06 14:18:21 +01:00
Roeland Jago Douma 5ed4020215 Merge pull request #2050 from nextcloud/scss-switch-base
Switch to SCSS: base files
2017-01-06 14:15:38 +01:00
Roeland Jago Douma ccab1168ce Fix js tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 13:33:18 +01:00
Morris Jobke 5e02c7f7bd Theme update pages via CSS
* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-06 12:36:16 +01:00
Arthur Schiwon 68a0f8e153 recognize LDIF (and schema) file types
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-06 12:25:16 +01:00
Roeland Jago Douma b8ab062ef3 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:40 +01:00
John Molakvoæ (skjnldsv) 7b8c777b57 Fix css url prefix for IgnoreFrontController enabled configs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) 8bcad88c6f ScssCcacher typo fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) 6d3a890cb3 Camelcase fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
Lukas Reschke 7b8debc5d3 Remove webroot from file path
The webroot is already provided, otherwise this links to stuff like "/nextcloud/nextcloud/index.php" instead of "/nextcloud/index.php"

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-06 09:42:39 +01:00
Roeland Jago Douma 350b7ebc86 Adds CssControllerTests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) e3a57c1f07 Fix variables should be passed by reference
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) e1f018838e Updated installation css for config error and update
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) a44c5244c3 Removed old css files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) 62f4c08bc7 3rdparty branch set
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) 1c128e9391 Tooltip scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:15 +01:00
John Molakvoæ (skjnldsv) 5b302a9a67 Systemtags scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 59731acf38 Styles scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) f4ac735f98 Share scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 4cda23bb6a Multiselect scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 62acac9b80 Jquery-ui-fixes scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 03fb2330a1 Inputs scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 6b35525c3c Icons scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 0b51bd0a32 Header scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) a2c3d6c15a Apps scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma 203143e26a Fix typo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma 7bd9087f9e Inject SCSSCacher
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma d64d661ef5 Make SCCCacher injectable
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma d9eaed5ffa Formatting
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
Roeland Jago Douma 1e44a15dd1 No need for the CssManager
* It is a simple wrapper we can always add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) bd5bcd2d8d Installation css & template edit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 763814f057 Css installation page fallback
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
Roeland Jago Douma 95d85ba8eb Do not add ICssManager to OCP
We can add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:13 +01:00
Roeland Jago Douma 2816177ecb Code cleanup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 1f769e6e76 Fix php docs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 6380d503af Css cache folder name fix, route fix and various fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 35b13b856b Appdata location fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 9a21d98824 Regex fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 3b62003c9c Injection fix and log appname fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 2f5f1096ad Since fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 6697bae6aa Url generator fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 12717bfd72 log app name fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 1caaa7f4cd Appdata integration 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 3a7d6846fa Appdata integration 1 & log fix 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) cf73e71ff1 Debug log fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 31f75e50b6 Cache and compile base
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-06 09:42:13 +01:00
Morris Jobke 460ef39b18 Merge pull request #2676 from nextcloud/smb-2.0.0
Update icewind/smb to 2.0.0
2017-01-05 17:07:12 +01:00
Morris Jobke eeb5ea85f7 Merge pull request #2817 from nextcloud/fix-invalid-share-perms
Fix invalid share perms
2017-01-05 15:52:23 +01:00
Joas Schilling 64097aece9 Merge pull request #2946 from nextcloud/kill-apc
Kill APC because it requires PHP 5.4 or lower
2017-01-05 15:25:48 +01:00
Joas Schilling ba7f5105f0 Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldap
Use login name to fix password confirm with ldap users
2017-01-05 15:15:04 +01:00
Robin Appelman cb32d21682 Merge pull request #2922 from nextcloud/fopen-only-simple-modes
log a warning when trying to use a non basic fopen mode
2017-01-05 14:49:55 +01:00
Joas Schilling 9e95a89ab7 Merge pull request #2535 from nextcloud/allow-to-reuse-admin-as-install-name-like-on-mysql
Allow to reuse the same name when installing a new instance on postgres
2017-01-05 14:31:37 +01:00
Joas Schilling 22e74cf5ac Use the new expression
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 14:30:25 +01:00
Joas Schilling 4128a08333 Add bitwise AND and OR to the expression builder
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 14:30:25 +01:00
Lukas Reschke 5d01004368 Adjust version to Nextcloud
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 14:30:25 +01:00
Vincent Petry 7baa4ea1a4 Add repair step to fix file share permissions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-05 14:30:22 +01:00
Roeland Jago Douma fc04779a26 Add ETag validation to appstore requests
* If the ETag if present store it
* If a stored ETag is present then pass it along (with the original
response) to get
* Add tests
* Added files to classmap

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 14:26:09 +01:00
Nextcloud bot d9035e2805 [tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Joas Schilling 7573fa3148 Handle log_type "nextcloud" more gracefully
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:47:27 +01:00
Joas Schilling 7ba665b11d Remove warning
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
Joas Schilling 6acfea61d0 Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
Joas Schilling 5aa388bbe2 Make sure the loginname is set when logging in via cookie
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
Joas Schilling 2f21eaaf47 Use login name to fix password confirm with ldap users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 12:17:30 +01:00
Joas Schilling 57c65c3ec6 Make sure old instances don't break
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 11:57:18 +01:00
Joas Schilling 1a8aaad0bc Allow to use a global composer instance
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 11:01:59 +01:00
Joas Schilling bf043deba3 Kill APC because it requires PHP 5.4
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-05 10:58:34 +01:00
Roeland Jago Douma 0453c47023 Merge pull request #2830 from nextcloud/downstream-fix-birthday-generation-incase-no-year-is-set
Fix generation of birthday, deathdate and anniversary in case where n…
2017-01-05 10:47:22 +01:00
Vincent Petry 6d4abdab8f Fix DAV stat cache to properly cache 404
404 errors were not properly cached due to catching the wrong
exception. Now catching ClientHttpException and checking the error
code. In case of 404, adjust the stat cache accordingly.
2017-01-05 09:39:07 +01:00
Robin Appelman 8429687788 Update icewind/smb to 2.0.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 09:16:03 +01:00
Thomas Müller d5d726fc24 Fix generation of birthday, deathdate and anniversary in case where no year is set - which is allowed as per https://tools.ietf.org/html/rfc6350#section-6.2.5 (#26756)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 09:00:33 +01:00
Robin Appelman 72a3ea6073 log a warning when trying to use a non basic fopen mode
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 08:49:04 +01:00
Bjoern Schiessle 0c11209d33 allow to access mail shares even if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Roeland Jago Douma e19e7c08ad Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 20:56:13 +01:00
Roeland Jago Douma e723363053 Remove old preview code
* \OC\Preview is no more
* \Test\PreviewTests is no more
* PreviewHooks in base.php are gone

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 20:14:16 +01:00
Robin Appelman 6a0f0403d0 Merge pull request #2937 from nextcloud/remove-static-stream-wrapper
remove static:// stream wrapper
2017-01-04 18:13:28 +01:00
Roeland Jago Douma 9bbfb5ffeb Rewrite old preview endpoint for PreviewManager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-04 16:51:44 +01:00
Morris Jobke 32f06ab415 update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-04 16:25:07 +01:00
Robin Appelman bca91f2216 remove static:// stream wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-04 15:57:02 +01:00
Robin Appelman 968de70bc5 remove the need to register the quota streamwrapper globally
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-04 15:15:47 +01:00
Bjoern Schiessle a45137bbca also create mail share if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 13:45:29 +01:00
Morris Jobke 9dbcc1a177 Merge pull request #2933 from nextcloud/dont-link-to-oc-forum
Don't link to the oC forum
2017-01-04 13:22:54 +01:00
Nextcloud bot 2e0cf21f7f [tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Joas Schilling 5533c77b91 Don't link to the oC forum
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-04 12:44:10 +01:00
Joas Schilling ec4b0d1e84 Remove group restrictions when those are not allowed anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-04 10:40:14 +01:00
Robin Appelman a75cfb601e Merge pull request #2923 from nextcloud/remove-fakedir-stream
remove no longer used fakedir stream wrapper
2017-01-03 20:22:16 +01:00
Morris Jobke 8070ccc6f7 update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-03 19:00:05 +01:00
Robin Appelman 5b09565594 remove no longer used fakedir stream wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-03 17:06:03 +01:00
Lukas Reschke 389623ee7b Merge pull request #2921 from nextcloud/remove-unused-assetic-use-statements
remove unused Assetic use statements
2017-01-03 11:06:51 +01:00
Christoph Wurst b6de122d5e remove unused Assetic use statements
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-03 10:13:30 +01:00
Christoph Wurst edd331489d Merge pull request #2913 from nextcloud/update-root-authorities
Update bundled CA Certificates
2017-01-03 10:01:51 +01:00
Nextcloud bot acad4ba93e [tx-robot] updated from transifex 2017-01-03 01:07:46 +00:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Morris Jobke 8e3f442fe2 Merge pull request #2872 from nextcloud/admin-settings-split-db
split db logic from settings manager and test them separately
2017-01-02 16:44:28 +01:00
Morris Jobke 9e32885b34 Merge pull request #2712 from nextcloud/master-2648
Fix legacy DAV endpoint
2017-01-02 16:41:51 +01:00
Lukas Reschke 1b8aae837c Merge pull request #2912 from nextcloud/increase-coverage-response.php
Add 100% coverage for response.php
2017-01-02 16:01:47 +01:00
Robin Appelman 4c6ffeda3e phpdoc
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-02 15:36:54 +01:00
Lukas Reschke a0f07dd754 Update bundled CA Certificates
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-02 15:35:36 +01:00
Morris Jobke 47d7d26bda remove unused parameters and add viewBox
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-02 15:32:16 +01:00
Lukas Reschke e2e4677501 Merge pull request #2911 from nextcloud/rebrand-to-nextcloud-server-crawler
Rebrand to "Nextcloud" and add 100% coverage
2017-01-02 15:32:09 +01:00
Lukas Reschke 746fc3d3bf Add 100% coverage for response.php
While already at https://github.com/nextcloud/server/pull/2911 I thought I can as well finish that one as well...

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-02 15:16:35 +01:00
Roeland Jago Douma db3c918adb Fix legacy caldav endpoints
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Lukas Reschke 3c34b8577c Add test execution against legacy DAV backend
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Roeland Jago Douma 60a8a1a844 Merge pull request #2909 from nextcloud/tests/remember-me-integration-test
Test remember-me login
2017-01-02 14:52:34 +01:00
Lukas Reschke 5679f04cb1 Rebrand to "Nextcloud" and add 100% coverage
Noticed while debugging https://github.com/nextcloud/server/issues/2910

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-02 14:51:16 +01:00
Morris Jobke 61720bfbd3 Merge pull request #2159 from nextcloud/s3-objectstore-ci
S3 objectstore ci
2017-01-02 14:48:45 +01:00
Robin Appelman 3243a6032a adjust test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-02 14:17:20 +01:00
Robin Appelman ac2542f0f0 add ci support for s3 object store
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-02 14:17:19 +01:00
Roeland Jago Douma 17d2b25ad4 Merge pull request #2896 from nextcloud/3rdparty_master
Point 3rdparty to master
2017-01-02 13:59:07 +01:00
Roeland Jago Douma 19086ff769 Point 3rdparty to master
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 11:58:51 +01:00
Christoph Wurst 02359c79fd Test remember-me login
This adds a simple integration test that ensures that remembered
login works when the session cookies vanish.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-02 11:20:22 +01:00
Nextcloud bot 0d24e5d5f9 [tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 5c50df72b7 [tx-robot] updated from transifex 2017-01-01 01:07:30 +00:00
Nextcloud bot 02eb0f7fa4 [tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Roeland Jago Douma 221b56d494 Merge pull request #2897 from nextcloud/revert-2881-update-swift-mailer
Revert "Update third-party ref"
2016-12-30 23:03:53 +01:00
Roeland Jago Douma 308b163b8b Revert "Update third-party ref" 2016-12-30 22:36:17 +01:00
Roeland Jago Douma 108a308ef1 Merge pull request #2881 from nextcloud/update-swift-mailer
Update third-party ref
2016-12-30 21:37:56 +01:00
Roeland Jago Douma 2f235d9693 Merge pull request #2894 from nextcloud/provisioning_api_middleware_tests
Adds provisioning middleware tests
2016-12-30 20:35:30 +01:00
Roeland Jago Douma 15efd3b38d Merge pull request #2892 from nextcloud/usercontroller_tests
Adds user controller tests
2016-12-30 14:58:52 +01:00
Roeland Jago Douma bc5bf23479 Merge pull request #2891 from nextcloud/user_cmd_test
User command enable/disable tests
2016-12-30 14:58:41 +01:00
Roeland Jago Douma e13affa29d Adds provisioning middleware tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-30 14:12:10 +01:00
Roeland Jago Douma 31a3e9847f Adds user controller tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-30 13:26:26 +01:00
Roeland Jago Douma b5a23c9754 User command enable/disable tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-30 13:17:41 +01:00
Nextcloud bot fc02564ea6 [tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Roeland Jago Douma 0f6dd65a91 Merge pull request #2877 from nextcloud/webdavapache
Add files_external webdav apache tests
2016-12-29 15:02:04 +01:00
Roeland Jago Douma f1c66de2ab Merge pull request #2878 from nextcloud/cmd_group_tests
Add Group Command tests
2016-12-29 13:02:13 +01:00
Roeland Jago Douma 3256a1c792 Add files_external webdav apache tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-29 12:47:48 +01:00
Lukas Reschke 306f3c3e4f Update third-party ref
For https://github.com/nextcloud/3rdparty/pull/25

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-29 12:18:54 +01:00
Roeland Jago Douma a7d9b7c876 Add Group Command tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-29 11:48:57 +01:00
Roeland Jago Douma 4a2a41191b Merge pull request #2876 from nextcloud/composer_update
Bump autoloader
2016-12-29 10:39:29 +01:00
Roeland Jago Douma 03cb491af1 Bump autoloadear
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-29 10:10:41 +01:00
Nextcloud bot 52b734b3e4 [tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Robin Appelman 98fd6e0e2f update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-28 19:22:44 +01:00
Robin Appelman c4358ff9fd split db logic from settings manager
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-28 18:59:24 +01:00
Robin Appelman 75747c5d2f Merge pull request #2854 from nextcloud/2fa-redirect-url
Set redirect_url on 2FA challenge page
2016-12-28 16:28:08 +01:00
Nextcloud bot b399ad2fee [tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Lukas Reschke 2cd92da733 Merge pull request #2821 from nextcloud/added-hint-for-specifying
Fix #24219: Added hint for specifying a port. (#26860)
2016-12-27 13:46:29 +01:00
Lukas Reschke f237c582ba Merge pull request #2845 from nextcloud/deleteuser-gethomeearly
Get user home folder before deletion
2016-12-27 13:45:28 +01:00
Nextcloud bot bd20139f55 [tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot 3fc4e1b5b9 [tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Christoph Wurst eff904473d Set redirect_url on 2FA challenge page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-23 20:53:26 +01:00
Arthur Schiwon 754760fdbe mention property to follow same style
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 17:01:58 +01:00
Michael Jobst 969c19b2e9 Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Lukas Reschke 56c016946d Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch
[downstream] Fix maindetailsview favorite star patch
2016-12-23 16:36:53 +01:00
Christoph Wurst cfada468e6 OC.Uploader does not have a 'state' method, therefore the
dead code can be removed

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-23 15:38:48 +01:00
Roeland Jago Douma 6f96af0fce Merge pull request #2819 from nextcloud/trash-ext-link-uselinkowner
Fallback to share link owner when no owner found
2016-12-23 14:36:34 +01:00
Roeland Jago Douma 886341aca4 Merge pull request #2816 from nextcloud/changing_how_favorites_are_serialized
Return explicit values instead of boolean from sabre (#26654)
2016-12-23 14:36:05 +01:00
Lukas Reschke c5cc0d87a8 Merge pull request #2833 from nextcloud/downstream-26750
Introduce group display name support (#26750)
2016-12-23 13:57:59 +01:00
Lukas Reschke c4a594b78b Merge pull request #2844 from nextcloud/testing-altbackend-switch
Testing app switch to force-enable test user backend
2016-12-23 13:47:26 +01:00
Lukas Reschke bfdc55c80a Merge pull request #2841 from nextcloud/integration-tests-allowing-md5-home
Integration tests allowing md5 home
2016-12-23 13:46:51 +01:00
Roeland Jago Douma 5f1bb42c22 Merge pull request #2846 from nextcloud/downstream-obliterate-legacy-home-fallback
Downstream obliterate legacy home fallback
2016-12-23 13:35:07 +01:00
Vincent Petry 7ca6561469 Remove legacy home tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:50:31 +01:00
Vincent Petry 4744dce4df Nuke the legacy storage fallback from orbit
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:49:46 +01:00
Vincent Petry 91cd57e55b Get user home folder before deletion
After the deletion getHome() will fail because the user doesn't exist
any more, so we need to fetch that value earlier.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:42:31 +01:00
Vincent Petry 504a1f0d57 Testing app switch to force-enable test user backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:38:04 +01:00
Sergio Bertolin aad088f3c0 Added phpdoc for getUserHome
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:25:20 +01:00
Sergio Bertolin d1b8e58c86 Using propfind instead of accessing the file system
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:25:20 +01:00
Sergio Bertolin 456d4fce1e Changed data directory for work one
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:25:20 +01:00
Sergio Bertolin 4480dca3e3 Added support for homes which doesn't have user's name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:25:19 +01:00
Lukas Reschke 91c87d3a7a Merge pull request #2820 from nextcloud/testing-md5home
Testing md5home (#26854)
2016-12-23 12:22:15 +01:00
Arthur Schiwon 91a1e5fd9d fix more tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 21:21:16 +01:00
Arthur Schiwon b4d779977a fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
Arthur Schiwon 11faa6da21 declare field
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 18:53:29 +01:00
Thomas Müller b62b82c2de Fix reporting of risky tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 18:39:40 +01:00
Vincent Petry 14256d631c Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Vincent Petry 453f3beffa Adding group display name support 2016-12-22 18:34:45 +01:00
Sourav Badami 3dc562bb7a Fix #24219: Added hint for specifying a port. (#26860)
* Added hint for specifying a port.

* Minor changes.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 15:55:09 +01:00
Morris Jobke 7130fa7b4c Merge pull request #2823 from nextcloud/downstream-integration-tests-adding-report
Downstream integration tests adding report
2016-12-22 15:49:15 +01:00
Morris Jobke 0886788507 Merge pull request #2815 from nextcloud/fix-plural-files
Just use moment to comupte the time left for the upload - translation…
2016-12-22 15:30:22 +01:00
Roeland Jago Douma 6b94da7594 Merge pull request #2828 from nextcloud/only-show-version
Only show version in settings
2016-12-22 15:21:10 +01:00
Morris Jobke bb8b647bd6 Merge pull request #2633 from nextcloud/2fa-activities
two-factor activities
2016-12-22 14:47:15 +01:00
Morris Jobke 6789685c4e Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Remove config change hook that deletes link shares (#26612)
2016-12-22 14:45:20 +01:00
Morris Jobke 44052210a2 Only show version in settings - do not list channel
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-22 14:19:29 +01:00
Sergio Bertolin b0a3b25724 Added functionaly for not shared elements
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:50:15 +01:00
Sergio Bertolin fbbd833ed1 Added more favorites report cases
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:50:07 +01:00
Sergio Bertolin e76732c03a Added flexibility to properties
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:49:57 +01:00
Sergio Bertolin 02de82df91 Fixed failing problems
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:49:49 +01:00
Sergio Bertolin b78dcae1d4 WIP commit, adding report support
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:49:39 +01:00
Thomas Müller aa8755bd4b Add navigation via info.xml (#26785)
* Read navigation information from info.xml

* Load files navigation elements from info.xml

* Add comment about ignoring the exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:34:41 +01:00
Lukas Reschke 7f8d22e710 Merge pull request #2788 from nextcloud/memcached-ci
Add Memcached CI
2016-12-22 12:06:42 +01:00
Björn Schießle 3453f4e97c Merge pull request #2761 from nextcloud/dont-resolve-shares-if-public-sharing-is-disabled
Don't resolve public share token if public sharing is disabled
2016-12-22 11:57:05 +01:00
Morris Jobke 998f235474 Merge pull request #2563 from nextcloud/fix-password-reset
fix password reset if encryption is enabled
2016-12-22 11:18:04 +01:00
Vincent Petry b32e252fb0 Testing md5home (#26854)
* Allow clearing default user backends in config.php

When specifying "user_backends" in config.php, a new option "default"
when set to false will prevent the default user backend to be
registered. The default one is the database backend.
This makes it possible to select exclusive user backends from apps.

* Testing app provides test user backend for alternative homes

The backend provide md5 result to getHome()

* Only md5 the user home when it's not the admin

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 11:03:42 +01:00
Bjoern Schiessle 9d3de74b2d no need to throw a exception we catch two lines later
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-22 11:01:34 +01:00
Morris Jobke 1588dd0ee0 Merge pull request #2802 from nextcloud/trash-improvements
let the owner restore files if they where moved out of a shared folder
2016-12-22 11:00:25 +01:00
Vincent Petry 34d466b2f6 Fallback to share link owner when no owner found
When creating link shares from external storage, the filesystem cannot
find an owner in some scenarios (ex: system-wide mounts). In such
cases, fall back to using the current user's trashbin which happens to
also be the user who created the link share.

Fixes an issue where this scenario made deletion impossible due to
missing user information.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:48:32 +01:00
Joas Schilling 8f664a00e1 Merge pull request #2803 from nextcloud/hide-notification-for-updates
Hide update notification if notification center is enabled
2016-12-22 10:39:15 +01:00
Sergio Bertolín 928f113361 Return explicit values instead of boolean from sabre (#26654)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:10:29 +01:00
Lukas Reschke 86066028de Merge pull request #2811 from nextcloud/extended_apcu_cas
Extend APCu test with int CAS
2016-12-22 10:09:16 +01:00
Morris Jobke f88d615445 Merge pull request #2808 from alantygel/patch-1
Translation string corrected > 1 user
2016-12-22 10:04:35 +01:00
Thomas Müller 2bf4661e40 Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:01:58 +01:00
Nextcloud bot 0b64e96c9b [tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Roeland Jago Douma 065f2fbcc6 Extend APCu test with int CAS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-21 21:06:41 +01:00
Roeland Jago Douma 2067f7f411 Disable memcached binary protocol
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-21 20:55:42 +01:00
Roeland Jago Douma 7d5cd98c17 Add Memcached CI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-21 20:55:42 +01:00
Alan Tygel efff51c7a8 Translation string corrected > 1 user 2016-12-21 16:34:24 -03:00
Bjoern Schiessle a1d6f3068a make code more robust
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 18:02:19 +01:00
Bjoern Schiessle 60810b44bc check for class name in case class is not loaded
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:50 +01:00
Bjoern Schiessle 0e4eeab3c1 add a copy to the owners trash bin if another user moves a file out of a shared folder
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:47 +01:00
Morris Jobke d5036fd4af Merge pull request #2792 from nextcloud/update-drone-images
update drone images to latest version
2016-12-21 15:52:51 +01:00
Morris Jobke d498d0982e Hide update notification if notification center is enabled
* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-21 15:44:06 +01:00
Morris Jobke 430b4718fb Merge pull request #2796 from nextcloud/set-exit-code-to-1-if-test-is-failing
Set exit code to 1 if integration test is failing
2016-12-21 15:18:09 +01:00
Lukas Reschke 591b60d11c Merge pull request #2758 from nextcloud/only-one-dav-backend
Register only one dav backend
2016-12-21 13:03:48 +01:00
Lukas Reschke 091bf07385 Merge pull request #2724 from nextcloud/fix-23591
[downstream] Report failures for SignApp and SignCore
2016-12-21 13:03:13 +01:00
Lukas Reschke 0d138c8591 Merge pull request #2784 from nextcloud/2fa_command_tests
Add tests for 2FA commands
2016-12-21 12:32:36 +01:00
Nextcloud bot fe9a38d5b5 [tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Lukas Reschke 7efc6b2614 Set exit code to 1 if integration test is failing
Before it just checked the unit tests and ignored the integration test results. See https://drone.nextcloud.com/nextcloud/server/3374/35 for details.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 23:40:49 +01:00
Morris Jobke 2fc9265b03 update drone images to latest version
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-20 23:34:14 +01:00
Morris Jobke e3dfe2cba7 Merge pull request #2790 from nextcloud/update-integration-test-image
Update integration test image
2016-12-20 23:24:18 +01:00
Lukas Reschke f0bb62f2fe Merge pull request #2273 from nextcloud/fix_invalid_calendar
Add DAV repair step to fix calendar data
2016-12-20 23:09:27 +01:00
Lukas Reschke 07b0bcda39 Merge pull request #2789 from nextcloud/add-smb-tests
Add SMB tests execution and execute files_external tests
2016-12-20 23:03:13 +01:00
Lukas Reschke d32e0d57e0 Run coverage
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 22:25:49 +01:00
Lukas Reschke 1c80307537 Add SMB tests and execute files_external tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 22:05:33 +01:00
Lukas Reschke d37bc304f1 Update integration test image
Updates the composer dependencies so running the tests should now be faster again…

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 21:56:16 +01:00
Lukas Reschke d7b3402643 Merge pull request #2719 from nextcloud/behat-transferownership
[downstream] Behat transferownership
2016-12-20 21:50:19 +01:00
Morris Jobke 4c315082e1 Merge pull request #2769 from nextcloud/improve_user_user_coverage
Improve OC\User\User coverage
2016-12-20 16:50:44 +01:00
Roeland Jago Douma 09caadac05 Add tests for 2FA commands
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 16:36:58 +01:00
Christoph Wurst d78b0fa891 Merge pull request #2765 from nextcloud/kill-repairlegacystorages
[downstream] Remove obsolete RepairLegacyStorages repair step
2016-12-20 15:43:27 +01:00
Christoph Wurst 88b7d033df fix 2fa activities tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-20 15:23:36 +01:00
Nextcloud bot f50252c7c1 [tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Roeland Jago Douma 7b4265ab59 Improve OC\User\User coverage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 11:47:08 +01:00
Lukas Reschke 089210f2df Merge pull request #2774 from nextcloud/fix-2585
remove frequent, unimportant log message
2016-12-20 11:03:54 +01:00
Joas Schilling e53d0c0d69 Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-20 09:32:47 +01:00
Roeland Jago Douma e9727440dd Only don't resolve public links
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-20 08:52:46 +01:00
Lukas Reschke 5983c68462 Don't resolve public share token if public sharing is disabled
Otherwise disabling sharing does prevent access to the view controllers but one can still access the shares using the public preview route or the public WebDAV endpoint.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 08:52:46 +01:00
Arthur Schiwon 7887566cff remove frequent, unimportant log message
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-19 23:36:11 +01:00
Christoph Wurst 084bddf8ae Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort
[downstream] When grouping shares, sort by stime then id (#26777)
2016-12-19 21:40:42 +01:00
Lukas Reschke 1287e624dd Merge pull request #2762 from nextcloud/add-js-computerFileSize
[downstream] Add js computer file size
2016-12-19 20:01:22 +01:00
Lukas Reschke 6947410b6f Update autoloader files
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 19:46:18 +01:00
Vincent Petry 252eddadd9 Remove obsolete RepairLegacyStorages repair step
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:45:46 +01:00
Vincent Petry 322b8ba138 Fix finding transferred folder in integration tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:41:11 +01:00
Vincent Petry 000ba6484f When grouping shares, sort by stime then id (#26777)
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Lukas Reschke 450373fd18 Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:55 +01:00
Michael Jobst a7526b9837 Style modifications of favorite star on main detail view (#26658)
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:09 +01:00
Patrick Paysant d4c088cb79 Verify input, add more unit tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:20 +01:00
Patrick Paysant ec4bca619d Add test for unparseable string
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:13 +01:00
Patrick Paysant ff018d48cf Implements all comments from @PVince81
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:29:05 +01:00
Patrick Paysant 6217393d6a Adding computerFileSize in OC.Util
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:28:58 +01:00
Lukas Reschke 1afdce9ef8 Merge pull request #2757 from nextcloud/cron-5.6
Also check in cron for old php version
2016-12-19 17:22:10 +01:00
Vincent Petry 9473ab5c19 Remove config change hook that deletes link shares (#26612)
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.

A future cleanup could be done through a background job.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Lukas Reschke 29a1ebc362 Adjust integration test to Nextcloud branding
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:12:17 +01:00
Thomas Müller 04cf77120c Fix error when $view is null when being passed into some plugins
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:53:13 +01:00
Thomas Müller 6345748a70 Fix "Call to a member function getUID() on null"
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:18 +01:00
Thomas Müller b19aad88fb No challenge within federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Thomas Müller 4a823188a9 Allow registration of federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
Thomas Citharel dcbf434841 Register only one dav auth backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
Vincent Petry 734e55da95 Add test for duplicate 401 headers on DAV
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:25 +01:00
Lukas Reschke 2ae15ad37b Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space
Use a form so firefox doesn't try to save the space as a password
2016-12-19 15:38:45 +01:00
Lukas Reschke 3eb3e437c8 Add proper tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:35:31 +01:00
Roeland Jago Douma 1741fe0310 Also check in cron for old php version
Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-19 15:31:24 +01:00
Christoph Wurst 3f4ba2d15d fix typo
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 15:01:23 +01:00
Robin Appelman 16a55d5521 Merge pull request #2754 from nextcloud/activities-manager-publish-exception
Activities IManager throws an BadMethodCallException
2016-12-19 15:00:17 +01:00
Lukas Reschke 34fb313466 Merge pull request #2689 from andreas-p/fix-remote-conflict
Fix showConflict
2016-12-19 14:34:56 +01:00
Christoph Wurst d5ad642d18 Activities IManager throws an BadMethodCallException
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 14:15:19 +01:00
Lukas Reschke 7b5c28ab2a Adjust to Nextcloud changes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 14:10:13 +01:00
Vincent Petry 55bf9e3f71 Add transfer ownership integration tests (#26543)
* Add transfer ownership integration tests

* Added more transfer ownership tests and OCC checks

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 14:10:12 +01:00
Joas Schilling eed0eaeb86 Use a form so firefox doesn't try to save the space as a password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-19 12:43:31 +01:00
Christoph Wurst 5bad93472d catch specific BadMethodCallException
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 12:01:32 +01:00
Christoph Wurst ed4017dfb4 fix minor issues
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:48 +01:00
Christoph Wurst 9300312046 push activity when backup codes are generated
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Christoph Wurst 7ae9442f3d Publish, parse and filter 2FA activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Roeland Jago Douma 9b71ee27ff Merge pull request #2727 from nextcloud/fix-colon-issue
[downstream] Fix colon issue
2016-12-19 10:19:15 +01:00
Roeland Jago Douma 4f79d2ff0d Merge pull request #2721 from nextcloud/ocs-die-on-exception
[downstream] Die in OCS v1.php on exception
2016-12-19 08:38:02 +01:00
Roeland Jago Douma f54547ff1c Merge pull request #2723 from nextcloud/integrity-exit-code
[downstream] Return 1 if integrity check is failed. Fixes #22806
2016-12-19 08:37:43 +01:00
pflug c7fc010215 Fix showConflict
use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
2016-12-19 08:11:04 +01:00
Christoph Wurst 8a21fc0908 Merge pull request #2726 from nextcloud/check-all-channels
[downstream] Consider all channel except blank and git to be signed
2016-12-18 23:12:57 +01:00
Christoph Wurst c80465a68c Merge pull request #2735 from nextcloud/fix-settingsmenu
Adjust shadows and fix positioning in header menus
2016-12-18 20:50:20 +01:00
Julius Haertl 1ad3613307 Adjust shadows and fix positioning
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-17 20:06:19 +01:00
Lukas Reschke ad725de9ad Update third-party ref for new sabre/uri version
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-17 19:42:47 +01:00
Roeland Jago Douma a60479a3d3 Merge pull request #2725 from nextcloud/memcached-connect-once
[downstream] Set options, then add servers
2016-12-17 19:31:31 +01:00
Roeland Jago Douma abf302bef8 Merge pull request #2722 from nextcloud/failed-to-create-share-fix
[downstream] commit transaction after select query
2016-12-17 19:28:54 +01:00
Roeland Jago Douma dfc17c9ae1 Merge pull request #2720 from nextcloud/fix-25692
[downstream] Do not validate return code is set is successful
2016-12-17 19:27:23 +01:00
Vincent Petry 553883a1f4 Add integration test for creating folder with colon
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 18:16:35 +01:00
Victor Dubiniuk 852de31ecb Consider all channel except blank and git to be signed
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 18:07:30 +01:00
Victor Dubiniuk 46a7cb493f Set options, then add servers
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:56:39 +01:00
Victor Dubiniuk e536313451 Update tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:51:03 +01:00
Victor Dubiniuk 876754a5a5 Check return value for file_put_contents. Add return value to the commands
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:50:58 +01:00
Victor Dubiniuk 93a8eba137 Return 1 if integrity check is failed. Fixes #22806
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:48:37 +01:00
phisch fc67606d39 commit transaction after select query
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:44:33 +01:00
Vincent Petry 00f135d320 Die in OCS v1.php on exception
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:35:42 +01:00
Victor Dubiniuk c5754a5ec5 Do not validate return code is set is successful
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-16 17:33:28 +01:00
Lukas Reschke b0c1460a1d Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade
Clear appstore cache on version upgrade
2016-12-16 17:14:53 +01:00
Roeland Jago Douma f86f4eb98d Merge pull request #2504 from nextcloud/downstream-ldap-15
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Lukas Reschke 00b4dedef5 Merge pull request #2550 from nextcloud/smb-notify-rename
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke 058b536aea Merge pull request #2714 from amittel/patch-1
Changed anchor
2016-12-16 15:52:06 +01:00
Lukas Reschke 511056dd3f Merge pull request #1678 from nextcloud/smb-stat-root
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Lukas Reschke 9aef75cb36 Merge pull request #2398 from nextcloud/fix-2368
flicker-free permission change in share dialog
2016-12-16 13:35:33 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Roeland Jago Douma 09d5c557e7 Merge pull request #2715 from nextcloud/fix_dav_toto_tests
Fix TodoTest
2016-12-16 12:42:11 +01:00
Roeland Jago Douma 82d76fbe96 Fix TodoTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-16 11:50:50 +01:00
amittel 14541683e3 Changed anchor
from `avatar` to `personal-settings`

fixes #2711
2016-12-16 10:51:01 +01:00
Roeland Jago Douma 4fdefef7e8 Merge pull request #2625 from nextcloud/fix-todo-filter
Fix the Todos filter
2016-12-16 08:20:00 +01:00
Roeland Jago Douma 40e0c49b04 Merge pull request #2681 from nextcloud/changes-to-changelog
let's add a date :D
2016-12-16 08:14:29 +01:00
Roeland Jago Douma 245501fb0c Clear appstore cache on version upgrade
* Add version to cached json
* Compare version
* Updated calls
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-15 22:04:03 +01:00
Jos Poortvliet 46a2e938b3 let's add a date :D
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-15 20:35:42 +01:00
Lukas Reschke ee9f46b13f Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7
Don't disable apps on update if PHP >= 7.0.0
2016-12-15 18:31:54 +01:00
Lukas Reschke 776f5bcd34 Don't disable apps on update if PHP >= 7.0.0
When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates.

This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-15 16:09:01 +01:00
Lukas Reschke 5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling 6de0eb0b74 Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Robin Appelman b8d44c21ca Add integration tests for uploading files to a permission limited share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-15 14:31:40 +01:00
Roeland Jago Douma 3714a6aaf0 Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-before-creating-it
Do not connect to database before creating it
2016-12-14 19:50:16 +01:00
Morris Jobke 237791e315 Merge pull request #2674 from nextcloud/lookup-server-connector-12
mark nc12 as supported for the lookup_server_connector
2016-12-14 12:31:27 -06:00
Roeland Jago Douma 67f65677a1 Merge pull request #2665 from nextcloud/remove-db-class-and-interface
Remove IDb interface which was deprecated for 3 years already
2016-12-14 19:05:41 +01:00
Roeland Jago Douma e9628124f6 Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-database-user-creation
Only log as info when we can not create a new DB user
2016-12-14 19:05:15 +01:00
Robin Appelman fc3b2f1139 mark nc12 as supporter
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 11:58:57 -06:00
Roeland Jago Douma 00bd971272 Merge pull request #2677 from nextcloud/fix-avatars-in-mail
Don't set Content-Disposition header if one already exists
2016-12-14 18:55:52 +01:00
Lukas Reschke 8a00638425 Don't set Content-Disposition header if one already exists
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-14 17:35:27 +01:00
Robin Appelman 5d0897b8d7 use unmasked permissions in shared scanner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Joas Schilling e1b806467c Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions
Safari CSPv3 support is sub-par
2016-12-14 14:20:03 +01:00
Joas Schilling 9a5401ddd7 Only log as info when we can not create a new DB user
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 14:06:14 +01:00
Joas Schilling 7c061a4e06 Do not connect to database before creating it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 13:52:04 +01:00
Lukas Reschke 7d221ff8f4 Safari CSPv3 support is sub-par
With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome.

=> Let's remove this for Safari and keep chrome and Firefox in the whitelist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-14 13:17:20 +01:00
Joas Schilling bc3da3a8f5 Remove IDb interface which was deprecated for 3 years already
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 11:42:16 +01:00
Roeland Jago Douma cd1929382f Merge pull request #2654 from nextcloud/increase-master-version
Update app versions and requirements
2016-12-14 11:20:58 +01:00
Joas Schilling 77b6b7b23e Use the mocked config version
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 10:45:27 +01:00
Roeland Jago Douma 4f96fcfb9d Merge pull request #2659 from nextcloud/fix_2641
Fix overwriting parameter
2016-12-14 10:36:05 +01:00
Roeland Jago Douma 9e353f6289 Fix overwriting parameter
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Joas Schilling 4f32a8b6ef Increase server version
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:44:00 +01:00
Joas Schilling edec1fafe7 Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Joas Schilling 03b648be13 Merge pull request #2643 from nextcloud/apps-buttons-wording
fix wording for apps mgmt buttons
2016-12-13 15:49:38 +01:00
Jan-Christoph Borchardt 89252497c6 fix wording for apps mgmt buttons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-13 13:19:10 +01:00
Joas Schilling 7293a4e5ec Allow to reuse the same name when installing a new instance
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-12 17:28:57 +01:00
Joas Schilling 89ba394c89 Fix the Todos filter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-12 15:26:28 +01:00
Bjoern Schiessle 16bbd3fd7c fix password reset if encryption is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-08 12:08:05 +01:00
Arthur Schiwon f29f4d9c3a fix rendering for mail shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-08 10:29:51 +01:00
Arthur Schiwon 3ac8d422de disable checkboxes during save op to avoid race conditions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-08 10:29:51 +01:00
Arthur Schiwon 056e59af7e fix some coding style and stricter comparisons, makes scrutinizer happier
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-08 10:29:51 +01:00
Arthur Schiwon 39c2d9e663 also handle can-edit change
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-08 10:29:51 +01:00
Arthur Schiwon 2514176e41 flicker-free permission change in share dialog
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-08 10:29:51 +01:00
Robin Appelman b5401adc00 Fix order of parameters when getting notified of smb renames
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-07 16:25:10 +01:00
Joas Schilling 9ea432f88c Adjust the JS unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-06 17:50:57 +01:00
Joas Schilling b8e9d255d3 Only allow admins to delete tags
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-06 16:30:21 +01:00
Arthur Schiwon 0c8e4b91d3 adjust: sanitizeDN resides in Helper
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:36:20 +01:00
Juan Pablo Villafáñez efa1077872 Extract lowercase conversion out of the loop
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:47 +01:00
Arthur Schiwon 6496b95564 range support for LDAP read operations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-05 11:29:16 +01:00
Roeland Jago Douma 6f5316e443 Add DAV repair step to fix calendar data
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-24 20:31:01 +01:00
Robin Appelman 85bd5589cb Fix mtimes for share root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-11 11:09:05 +02:00
4946 changed files with 288511 additions and 186573 deletions
+4 -3
View File
@@ -5,7 +5,8 @@ coverage:
precision: 2
round: down
range: "70...100"
status:
project: off
patch: off
comment:
layout: "header, diff, changes, uncovered, tree"
behavior: default
comment: off
+331 -88
View File
@@ -1,7 +1,9 @@
pipeline:
clone:
clone:
git:
image: plugins/git
depth: 1
pipeline:
jsunit:
image: nextcloudci/jsunit:jsunit-5
commands:
@@ -12,42 +14,15 @@ pipeline:
when:
matrix:
TESTS: jsunit
check-autoloader:
image: nextcloudci/php7.0:php7.0-6
checkers:
image: nextcloudci/php7.0:php7.0-16
commands:
- bash ./build/autoloaderchecker.sh
- ./autotest-checkers.sh
when:
matrix:
TESTS: check-autoloader
app-check-code:
image: nextcloudci/php7.0:php7.0-6
commands:
- ./occ app:check-code admin_audit
- ./occ app:check-code comments
- ./occ app:check-code federation
- ./occ app:check-code sharebymail
- ./occ app:check-code systemtags
- ./occ app:check-code theming
- ./occ app:check-code workflowengine
when:
matrix:
TESTS: app-check-code
signed-off-check:
image: nextcloudci/php7.0:php7.0-6
commands:
- php ./build/signed-off-checker.php
when:
matrix:
TESTS: signed-off-check
htaccess-checker:
image: nextcloudci/php7.0:php7.0-6
commands:
- php ./build/htaccess-checker.php
when:
matrix:
TESTS: htaccess-checker
TESTS: checkers
syntax-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -55,7 +30,7 @@ pipeline:
matrix:
TESTS: syntax-php5.6
syntax-php7.0:
image: nextcloudci/php7.0:php7.0-6
image: nextcloudci/php7.0:php7.0-16
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -63,7 +38,7 @@ pipeline:
matrix:
TESTS: syntax-php7.0
syntax-php7.1:
image: nextcloudci/php7.1:php7.1-11
image: nextcloudci/php7.1:php7.1-15
commands:
- composer install
- ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
@@ -71,7 +46,7 @@ pipeline:
matrix:
TESTS: syntax-php7.1
litmus-v1:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/litmus-v1/script.sh
@@ -79,33 +54,90 @@ pipeline:
matrix:
TESTS: litmus-v1
litmus-v2:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/litmus-v2/script.sh
when:
matrix:
TESTS: litmus-v2
caldavtester:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
caldavtester-new-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/caldav/install.sh
- bash apps/dav/tests/travis/caldav/script.sh
- bash apps/dav/tests/travis/caldav/script-new-endpoint.sh
when:
matrix:
TESTS: caldavtester
carddavtester:
image: nextcloudci/litmus-php7.0:litmus-php7.0-4
TESTS: caldavtester-new-endpoint
caldavtester-old-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/caldav/install.sh
- bash apps/dav/tests/travis/caldav/script-old-endpoint.sh
when:
matrix:
TESTS: caldavtester-old-endpoint
carddavtester-new-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/carddav/install.sh
- bash apps/dav/tests/travis/carddav/script.sh
- bash apps/dav/tests/travis/carddav/script-new-endpoint.sh
when:
matrix:
TESTS: carddavtester
TESTS: carddavtester-new-endpoint
carddavtester-old-endpoint:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
- bash tests/travis/install.sh sqlite
- bash apps/dav/tests/travis/carddav/install.sh
- bash apps/dav/tests/travis/carddav/script-old-endpoint.sh
when:
matrix:
TESTS: carddavtester-old-endpoint
sqlite-php7.0-samba-native:
image: nextcloudci/samba-native-php7.0:samba-native-php7.0-3
commands:
- smbd -D -FS &
- ./autotest-external.sh sqlite smb-linux
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-samba-native
sqlite-php7.0-samba-non-native:
image: nextcloudci/samba-non-native-php7.0:samba-non-native-php7.0-4
commands:
- smbd -D -FS &
- ./autotest-external.sh sqlite smb-linux
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-samba-non-native
sqlite-php7.0-webdav-apache:
image: nextcloudci/webdav-apache-php7.0
commands:
- apache2
- ./autotest-external.sh sqlite webdav-apachedrone
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-webdav-apachedrone.xml; fi"
when:
matrix:
TESTS: sqlite-php7.0-webdav-apache
nodb-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
@@ -113,7 +145,7 @@ pipeline:
DB: NODB
PHP: 5.6
nodb-php7.0:
image: nextcloudci/php7.0:php7.0-6
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
@@ -121,7 +153,7 @@ pipeline:
DB: NODB
PHP: "7.0"
nodb-php7.1:
image: nextcloudci/php7.1:php7.1-11
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
@@ -129,7 +161,7 @@ pipeline:
DB: NODB
PHP: 7.1
sqlite-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
@@ -137,7 +169,7 @@ pipeline:
DB: sqlite
PHP: 5.6
sqlite-php7.0:
image: nextcloudci/php7.0:php7.0-6
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
@@ -145,15 +177,16 @@ pipeline:
DB: sqlite
PHP: "7.0"
sqlite-php7.1:
image: nextcloudci/php7.1:php7.1-11
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 7.1
mysql-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
@@ -161,7 +194,7 @@ pipeline:
DB: mysql
PHP: 5.6
postgres-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- sleep 10 # gives the database enough time to initialize
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
@@ -170,7 +203,7 @@ pipeline:
DB: postgres
PHP: 5.6
mysqlmb4-php5.6:
image: nextcloudci/php5.6:php5.6-7
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
@@ -178,7 +211,7 @@ pipeline:
DB: mysqlmb4
PHP: 5.6
integration-capabilities_features:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -187,7 +220,7 @@ pipeline:
matrix:
TESTS: integration-capabilities_features
integration-federation_features:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -196,7 +229,7 @@ pipeline:
matrix:
TESTS: integration-federation_features
integration-auth:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -204,8 +237,32 @@ pipeline:
when:
matrix:
TESTS: integration-auth
integration-maintenance-mode:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/maintenance-mode.feature
when:
matrix:
TESTS: integration-maintenance-mode
integration-ratelimiting:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ config:system:set redis host --value=cache
- ./occ config:system:set redis port --value=6379 --type=integer
- ./occ config:system:set redis timeout --value=0 --type=integer
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
- ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
- ./occ app:enable testing
- cd build/integration
- ./run.sh features/ratelimiting.feature
when:
matrix:
TESTS: integration-ratelimiting
integration-carddav:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -214,7 +271,7 @@ pipeline:
matrix:
TESTS: integration-carddav
integration-dav-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -223,7 +280,7 @@ pipeline:
matrix:
TESTS: integration-dav-v2
integration-ocs-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -232,7 +289,7 @@ pipeline:
matrix:
TESTS: integration-ocs-v1
integration-sharing-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -240,8 +297,26 @@ pipeline:
when:
matrix:
TESTS: integration-sharing-v1
integration-sharing-v1-part2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/sharing-v1-part2.feature
when:
matrix:
TESTS: integration-sharing-v1-part2
integration-sharing-v1-part3:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/sharing-v1-part3.feature
when:
matrix:
TESTS: integration-sharing-v1-part3
integration-checksums-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -250,7 +325,7 @@ pipeline:
matrix:
TESTS: integration-checksums
integration-external-storage:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -259,7 +334,7 @@ pipeline:
matrix:
TESTS: integration-external-storage
integration-provisioning-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -268,7 +343,7 @@ pipeline:
matrix:
TESTS: integration-provisioning-v1
integration-tags:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -277,7 +352,7 @@ pipeline:
matrix:
TESTS: integration-tags
integration-caldav:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -286,7 +361,7 @@ pipeline:
matrix:
TESTS: integration-caldav
integration-comments:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -295,7 +370,7 @@ pipeline:
matrix:
TESTS: integration-comments
integration-favorites:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -304,7 +379,7 @@ pipeline:
matrix:
TESTS: integration-favorites
integration-provisioning-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -313,7 +388,7 @@ pipeline:
matrix:
TESTS: integration-provisioning-v2
integration-webdav-related:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -322,7 +397,7 @@ pipeline:
matrix:
TESTS: integration-webdav-related
integration-sharees-features:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -330,8 +405,17 @@ pipeline:
when:
matrix:
TESTS: integration-sharees-features
integration-sharees-v2-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh sharees_features/sharees_provisioningapiv2.feature
when:
matrix:
TESTS: integration-sharees-v2-features
integration-setup-features:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- cd build/integration
- ./run.sh setup_features/setup.feature
@@ -339,7 +423,7 @@ pipeline:
matrix:
TESTS: integration-setup-features
integration-filesdrop-features:
image: nextcloudci/integration-php7.0:integration-php7.0-2
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
@@ -347,9 +431,66 @@ pipeline:
when:
matrix:
TESTS: integration-filesdrop-features
nodb-codecov:
image: nextcloudci/php7.0:php7.0-6
integration-transfer-ownership-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/transfer-ownership.feature
when:
matrix:
TESTS: integration-transfer-ownership-features
integration-ldap-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ app:enable user_ldap
- cd build/integration
- ./run.sh ldap_features/ldap-ocs.feature
when:
matrix:
TESTS: integration-ldap-features
integration-trashbin:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- cd build/integration
- ./run.sh features/trashbin.feature
when:
matrix:
TESTS: integration-trashbin
acceptance-access-levels:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature
when:
matrix:
TESTS-ACCEPTANCE: access-levels
acceptance-app-files:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature
when:
matrix:
TESTS-ACCEPTANCE: app-files
acceptance-app-theming:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature
when:
matrix:
TESTS-ACCEPTANCE: app-theming
acceptance-login:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature
when:
matrix:
TESTS-ACCEPTANCE: login
nodb-codecov:
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=NODB ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
@@ -358,8 +499,9 @@ pipeline:
matrix:
TESTS: nodb-codecov
db-codecov:
image: nextcloudci/php7.0:php7.0-6
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=QUICKDB ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
@@ -367,19 +509,60 @@ pipeline:
when:
matrix:
TESTS: db-codecov
object-store:
image: nextcloudci/php7.0:php7.0-16
commands:
- phpenmod xdebug
- TEST_SELECTION=PRIMARY-${OBJECT_STORE} ./autotest.sh sqlite
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TESTS: object-store
memcache-memcached:
image: nextcloudci/php7.0-memcached:php7.0-memcached-8
commands:
- phpenmod xdebug
- service memcached restart
- ./autotest.sh sqlite tests/lib/Memcache/MemcachedTest.php
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TEST: memcache-memcached
memcache-redis-cluster:
image: nextcloudci/php7.0:php7.0-17
commands:
- phpenmod xdebug
- sleep 20
- ./autotest.sh sqlite tests/lib/Memcache/RedisTest.php
- wget https://codecov.io/bash -O codecov.sh
- sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
- sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-clover-sqlite.xml; fi"
when:
matrix:
TEST: memcache-redis-cluster
matrix:
include:
- TESTS: signed-off-check
- TESTS: htaccess-checker
- TESTS: checkers
- TESTS: nodb-codecov
- TESTS: db-codecov
ENABLE_REDIS: true
- TESTS: db-codecov
ENABLE_REDIS: true
- TESTS: integration-capabilities_features
- TESTS: integration-federation_features
- TESTS: integration-maintenance-mode
- TESTS: integration-ratelimiting
ENABLE_REDIS: true
- TESTS: integration-auth
- TESTS: integration-carddav
- TESTS: integration-dav-v2
- TESTS: integration-ocs-v1
- TESTS: integration-sharing-v1
- TESTS: integration-sharing-v1-part2
- TESTS: integration-sharing-v1-part3
- TESTS: integration-checksums
- TESTS: integration-external-storage
- TESTS: integration-provisioning-v1
@@ -390,66 +573,126 @@ matrix:
- TESTS: integration-provisioning-v2
- TESTS: integration-webdav-related
- TESTS: integration-sharees-features
- TESTS: integration-sharees-v2-features
- TESTS: integration-setup-features
- TESTS: integration-filesdrop-features
- TESTS: integration-transfer-ownership-features
- TESTS: integration-ldap-features
- TESTS: integration-trashbin
- TESTS: acceptance
TESTS-ACCEPTANCE: access-levels
- TESTS: acceptance
TESTS-ACCEPTANCE: app-files
- TESTS: acceptance
TESTS-ACCEPTANCE: app-theming
- TESTS: acceptance
TESTS-ACCEPTANCE: login
- TESTS: jsunit
- TESTS: check-autoloader
- TESTS: app-check-code
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
- TESTS: syntax-php7.1
- TESTS: litmus-v1
- TESTS: litmus-v2
- TESTS: caldavtester
- TESTS: carddavtester
- TESTS: caldavtester-old-endpoint
- TESTS: caldavtester-new-endpoint
- TESTS: carddavtester-new-endpoint
- TESTS: carddavtester-old-endpoint
- TESTS: object-store
OBJECT_STORE: s3
- TESTS: sqlite-php7.0-samba-native
- TESTS: sqlite-php7.0-samba-non-native
- TEST: memcache-memcached
- TEST: memcache-redis-cluster
ENABLE_REDIS_CLUSTER: true
- TESTS: sqlite-php7.0-webdav-apache
ENABLE_REDIS: true
- DB: NODB
PHP: 5.6
ENABLE_REDIS: true
- DB: NODB
PHP: 7.0
ENABLE_REDIS: true
- DB: NODB
PHP: 7.1
ENABLE_REDIS: true
- DB: sqlite
PHP: 5.6
ENABLE_REDIS: true
- DB: sqlite
PHP: 7.0
ENABLE_REDIS: true
- DB: sqlite
PHP: 7.1
ENABLE_REDIS: true
- DB: mysql
PHP: 5.6
ENABLE_REDIS: true
- DB: postgres
PHP: 5.6
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 5.6
ENABLE_REDIS: true
services:
cache:
image: redis
when:
matrix:
ENABLE_REDIS: true
cache-cluster:
image: morrisjobke/redis-cluster
when:
matrix:
ENABLE_REDIS_CLUSTER: true
postgres:
image: postgres
image: postgres:9
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_PASSWORD=oc_autotest
- POSTGRES_PASSWORD=owncloud
tmpfs:
- /var/lib/postgresql/data
when:
matrix:
DB: postgres
mysql:
image: mysql
image: mysql:5.7.22
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysql
mysqlmb4:
image: mysql
image: mysql:5.7.22
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysqlmb4
fake-s3:
image: lphoward/fake-s3
when:
matrix:
OBJECT_STORE: s3
selenium:
image: selenium/standalone-firefox:2.53.1-beryllium
environment:
# Reduce default log level for Selenium server (INFO) as it is too
# verbose.
- JAVA_OPTS=-Dselenium.LOGGER.level=WARNING
when:
matrix:
TESTS: acceptance
branches: [ master, stable* ]
+4 -1
View File
@@ -8,6 +8,8 @@
/apps/inc.php
/assets
/.htaccess
/translationfiles
/translationtool.phar
# ignore all apps except core ones
/apps*/*
@@ -24,6 +26,7 @@
!/apps/files_versions
!/apps/lookup_server_connector
!/apps/user_ldap
!/apps/oauth2
!/apps/provisioning_api
!/apps/systemtags
!/apps/testing
@@ -40,7 +43,6 @@
/apps/files_external/tests/config.*.php
# ignore themes except the example and the README
/themes/*
!/themes/example
@@ -124,6 +126,7 @@ Vagrantfile
# Tests - auto-generated files
/data-autotest
/tests/coverage*
/tests/css
/tests/karma-coverage
/tests/autoconfig*
/tests/autotest*
+3 -2
View File
@@ -14,7 +14,6 @@
Header set X-Content-Type-Options "nosniff"
Header set X-XSS-Protection "1; mode=block"
Header set X-Robots-Tag "none"
Header set X-Frame-Options "SAMEORIGIN"
Header set X-Download-Options "noopen"
Header set X-Permitted-Cross-Domain-Policies "none"
SetEnv modHeadersAvailable true
@@ -55,6 +54,8 @@
</IfModule>
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTP_USER_AGENT} DavClnt
RewriteRule ^$ /remote.php/webdav/ [L,R=302]
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
@@ -62,7 +63,7 @@
RewriteRule ^\.well-known/caldav /remote.php/dav/ [R=301,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
RewriteRule ^(?:build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge/.*
RewriteCond %{REQUEST_URI} !^/.well-known/(acme-challenge|pki-validation)/.*
RewriteRule ^(?:\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
</IfModule>
<IfModule mod_mime.c>
+6 -2
View File
@@ -25,6 +25,10 @@
"PVince81",
"scrutinizer-auto-fixer",
"th3fallen",
"zander"
]
"zander",
"luckydonald",
"jancborchardt"
],
"createReviewRequest": true,
"createComment": false
}
+129
View File
@@ -0,0 +1,129 @@
[main]
host = https://www.transifex.com
lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
[nextcloud.core]
file_filter = translationfiles/<lang>/core.po
source_file = translationfiles/templates/core.pot
source_lang = en
type = PO
[nextcloud.files]
file_filter = translationfiles/<lang>/files.po
source_file = translationfiles/templates/files.pot
source_lang = en
type = PO
[nextcloud.settings-1]
file_filter = translationfiles/<lang>/settings.po
source_file = translationfiles/templates/settings.pot
source_lang = en
type = PO
[nextcloud.lib]
file_filter = translationfiles/<lang>/lib.po
source_file = translationfiles/templates/lib.pot
source_lang = en
type = PO
[nextcloud.dav]
file_filter = translationfiles/<lang>/dav.po
source_file = translationfiles/templates/dav.pot
source_lang = en
type = PO
[nextcloud.files_encryption]
file_filter = translationfiles/<lang>/encryption.po
source_file = translationfiles/templates/encryption.pot
source_lang = en
type = PO
[nextcloud.files_external]
file_filter = translationfiles/<lang>/files_external.po
source_file = translationfiles/templates/files_external.pot
source_lang = en
type = PO
[nextcloud.files_sharing]
file_filter = translationfiles/<lang>/files_sharing.po
source_file = translationfiles/templates/files_sharing.pot
source_lang = en
type = PO
[nextcloud.files_trashbin]
file_filter = translationfiles/<lang>/files_trashbin.po
source_file = translationfiles/templates/files_trashbin.pot
source_lang = en
type = PO
[nextcloud.files_versions]
file_filter = translationfiles/<lang>/files_versions.po
source_file = translationfiles/templates/files_versions.pot
source_lang = en
type = PO
[nextcloud.user_ldap]
file_filter = translationfiles/<lang>/user_ldap.po
source_file = translationfiles/templates/user_ldap.pot
source_lang = en
type = PO
[nextcloud.comments]
file_filter = translationfiles/<lang>/comments.po
source_file = translationfiles/templates/comments.pot
source_lang = en
type = PO
[nextcloud.federatedfilesharing]
file_filter = translationfiles/<lang>/federatedfilesharing.po
source_file = translationfiles/templates/federatedfilesharing.pot
source_lang = en
type = PO
[nextcloud.federation]
file_filter = translationfiles/<lang>/federation.po
source_file = translationfiles/templates/federation.pot
source_lang = en
type = PO
[nextcloud.oauth2]
file_filter = translationfiles/<lang>/oauth2.po
source_file = translationfiles/templates/oauth2.pot
source_lang = en
type = PO
[nextcloud.sharebymail]
file_filter = translationfiles/<lang>/sharebymail.po
source_file = translationfiles/templates/sharebymail.pot
source_lang = en
type = PO
[nextcloud.systemtags]
file_filter = translationfiles/<lang>/systemtags.po
source_file = translationfiles/templates/systemtags.pot
source_lang = en
type = PO
[nextcloud.updatenotification]
file_filter = translationfiles/<lang>/updatenotification.po
source_file = translationfiles/templates/updatenotification.pot
source_lang = en
type = PO
[nextcloud.theming]
file_filter = translationfiles/<lang>/theming.po
source_file = translationfiles/templates/theming.pot
source_lang = en
type = PO
[nextcloud.twofactor_backupcodes]
file_filter = translationfiles/<lang>/twofactor_backupcodes.po
source_file = translationfiles/templates/twofactor_backupcodes.pot
source_lang = en
type = PO
[nextcloud.workflowengine]
file_filter = translationfiles/<lang>/workflowengine.po
source_file = translationfiles/templates/workflowengine.pot
source_lang = en
type = PO
+1 -1
View File
@@ -1,7 +1,7 @@
ChangeLog
=========
NC 11 (????-??-??)
NC 11 (2016-12-13)
------------------
* PHP 5.4 and 5.5 no longer supported
* PHP 7.1 support
+1 -1
View File
@@ -58,7 +58,7 @@ like `git config --global alias.ci 'commit -s'`. Now you can commit with
In case you are not sure how to add or update the license header correctly please have a look at [contribute/HowToApplyALicense.md][applyalicense]
[devmanual]: https://docs.nextcloud.org/server/11/developer_manual/
[devmanual]: https://docs.nextcloud.org/server/12/developer_manual/
[dcofile]: https://github.com/nextcloud/server/blob/master/contribute/developer-certificate-of-origin
[applyalicense]: https://github.com/nextcloud/server/blob/master/contribute/HowToApplyALicense.md
+9 -2
View File
@@ -1,6 +1,7 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
@@ -25,6 +26,12 @@
$logger = \OC::$server->getLogger();
$userSession = \OC::$server->getUserSession();
$groupManager = \OC::$server->getGroupManager();
$eventDispatcher = \OC::$server->getEventDispatcher();
$auditLogger = new \OCA\Admin_Audit\AuditLogger($logger, $userSession, $groupManager);
$auditLogger = new \OCA\Admin_Audit\AuditLogger(
$logger,
$userSession,
$groupManager,
$eventDispatcher
);
$auditLogger->registerHooks();
+3 -5
View File
@@ -2,14 +2,12 @@
<info>
<id>admin_audit</id>
<name>Auditing / Logging</name>
<description>Provides logging abilities for Nextcloud such as logging file
accesses or otherwise sensitive actions.
</description>
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
<licence>AGPL</licence>
<author>Nextcloud</author>
<version>1.1.0</version>
<version>1.2.0</version>
<dependencies>
<nextcloud min-version="11" max-version="11" />
<nextcloud min-version="12" max-version="12" />
</dependencies>
<types>
<logging/>
+27
View File
@@ -65,6 +65,10 @@ class Files extends Action {
* @param array $params
*/
public function create(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File created: "%s"',
$params,
@@ -96,6 +100,10 @@ class Files extends Action {
* @param array $params
*/
public function write(array $params) {
if ($params['path'] === '/' || $params['path'] === '' || $params['path'] === null) {
return;
}
$this->log(
'File written to: "%s"',
$params,
@@ -134,4 +142,23 @@ class Files extends Action {
]
);
}
/**
* Logs preview access to a file
*
* @param array $params
*/
public function preview(array $params) {
$this->log(
'Preview accessed: "%s" (width: "%s", height: "%s" crop: "%s", mode: "%s")',
$params,
[
'path',
'width',
'height',
'crop',
'mode'
]
);
}
}
@@ -4,6 +4,7 @@
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
* @license GNU AGPL version 3 or any later version
*
@@ -72,5 +73,36 @@ class GroupManagement extends Action {
]
);
}
/**
* log create group to group event
*
* @param IGroup $group
*/
public function createGroup(IGroup $group) {
$this->log('Group created: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
/**
* log delete group to group event
*
* @param IGroup $group
*/
public function deleteGroup(IGroup $group) {
$this->log('Group deleted: "%s"',
[
'group' => $group->getGID()
],
[
'group'
]
);
}
}
@@ -60,6 +60,23 @@ class UserManagement extends Action {
);
}
/**
* Log enabling of users
*
* @param array $params
*/
public function change(array $params) {
if ($params['feature'] === 'enabled') {
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
}
}
/**
* Logs changing of the user scope
*
+32 -11
View File
@@ -1,8 +1,11 @@
<?php
/**
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
* @copyright Copyright (c) 2017 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
* @license GNU AGPL version 3 or any later version
*
@@ -21,11 +24,10 @@
*
*/
namespace OCA\Admin_Audit;
use OC\Files\Filesystem;
use OC\Files\Node\File;
use OCA\Admin_Audit\Actions\Auth;
use OCA\Admin_Audit\Actions\Files;
use OCA\Admin_Audit\Actions\GroupManagement;
@@ -35,17 +37,17 @@ use OCA\Admin_Audit\Actions\UserManagement;
use OCA\Admin_Audit\Actions\Versions;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IPreview;
use OCP\IUserSession;
use OCP\Util;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
class AuditLogger {
/** @var ILogger */
private $logger;
/** @var IUserSession */
private $userSession;
/** @var IGroupManager */
private $groupManager;
@@ -55,17 +57,20 @@ class AuditLogger {
* @param ILogger $logger
* @param IUserSession $userSession
* @param IGroupManager $groupManager
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(ILogger $logger,
IUserSession $userSession,
IGroupManager $groupManager) {
IGroupManager $groupManager,
EventDispatcherInterface $eventDispatcher) {
$this->logger = $logger;
$this->userSession = $userSession;
$this->groupManager = $groupManager;
$this->eventDispatcher = $eventDispatcher;
}
/**
* register hooks in order to log them
* Register hooks in order to log them
*/
public function registerHooks() {
$this->userManagementHooks();
@@ -78,13 +83,14 @@ class AuditLogger {
}
/**
* connect to user management hooks
* Connect to user management hooks
*/
private function userManagementHooks() {
$userActions = new UserManagement($this->logger);
Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
$this->userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
}
@@ -92,6 +98,8 @@ class AuditLogger {
$groupActions = new GroupManagement($this->logger);
$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
$this->groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
$this->groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
$this->groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
}
/**
@@ -119,12 +127,25 @@ class AuditLogger {
Util::connectHook('OC_User', 'logout', $authActions, 'logout');
}
/**
* connect to file hooks
* Connect to file hooks
*/
private function fileHooks() {
$fileActions = new Files($this->logger);
$this->eventDispatcher->addListener(
IPreview::EVENT,
function(GenericEvent $event) use ($fileActions) {
/** @var File $file */
$file = $event->getSubject();
$fileActions->preview([
'path' => substr($file->getInternalPath(), 5),
'width' => $event->getArguments()['width'],
'height' => $event->getArguments()['height'],
'crop' => $event->getArguments()['crop'],
'mode' => $event->getArguments()['mode']
]);
}
);
Util::connectHook(
Filesystem::CLASSNAME,
@@ -177,7 +198,7 @@ class AuditLogger {
}
/**
* connect to trash bin hooks
* Connect to trash bin hooks
*/
private function trashbinHooks() {
$trashActions = new Trashbin($this->logger);
+1 -7
View File
@@ -26,13 +26,7 @@ $eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function() {
\OCP\Util::addScript('oc-backbone-webdav');
\OCP\Util::addScript('comments', 'app');
\OCP\Util::addScript('comments', 'commentmodel');
\OCP\Util::addScript('comments', 'commentcollection');
\OCP\Util::addScript('comments', 'commentsummarymodel');
\OCP\Util::addScript('comments', 'commentstabview');
\OCP\Util::addScript('comments', 'filesplugin');
\OCP\Util::addScript('comments', 'activitytabviewplugin');
\OCP\Util::addScript('comments', 'merged');
\OCP\Util::addStyle('comments', 'comments');
}
);
+2 -2
View File
@@ -6,9 +6,9 @@
<licence>AGPL</licence>
<author>Arthur Schiwon, Vincent Petry</author>
<default_enable/>
<version>1.1.0</version>
<version>1.2.0</version>
<dependencies>
<nextcloud min-version="11" max-version="11" />
<nextcloud min-version="12" max-version="12" />
</dependencies>
<types>
<logging/>
+6 -1
View File
@@ -54,7 +54,6 @@
#commentsTabView .comment {
position: relative;
z-index: 1;
margin-bottom: 30px;
}
@@ -108,8 +107,14 @@
vertical-align: middle;
}
#commentsTabView .authorRow>div.hidden {
display: none !important;
}
#commentsTabView .comments li .message .avatar-name-wrapper,
#commentsTabView .comment .authorRow {
position: relative;
cursor: pointer;
}
#commentsTabView .comment .author,
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" viewBox="0 0 32 32"><path fill="#000" d="M16 3C7.163 3 0 7.925 0 14s7.163 11 16 11c.5 0 .98-.032 1.47-.063L26 32v-9.406c3.658-2.017 6-5.12 6-8.595 0-6.076-7.164-11-16-11z"/></svg>

After

Width:  |  Height:  |  Size: 243 B

+24 -12
View File
@@ -9,7 +9,20 @@
*/
(function(OC, OCA) {
var NS_OWNCLOUD = 'http://owncloud.org/ns';
_.extend(OC.Files.Client, {
PROPERTY_FILEID: '{' + OC.Files.Client.NS_OWNCLOUD + '}id',
PROPERTY_MESSAGE: '{' + OC.Files.Client.NS_OWNCLOUD + '}message',
PROPERTY_ACTORTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorType',
PROPERTY_ACTORID: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorId',
PROPERTY_ISUNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}isUnread',
PROPERTY_OBJECTID: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectId',
PROPERTY_OBJECTTYPE: '{' + OC.Files.Client.NS_OWNCLOUD + '}objectType',
PROPERTY_ACTORDISPLAYNAME: '{' + OC.Files.Client.NS_OWNCLOUD + '}actorDisplayName',
PROPERTY_CREATIONDATETIME: '{' + OC.Files.Client.NS_OWNCLOUD + '}creationDateTime',
PROPERTY_MENTIONS: '{' + OC.Files.Client.NS_OWNCLOUD + '}mentions'
});
/**
* @class OCA.Comments.CommentModel
* @classdesc
@@ -27,16 +40,16 @@
},
davProperties: {
'id': '{' + NS_OWNCLOUD + '}id',
'message': '{' + NS_OWNCLOUD + '}message',
'actorType': '{' + NS_OWNCLOUD + '}actorType',
'actorId': '{' + NS_OWNCLOUD + '}actorId',
'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
'objectType': '{' + NS_OWNCLOUD + '}objectType',
'objectId': '{' + NS_OWNCLOUD + '}objectId',
'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
'mentions': '{' + NS_OWNCLOUD + '}mentions'
'id': OC.Files.Client.PROPERTY_FILEID,
'message': OC.Files.Client.PROPERTY_MESSAGE,
'actorType': OC.Files.Client.PROPERTY_ACTORTYPE,
'actorId': OC.Files.Client.PROPERTY_ACTORID,
'actorDisplayName': OC.Files.Client.PROPERTY_ACTORDISPLAYNAME,
'creationDateTime': OC.Files.Client.PROPERTY_CREATIONDATETIME,
'objectType': OC.Files.Client.PROPERTY_OBJECTTYPE,
'objectId': OC.Files.Client.PROPERTY_OBJECTID,
'isUnread': OC.Files.Client.PROPERTY_ISUNREAD,
'mentions': OC.Files.Client.PROPERTY_MENTIONS
},
parse: function(data) {
@@ -78,4 +91,3 @@
OCA.Comments.CommentModel = CommentModel;
})(OC, OCA);
+38 -29
View File
@@ -23,9 +23,7 @@
var EDIT_COMMENT_TEMPLATE =
'<div class="newCommentRow comment" data-id="{{id}}">' +
' <div class="authorRow">' +
' {{#if avatarEnabled}}' +
' <div class="avatar" data-username="{{actorId}}"></div>' +
' {{/if}}' +
' <div class="author">{{actorDisplayName}}</div>' +
'{{#if isEditMode}}' +
' <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
@@ -44,9 +42,7 @@
var COMMENT_TEMPLATE =
'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
' <div class="authorRow">' +
' {{#if avatarEnabled}}' +
' <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
' {{/if}}' +
' <div class="author">{{actorDisplayName}}</div>' +
'{{#if isUserAuthor}}' +
' <a href="#" class="action edit icon icon-rename has-tooltip" title="{{editTooltip}}"></a>' +
@@ -85,8 +81,6 @@
this.collection.on('sync', this._onEndRequest, this);
this.collection.on('add', this._onAddModel, this);
this._avatarsEnabled = !!OC.config.enable_avatars;
this._commentMaxThreshold = this._commentMaxLength * 0.9;
// TODO: error handling
@@ -99,7 +93,6 @@
}
var currentUser = OC.getCurrentUser();
return this._template(_.extend({
avatarEnabled: this._avatarsEnabled,
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName
}, params));
@@ -111,7 +104,6 @@
}
var currentUser = OC.getCurrentUser();
return this._editCommentTemplate(_.extend({
avatarEnabled: this._avatarsEnabled,
actorId: currentUser.uid,
actorDisplayName: currentUser.displayName,
newMessagePlaceholder: t('comments', 'New comment …'),
@@ -127,7 +119,6 @@
}
params = _.extend({
avatarEnabled: this._avatarsEnabled,
editTooltip: t('comments', 'Edit comment'),
isUserAuthor: OC.getCurrentUser().uid === params.actorId,
isLong: this._isLong(params.message)
@@ -169,9 +160,7 @@
this.$el.find('.comments').before(this.editCommentTemplate({}));
this.$el.find('.has-tooltip').tooltip();
this.$container = this.$el.find('ul.comments');
if (this._avatarsEnabled) {
this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32);
}
this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, 32);
this.delegateEvents();
this.$el.find('.message').on('keydown input change', this._onTypeComment);
@@ -239,12 +228,29 @@
_postRenderItem: function($el) {
$el.find('.has-tooltip').tooltip();
if(this._avatarsEnabled) {
$el.find('.avatar').each(function() {
var $this = $(this);
$this.avatar($this.attr('data-username'), 32);
});
$el.find('.avatar').each(function() {
var $this = $(this);
$this.avatar($this.attr('data-username'), 32);
});
var username = $el.find('.avatar').data('username');
if (username !== oc_current_user) {
$el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
username, 0, $el.find('.authorRow'));
}
var $message = $el.find('.message');
this._postRenderMessage($message);
},
_postRenderMessage: function($el) {
$el.find('.avatar').each(function() {
var avatar = $(this);
var strong = $(this).next();
var appendTo = $(this).parent();
$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
});
},
/**
@@ -257,17 +263,17 @@
for(var i in mentions) {
var mention = '@' + mentions[i].mentionId;
var avatar = '';
if(this._avatarsEnabled) {
avatar = '<div class="avatar" '
+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
+' data-user-display-name="'
+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
}
var avatar = '<div class="avatar" '
+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
+' data-user-display-name="'
+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
// escape possible regex characters in the name
mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
var displayName = avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>';
var displayName = ''
+ '<span class="avatar-name-wrapper">'
+ avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>'
+ '</span>';
// replace every mention either at the start of the input or after a whitespace
// followed by a non-word character.
@@ -374,7 +380,7 @@
error: function() {
$loading.addClass('hidden');
$comment.removeClass('disabled');
OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with id {id}', {id: commentId}));
OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId}));
}
});
@@ -417,10 +423,13 @@
$textArea.val('').prop('disabled', false);
}
$target.find('.message')
var $message = $target.find('.message');
$message
.html(self._formatMessage(model.get('message'), model.get('mentions')))
.find('.avatar')
.each(function () { $(this).avatar(); });
self._postRenderMessage($message);
},
error: function () {
self._onSubmitError($form, commentId);
@@ -498,9 +507,9 @@
$form.find('.message').prop('disabled', false);
if(!_.isUndefined(commentId)) {
OC.Notification.showTemporary(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}));
OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'});
} else {
OC.Notification.showTemporary(t('comments', 'Error occurred while posting comment'));
OC.Notification.show(t('comments', 'Error occurred while posting comment'), {type: 'error'});
}
},
+7 -4
View File
@@ -9,13 +9,17 @@
*/
(function(OC, OCA) {
var NS_OWNCLOUD = 'http://owncloud.org/ns';
_.extend(OC.Files.Client, {
PROPERTY_READMARKER: '{' + OC.Files.Client.NS_OWNCLOUD + '}readMarker'
});
/**
* @class OCA.Comments.CommentSummaryModel
* @classdesc
*
* Model containing summary information related to comments
* like the read marker.
* like the read marker.
*
*/
var CommentSummaryModel = OC.Backbone.Model.extend(
@@ -37,7 +41,7 @@
_objectId: null,
davProperties: {
'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
'readMarker': OC.Files.Client.PROPERTY_READMARKER
},
/**
@@ -62,4 +66,3 @@
OCA.Comments.CommentSummaryModel = CommentSummaryModel;
})(OC, OCA);
+7 -4
View File
@@ -11,6 +11,11 @@
/* global Handlebars */
(function() {
_.extend(OC.Files.Client, {
PROPERTY_COMMENTS_UNREAD: '{' + OC.Files.Client.NS_OWNCLOUD + '}comments-unread'
});
var TEMPLATE_COMMENTS_UNREAD =
'<a class="action action-comment permanent" title="{{countMessage}}" href="#">' +
'<img class="svg" src="{{iconUrl}}"/>' +
@@ -52,19 +57,17 @@
fileList.registerTabView(new OCA.Comments.CommentsTabView('commentsTabView'));
var NS_OC = 'http://owncloud.org/ns';
var oldGetWebdavProperties = fileList._getWebdavProperties;
fileList._getWebdavProperties = function() {
var props = oldGetWebdavProperties.apply(this, arguments);
props.push('{' + NS_OC + '}comments-unread');
props.push(OC.Files.Client.PROPERTY_COMMENTS_UNREAD);
return props;
};
fileList.filesClient.addFileInfoParser(function(response) {
var data = {};
var props = response.propStat[0].properties;
var commentsUnread = props['{' + NS_OC + '}comments-unread'];
var commentsUnread = props[OC.Files.Client.PROPERTY_COMMENTS_UNREAD];
if (!_.isUndefined(commentsUnread) && commentsUnread !== '') {
data.commentsUnread = parseInt(commentsUnread, 10);
}
+9
View File
@@ -0,0 +1,9 @@
[
"app.js",
"commentmodel.js",
"commentcollection.js",
"commentsummarymodel.js",
"commentstabview.js",
"filesplugin.js",
"activitytabviewplugin.js"
]
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Wysig kommentaar",
"Delete comment" : "Skrap kommentaar",
"New comment …" : "Nuwe kommentaar…",
"Post" : "Plaas",
"Cancel" : "Kanselleer",
"[Deleted user]" : "[Geskrapte gebruiker]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
"More comments …" : "Nog kommentare …",
"Save" : "Bewaar",
"Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
"Error occurred while retrieving comment with ID {id}" : "n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
"Error occurred while updating comment with id {id}" : "n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
"Error occurred while posting comment" : "n Fout het voorgekom toe kommentaar geplaas is",
"_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
"{author} commented" : "{outeur} het kommentaar gelewer",
"You commented on %1$s" : "U het op %1$s kommentaar gelewer",
"You commented on {file}" : "U het op {lêer} kommentaar gelewer",
"%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
"{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in n kommentaar oor “{lêer}” genoem",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “%s” genoem",
"A (now) deleted user mentioned you in a comment on “{file}”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “{lêer}” genoem"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Wysig kommentaar",
"Delete comment" : "Skrap kommentaar",
"New comment …" : "Nuwe kommentaar…",
"Post" : "Plaas",
"Cancel" : "Kanselleer",
"[Deleted user]" : "[Geskrapte gebruiker]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Nog geen kommentaar, begin die gesprek!",
"More comments …" : "Nog kommentare …",
"Save" : "Bewaar",
"Allowed characters {count} of {max}" : "Toegelate karakters {telling} van {maks}",
"Error occurred while retrieving comment with ID {id}" : "n Fout het voorgekom toe kommentaar met id {id} opgehaal is",
"Error occurred while updating comment with id {id}" : "n Fout het voorgekom toe kommentaar met id {id} bygewerk is",
"Error occurred while posting comment" : "n Fout het voorgekom toe kommentaar geplaas is",
"_%n unread comment_::_%n unread comments_" : ["%n ongeleesde kommentaar","%n ongeleeste kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
"{author} commented" : "{outeur} het kommentaar gelewer",
"You commented on %1$s" : "U het op %1$s kommentaar gelewer",
"You commented on {file}" : "U het op {lêer} kommentaar gelewer",
"%1$s commented on %2$s" : "%1$s het op %2$s kommentaar gelewer",
"{author} commented on {file}" : "{outeur} het op {lêer} kommentaar gelewer",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> vir lêers",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Jy was genoem op \"%s\", in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy was genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"{user} mentioned you in a comment on “{file}”" : "{gebruiker} het u in n kommentaar oor “{lêer}” genoem",
"Unknown user" : "Onbekende gebruiker",
"A (now) deleted user mentioned you in a comment on “%s”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “%s” genoem",
"A (now) deleted user mentioned you in a comment on “{file}”" : "n (Nou) geskrapte gebruiker het u in n kommentaar op “{lêer}” genoem"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+6 -9
View File
@@ -1,29 +1,26 @@
OC.L10N.register(
"comments",
{
"Comments" : "تعليقات",
"New comment …" : "تعليق جديد",
"Edit comment" : "تعديل التعليق",
"Delete comment" : "حذف التعليق",
"New comment …" : "تعليق جديد",
"Post" : "ارسال",
"Cancel" : "إلغاء",
"Edit comment" : "تعديل التعليق",
"[Deleted user]" : "[مستخدم محذوف]",
"Comments" : "تعليقات",
"No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
"More comments …" : "مزيد من التعليقات...",
"Save" : "حفظ",
"Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
"Error occurred while retrieving comment with id {id}" : "حصل خطأ أثناء عرض التعليق رقم {id}",
"Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
"Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
"Comment" : "تعليق",
"You commented" : "قمت بكتابة تعليق",
"%1$s commented" : "%1$s كتب تعليق",
"You commented on {file}" : "علقت على {file}",
"%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
"{author} commented on {file}" : "{author} علّق على {file}",
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
"Type in a new comment..." : "اكتب تعليق جديد...",
"No other comments available" : "لا يوجد تعليقات أخرى متاحة",
"More comments..." : "مزيد من التعليقات...",
"{count} unread comments" : "{count} الرسائل الغير مقروءة",
"You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s"
"Unknown user" : "مستخدم غير معروف"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
+6 -9
View File
@@ -1,27 +1,24 @@
{ "translations": {
"Comments" : "تعليقات",
"New comment …" : "تعليق جديد",
"Edit comment" : "تعديل التعليق",
"Delete comment" : "حذف التعليق",
"New comment …" : "تعليق جديد",
"Post" : "ارسال",
"Cancel" : "إلغاء",
"Edit comment" : "تعديل التعليق",
"[Deleted user]" : "[مستخدم محذوف]",
"Comments" : "تعليقات",
"No comments yet, start the conversation!" : "لا يوجد تعليقات, ابدأ النقاش الآن!",
"More comments …" : "مزيد من التعليقات...",
"Save" : "حفظ",
"Allowed characters {count} of {max}" : "عدد الأحرف المسموح بها {count} من {max}",
"Error occurred while retrieving comment with id {id}" : "حصل خطأ أثناء عرض التعليق رقم {id}",
"Error occurred while updating comment with id {id}" : "حصل خطأ أثناء تعديل التعليق رقم {id}",
"Error occurred while posting comment" : "حصل خطأ أثناء إرسال التعليق",
"Comment" : "تعليق",
"You commented" : "قمت بكتابة تعليق",
"%1$s commented" : "%1$s كتب تعليق",
"You commented on {file}" : "علقت على {file}",
"%1$s commented on %2$s" : "%1$s كتب تعليق على %2$s",
"{author} commented on {file}" : "{author} علّق على {file}",
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات",
"Type in a new comment..." : "اكتب تعليق جديد...",
"No other comments available" : "لا يوجد تعليقات أخرى متاحة",
"More comments..." : "مزيد من التعليقات...",
"{count} unread comments" : "{count} الرسائل الغير مقروءة",
"You commented on %2$s" : "انت قمت بكتابة تعليق على %2$s"
"Unknown user" : "مستخدم غير معروف"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
}
+15 -10
View File
@@ -1,28 +1,33 @@
OC.L10N.register(
"comments",
{
"Comments" : "Comentarios",
"New comment …" : "Comentariu nuevu...",
"Edit comment" : "Editar comentariu",
"Delete comment" : "Desaniciar comentariu",
"New comment …" : "Comentariu nuevu...",
"Post" : "Espublizar",
"Cancel" : "Encaboxar",
"Edit comment" : "Editar comentariu",
"[Deleted user]" : "[Usuariu desaniciáu]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
"More comments …" : "Más comentarios...",
"Save" : "Guardar",
"Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
"Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
"Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
"Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
"_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
"Comment" : "Comentariu",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"You commented" : "Comentesti",
"%1$s commented" : "%1$s comentó",
"You commented on %2$s" : "Comentesti en %2$s",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Comentesti en %1$s",
"You commented on {file}" : "Comentesti en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"Type in a new comment..." : "Teclexa un comentariu nuevu...",
"No other comments available" : "Nun hai otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"{count} unread comments" : "{count} comentarios ensin lleer"
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
"{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
"Unknown user" : "Usuariu desconocíu",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»"
},
"nplurals=2; plural=(n != 1);");
+15 -10
View File
@@ -1,26 +1,31 @@
{ "translations": {
"Comments" : "Comentarios",
"New comment …" : "Comentariu nuevu...",
"Edit comment" : "Editar comentariu",
"Delete comment" : "Desaniciar comentariu",
"New comment …" : "Comentariu nuevu...",
"Post" : "Espublizar",
"Cancel" : "Encaboxar",
"Edit comment" : "Editar comentariu",
"[Deleted user]" : "[Usuariu desaniciáu]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Entá nun hai comentarios. ¡Entama una conversación!",
"More comments …" : "Más comentarios...",
"Save" : "Guardar",
"Error occurred while retrieving comment with id {id}" : "Asocedió un fallu entrín se recibía'l comentariu cola ID {id}",
"Allowed characters {count} of {max}" : "{count} caráuteres almitíos de {max}",
"Error occurred while updating comment with id {id}" : "Asocedió un fallu entrín s'anovaba'l comentariu cola ID {id}",
"Error occurred while posting comment" : "Asocedieron fallos entrín s'espublizaba'l comentariu",
"_%n unread comment_::_%n unread comments_" : ["%n comentariu ensin lleer","%n comentarios ensin lleer"],
"Comment" : "Comentariu",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"You commented" : "Comentesti",
"%1$s commented" : "%1$s comentó",
"You commented on %2$s" : "Comentesti en %2$s",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Comentesti en %1$s",
"You commented on {file}" : "Comentesti en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"Type in a new comment..." : "Teclexa un comentariu nuevu...",
"No other comments available" : "Nun hai otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"{count} unread comments" : "{count} comentarios ensin lleer"
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»",
"{user} mentioned you in a comment on “{file}”" : "{user} mentóte nun comentariu de «{file}»",
"Unknown user" : "Usuariu desconocíu",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuariu (agora) desaniciáu mentóte nun comentariu de «{file}»"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Редактирай коментра",
"Delete comment" : "Изтрий коментар",
"New comment …" : "Нов коментар...",
"Post" : "Публикация",
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Unknown user" : "Непознат потребител",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Редактирай коментра",
"Delete comment" : "Изтрий коментар",
"New comment …" : "Нов коментар...",
"Post" : "Публикация",
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
"Error occurred while updating comment with id {id}" : "Възникна грешка по време на обновяване на коментар с код {id}",
"Error occurred while posting comment" : "Възникна грешка по време на изпращане на коментар",
"_%n unread comment_::_%n unread comments_" : ["%n непрочетен коментар","%n непрочетени коментари"],
"Comment" : "Коментар",
"You commented" : "Вие коментирахте",
"%1$s commented" : "%1$s коментира",
"{author} commented" : "{author} коментира",
"You commented on %1$s" : "Ти коментира за %1$s",
"You commented on {file}" : "Ти коментира за {file}",
"%1$s commented on %2$s" : "%1$s коментиран за %2$s",
"{author} commented on {file}" : "{author} коментира за {file}",
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} те спомена в коментар за “{file}”",
"Unknown user" : "Непознат потребител",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Токущо) изтрит потребител те коментира в “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Токущо) изтрит потребител те спомена в коментар за “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+23 -11
View File
@@ -1,23 +1,35 @@
OC.L10N.register(
"comments",
{
"Type in a new comment..." : "Escriu en un nou comentari...",
"Edit comment" : "Editar comentari",
"Delete comment" : "Esborrar comentari",
"New comment …" : "Nou comentari...",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"Edit comment" : "Editar comentari",
"[Deleted user]" : "[usuari Esborrat]",
"Comments" : "Comentaris",
"No other comments available" : "No hi han altres comentaris disponibles",
"More comments..." : "Més comentaris",
"No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
"More comments" : "Més comentaris...",
"Save" : "Desa",
"Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
"{count} unread comments" : "{count} comentaris no llegits",
"Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
"Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
"Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
"_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
"<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
"You commented" : "Has comentat",
"%1$s commented" : "%1$s comentat",
"You commented on %2$s" : "Has comentat a %2$s",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
"You commented" : "Heu comentat",
"%1$s commented" : "%1$s ha comentat",
"{author} commented" : "{author} ha comentat",
"You commented on %1$s" : "Heu comentat a %1$s",
"You commented on {file}" : "Heu comentat a {file}",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
"{author} commented on {file}" : "{author} ha comentat a {file}",
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
"Unknown user" : "Usuari desconegut",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”"
},
"nplurals=2; plural=(n != 1);");
+23 -11
View File
@@ -1,21 +1,33 @@
{ "translations": {
"Type in a new comment..." : "Escriu en un nou comentari...",
"Edit comment" : "Editar comentari",
"Delete comment" : "Esborrar comentari",
"New comment …" : "Nou comentari...",
"Post" : "Publica",
"Cancel" : "Cancel·la",
"Edit comment" : "Editar comentari",
"[Deleted user]" : "[usuari Esborrat]",
"Comments" : "Comentaris",
"No other comments available" : "No hi han altres comentaris disponibles",
"More comments..." : "Més comentaris",
"No comments yet, start the conversation!" : "Encara no hi ha comentaris. Comenceu la conversa!",
"More comments" : "Més comentaris...",
"Save" : "Desa",
"Allowed characters {count} of {max}" : "caracters Permessos {count} de {max}",
"{count} unread comments" : "{count} comentaris no llegits",
"Allowed characters {count} of {max}" : "{count} caràcters permesos de {max}",
"Error occurred while updating comment with id {id}" : "Hi ha hagut un error en actualitzar el comentari amb id {id}",
"Error occurred while posting comment" : "Hi ha hagut un error en publicar el comentari",
"_%n unread comment_::_%n unread comments_" : ["%n comentari no llegit","%n comentaris no llegits"],
"Comment" : "Comentari",
"<strong>Comments</strong> for files <em>(always listed in stream)</em>" : "<strong>Comentaris</strong> per arxius <em>(sempre llistat en corrent)",
"You commented" : "Has comentat",
"%1$s commented" : "%1$s comentat",
"You commented on %2$s" : "Has comentat a %2$s",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s"
"You commented" : "Heu comentat",
"%1$s commented" : "%1$s ha comentat",
"{author} commented" : "{author} ha comentat",
"You commented on %1$s" : "Heu comentat a %1$s",
"You commented on {file}" : "Heu comentat a {file}",
"%1$s commented on %2$s" : "%1$s ha comentat a %2$s",
"{author} commented on {file}" : "{author} ha comentat a {file}",
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"%s\" en un comentari d'un usuari que ja no existeix",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Has estat mencionat a \"{file}\" en un comentari d'un usuari que ja no existeix",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} us ha nomenat en un comentari de “{file}”",
"Unknown user" : "Usuari desconegut",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuari (ara) esborrat us ha nomenat en un comentari a “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuari (ara) esborrat us ha nomenat en un comentari de “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Upravit komentář",
"Delete comment" : "Smazat komentář",
"New comment …" : "Nový komentář…",
"Post" : "Zveřejnit",
"Cancel" : "Storno",
"[Deleted user]" : "[Smazaný uživatel]",
"Comments" : "Komentáře",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů…",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with ID {id}" : "Došlo k chybě při načítání komentáře s ID {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentovali jste",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval",
"You commented on %1$s" : "Okomentoval(a) jste %1$s",
"You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Upravit komentář",
"Delete comment" : "Smazat komentář",
"New comment …" : "Nový komentář…",
"Post" : "Zveřejnit",
"Cancel" : "Storno",
"[Deleted user]" : "[Smazaný uživatel]",
"Comments" : "Komentáře",
"No comments yet, start the conversation!" : "Zatím bez komentářů, začněte konverzaci!",
"More comments …" : "Více komentářů…",
"Save" : "Uložit",
"Allowed characters {count} of {max}" : "Povolených znaků {count} z {max}",
"Error occurred while retrieving comment with ID {id}" : "Došlo k chybě při načítání komentáře s ID {id}",
"Error occurred while updating comment with id {id}" : "Došlo k chybě při aktualizování komentáře s id {id}",
"Error occurred while posting comment" : "Došlo k chybě při zveřejňování komentáře",
"_%n unread comment_::_%n unread comments_" : ["%n nepřečtený komentář","%n nepřečtené komentáře","%n nepřečtených komentářů","%n nepřečtených komentářů"],
"Comment" : "Komentář",
"You commented" : "Okomentovali jste",
"%1$s commented" : "%1$s okomentován",
"{author} commented" : "{author} okomentoval",
"You commented on %1$s" : "Okomentoval(a) jste %1$s",
"You commented on {file}" : "Okomentoval(a) jste {file}",
"%1$s commented on %2$s" : "%1$s okomentoval %2$s",
"{author} commented on {file}" : "{author} okomentoval(a) {file}",
"<strong>Comments</strong> for files" : "<strong>Komentáře</strong> souborů",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v “%s”, v komentáři od uživatele, který byl později smazán",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Byli jste zmíněni v souboru “{file}”, v komentáři od uživatele, který byl později smazán",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil v komentáři u “{file}”",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní již smazaný uživatel vás zmínil v komentáři u \"{file}\""
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
}
+18 -8
View File
@@ -1,25 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Rediger kommentar",
"Delete comment" : "Slet kommentar",
"New comment …" : "Ny kommentar ...",
"Post" : "Indlæg",
"Cancel" : "Annullér",
"Edit comment" : "Rediger kommentar",
"[Deleted user]" : "[Deleted user]",
"[Deleted user]" : "[Slettet user]",
"Comments" : "Kommentarer",
"No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
"More comments …" : "Flere kommentarer...",
"Save" : "Gem",
"Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
"Error occurred while retrieving comment with id {id}" : "Der opstod fejl under hentning af kommentar med id {id}",
"Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
"Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
"_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
"Comment" : "Kommentér",
"You commented" : "Du kommenterede",
"%1$s commented" : "%1$s kommenterede",
"You commented on %2$s" : "Du kommenterede %2$s",
"{author} commented" : "{author} kommenterede",
"You commented on %1$s" : "Du kommenterede %1$s",
"You commented on {file}" : "Du kommenterede {file}",
"%1$s commented on %2$s" : "%1$s kommenterede %2$s",
"Type in a new comment..." : "Indtast en ny kommentar...",
"No other comments available" : "Ingen andre kommentarer tilgængelige",
"More comments..." : "Flere kommentarer...",
"{count} unread comments" : "{count} ulæste kommentarer"
"{author} commented on {file}" : "{author} kommenterede {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
"Unknown user" : "Ukendt bruger",
"A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\""
},
"nplurals=2; plural=(n != 1);");
+18 -8
View File
@@ -1,23 +1,33 @@
{ "translations": {
"Edit comment" : "Rediger kommentar",
"Delete comment" : "Slet kommentar",
"New comment …" : "Ny kommentar ...",
"Post" : "Indlæg",
"Cancel" : "Annullér",
"Edit comment" : "Rediger kommentar",
"[Deleted user]" : "[Deleted user]",
"[Deleted user]" : "[Slettet user]",
"Comments" : "Kommentarer",
"No comments yet, start the conversation!" : "Ingen kommentarer endnu, start samtalen!",
"More comments …" : "Flere kommentarer...",
"Save" : "Gem",
"Allowed characters {count} of {max}" : "Tilladte tegn {count} af {max}",
"Error occurred while retrieving comment with id {id}" : "Der opstod fejl under hentning af kommentar med id {id}",
"Error occurred while updating comment with id {id}" : "Der opstod fejl under opdatering af kommentar med id {id}",
"Error occurred while posting comment" : "Der opstod fejl under indsendelse af kommentar",
"_%n unread comment_::_%n unread comments_" : ["%n ulæst kommentar","%n ulæste kommentarer"],
"Comment" : "Kommentér",
"You commented" : "Du kommenterede",
"%1$s commented" : "%1$s kommenterede",
"You commented on %2$s" : "Du kommenterede %2$s",
"{author} commented" : "{author} kommenterede",
"You commented on %1$s" : "Du kommenterede %1$s",
"You commented on {file}" : "Du kommenterede {file}",
"%1$s commented on %2$s" : "%1$s kommenterede %2$s",
"Type in a new comment..." : "Indtast en ny kommentar...",
"No other comments available" : "Ingen andre kommentarer tilgængelige",
"More comments..." : "Flere kommentarer...",
"{count} unread comments" : "{count} ulæste kommentarer"
"{author} commented on {file}" : "{author} kommenterede {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"%s”, I en kommentar af en bruger der er blevet slettet efterfølgende",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du blev nævnt i \"{file}”, I en kommentar af en bruger der siden er blevet slettet",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} nævnte dig i en kommentarer på \"{file}\"",
"Unknown user" : "Ukendt bruger",
"A (now) deleted user mentioned you in a comment on “%s”" : "En (nu) slettet bruger nævnte dig i en kommentarer på “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "En (nu) slettet bruger nævnte dig i en kommentarer på \"{file}\""
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+15 -17
View File
@@ -1,39 +1,37 @@
OC.L10N.register(
"comments",
{
"Comments" : "Kommentare",
"Unknown user" : "Unbekannter Benutzer",
"New comment …" : "Neuer Kommentar ...",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
"More comments …" : "Weitere Kommentare ...",
"More comments …" : "Weitere Kommentare",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Von Dir kommentiert",
"%1$s commented" : "%1$s kommentiert",
"{author} commented" : "{author} kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Du hast %1$s kommentiert",
"You commented on {file}" : "Du hast {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"{count} unread comments" : "{count} ungelesene Kommentare",
"You commented on %2$s" : "Du hast %2$s kommentiert"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt"
},
"nplurals=2; plural=(n != 1);");
+15 -17
View File
@@ -1,37 +1,35 @@
{ "translations": {
"Comments" : "Kommentare",
"Unknown user" : "Unbekannter Benutzer",
"New comment …" : "Neuer Kommentar ...",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginne die Diskussion!",
"More comments …" : "Weitere Kommentare ...",
"More comments …" : "Weitere Kommentare",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
"Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Von Dir kommentiert",
"%1$s commented" : "%1$s kommentiert",
"{author} commented" : "{author} kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Du hast %1$s kommentiert",
"You commented on {file}" : "Du hast {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt dich in einem Kommentar zu “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Dich in einem Kommentar zu “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Dich in einem Kommentar zu “{file}”",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"{count} unread comments" : "{count} ungelesene Kommentare",
"You commented on %2$s" : "Du hast %2$s kommentiert"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Du wurdest in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Dich in einem Kommentar zu “{file}” erwähnt ",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Dich in einem Kommentar zu “{file}” erwähnt"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+14 -16
View File
@@ -1,39 +1,37 @@
OC.L10N.register(
"comments",
{
"Comments" : "Kommentare",
"Unknown user" : "Unbekannter Benutzer",
"New comment …" : "Neuer Kommentar ...",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
"More comments …" : "Weitere Kommentare ...",
"More comments …" : "Weitere Kommentare ",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentiert",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Sie in einem Kommentar zu “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Sie in einem Kommentar zu “{file}”",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
"{count} unread comments" : "[count] ungelesene Kommentare",
"You commented on %2$s" : "Sie haben %2$s kommentiert"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt"
},
"nplurals=2; plural=(n != 1);");
+14 -16
View File
@@ -1,37 +1,35 @@
{ "translations": {
"Comments" : "Kommentare",
"Unknown user" : "Unbekannter Benutzer",
"New comment …" : "Neuer Kommentar ...",
"Edit comment" : "Kommentar bearbeiten",
"Delete comment" : "Kommentar löschen",
"New comment …" : "Neuer Kommentar …",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[gelöschter Benutzer]",
"Comments" : "Kommentare",
"No comments yet, start the conversation!" : "Keine Kommentare bisher. Beginnen Sie die Diskussion!",
"More comments …" : "Weitere Kommentare ...",
"More comments …" : "Weitere Kommentare ",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "{count} von {max} Zeichen benutzt",
"Error occurred while retrieving comment with id {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while retrieving comment with ID {id}" : "Es ist ein Fehler beim Empfangen des Kommentars mit der ID {id} aufgetreten",
"Error occurred while updating comment with id {id}" : "Es ist ein Fehler beim Aktualisieren des Kommentars mit der ID {id} aufgetreten",
"Error occurred while posting comment" : "Es ist ein Fehler beim Veröffentlichen des Kommentars aufgetreten",
"_%n unread comment_::_%n unread comments_" : ["%n ungelesener Kommentar","%n ungelesene Kommentare"],
"Comment" : "Kommentar",
"You commented" : "Sie haben kommentiert",
"%1$s commented" : "%1$s kommentierte",
"{author} commented" : "{author} kommentiert",
"{author} commented" : "{author} kommentierte",
"You commented on %1$s" : "Sie haben %1$s kommentiert",
"You commented on {file}" : "Sie haben {file} kommentiert",
"%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"{author} commented on {file}" : "{author} hat {file} kommentiert",
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Nutzer erwähnt Sie in einem Kommentar zu “{file}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s erwähnt Sie in einem Kommentar zu “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} erwähnt Sie in einem Kommentar zu “{file}”",
"Type in a new comment..." : "Neuen Kommentar eingeben...",
"No other comments available" : "Keine weiteren Kommentare verfügbar",
"More comments..." : "Weitere Kommentare...",
"{count} unread comments" : "[count] ungelesene Kommentare",
"You commented on %2$s" : "Sie haben %2$s kommentiert"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"%s\" von einem bereits gelöschten Nutzer erwähnt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sie wurden in einem Kommentar auf \"{file}\" von einem bereits gelöschten Nutzer erwähnt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"{user} mentioned you in a comment on “{file}”" : "{user} hat Sie in einem Kommentar zu “{file}” erwähnt",
"Files app plugin to add comments to files" : "Ein Plugin für die Dateien-App zum Kommentieren von Dateien",
"Unknown user" : "Unbekannter Benutzer",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu \"%s\" erwähnt",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ein (nun) gelöschter Benutzer hat Sie in einem Kommentar zu “{file}” erwähnt"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+17 -15
View File
@@ -1,31 +1,33 @@
OC.L10N.register(
"comments",
{
"Comments" : "Σχόλια",
"Unknown user" : "Άγνωστος χρήστης",
"New comment …" : "Νέο σχόλιο ...",
"Delete comment" : "Διαγραφή σχολίου",
"Post" : "Δημοσίευση",
"Cancel" : "Άκυρο",
"Edit comment" : "Επεξεργασία σχολίου",
"[Deleted user]" : "[Διαγραφή χρήστη]",
"Delete comment" : "Διαγραφή σχολίου",
"New comment …" : "Νέο σχόλιο ...",
"Post" : "Δημοσίευση",
"Cancel" : "Ακύρωση",
"[Deleted user]" : "[Διαγραμμένος χρήστης]",
"Comments" : "Σχόλια",
"No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
"More comments …" : "Περισσότερα σχόλια ...",
"Save" : "Αποθήκευση",
"Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
"Error occurred while retrieving comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια λήψης σχολίων με αναγνωριστικό {id}",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια αναβάθμισης του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια δημοσίευσης σχολίου",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
"_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
"Comment" : "Σχόλιο",
"You commented" : "Σχολιάσατε",
"%1$s commented" : "%1$s σχολίασε",
"{author} commented" : "Ο {author} σχολίασε",
"You commented on %1$s" : "Σχολιάσατε στο %1$s",
"You commented on {file}" : "Σχολιάσατε στο {file}",
"%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
"No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
"More comments..." : "Περισσότερα σχόλια...",
"{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
"You commented on %2$s" : "Σχολιάσατε στο %2$s"
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
"Unknown user" : "Άγνωστος χρήστης",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”"
},
"nplurals=2; plural=(n != 1);");
+17 -15
View File
@@ -1,29 +1,31 @@
{ "translations": {
"Comments" : "Σχόλια",
"Unknown user" : "Άγνωστος χρήστης",
"New comment …" : "Νέο σχόλιο ...",
"Delete comment" : "Διαγραφή σχολίου",
"Post" : "Δημοσίευση",
"Cancel" : "Άκυρο",
"Edit comment" : "Επεξεργασία σχολίου",
"[Deleted user]" : "[Διαγραφή χρήστη]",
"Delete comment" : "Διαγραφή σχολίου",
"New comment …" : "Νέο σχόλιο ...",
"Post" : "Δημοσίευση",
"Cancel" : "Ακύρωση",
"[Deleted user]" : "[Διαγραμμένος χρήστης]",
"Comments" : "Σχόλια",
"No comments yet, start the conversation!" : "Δεν υπάρχουν σχόλια, ξεκινήστε την συζήτηση!",
"More comments …" : "Περισσότερα σχόλια ...",
"Save" : "Αποθήκευση",
"Allowed characters {count} of {max}" : "Επιτρεπόμενοι χαρακτήρες {count} από {max}",
"Error occurred while retrieving comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια λήψης σχολίων με αναγνωριστικό {id}",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια αναβάθμισης του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την προσπάθεια δημοσίευσης σχολίου",
"Error occurred while updating comment with id {id}" : "Ένα σφάλμα προέκυψε κατά την ενημέρωση του σχολίου με το αναγνωριστικό {id}",
"Error occurred while posting comment" : "Ένα σφάλμα προέκυψε κατά την δημοσίευση σχολίου",
"_%n unread comment_::_%n unread comments_" : ["%n αδιάβαστο σχόλιο","%n αδιάβαστα σχόλια"],
"Comment" : "Σχόλιο",
"You commented" : "Σχολιάσατε",
"%1$s commented" : "%1$s σχολίασε",
"{author} commented" : "Ο {author} σχολίασε",
"You commented on %1$s" : "Σχολιάσατε στο %1$s",
"You commented on {file}" : "Σχολιάσατε στο {file}",
"%1$s commented on %2$s" : "%1$s σχολίασε στο %2$s",
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"Type in a new comment..." : "Αυτό είναι ένα νέο σχόλιο...",
"No other comments available" : "Δεν υπάρχουν άλλα διαθέσιμα σχόλια",
"More comments..." : "Περισσότερα σχόλια...",
"{count} unread comments" : "{count} μη αναγνωσμένα σχόλια",
"You commented on %2$s" : "Σχολιάσατε στο %2$s"
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "Ο {user} σας ανέφερε σε σχόλιο στο “{file}”",
"Unknown user" : "Άγνωστος χρήστης",
"A (now) deleted user mentioned you in a comment on “%s”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Ο (πρόσφατα) διεγραμμένος χρήστης σας ανέφερε σε σχόλιο στο “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+9 -12
View File
@@ -1,19 +1,18 @@
OC.L10N.register(
"comments",
{
"Comments" : "Comments",
"Unknown user" : "Unknown user",
"New comment …" : "New comment …",
"Edit comment" : "Edit comment",
"Delete comment" : "Delete comment",
"New comment …" : "New comment …",
"Post" : "Post",
"Cancel" : "Cancel",
"Edit comment" : "Edit comment",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Comments",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"More comments …" : "More comments …",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
"Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
"Error occurred while retrieving comment with ID {id}" : "Error occurred while retrieving comment with ID {id}",
"Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
"Error occurred while posting comment" : "Error occurred while posting comment",
"_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
@@ -26,14 +25,12 @@ OC.L10N.register(
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"{author} commented on {file}" : "{author} commented on {file}",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"Type in a new comment..." : "Type a new comment...",
"No other comments available" : "No other comments available",
"More comments..." : "More comments...",
"{count} unread comments" : "{count} unread comments",
"You commented on %2$s" : "You commented on %2$s"
"Unknown user" : "Unknown user",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”"
},
"nplurals=2; plural=(n != 1);");
+9 -12
View File
@@ -1,17 +1,16 @@
{ "translations": {
"Comments" : "Comments",
"Unknown user" : "Unknown user",
"New comment …" : "New comment …",
"Edit comment" : "Edit comment",
"Delete comment" : "Delete comment",
"New comment …" : "New comment …",
"Post" : "Post",
"Cancel" : "Cancel",
"Edit comment" : "Edit comment",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Comments",
"No comments yet, start the conversation!" : "No comments yet, start the conversation!",
"More comments …" : "More comments …",
"Save" : "Save",
"Allowed characters {count} of {max}" : "Allowed characters: {count} of {max}",
"Error occurred while retrieving comment with id {id}" : "Error occurred while retrieving comment with id {id}",
"Error occurred while retrieving comment with ID {id}" : "Error occurred while retrieving comment with ID {id}",
"Error occurred while updating comment with id {id}" : "Error occurred while updating comment with id {id}",
"Error occurred while posting comment" : "Error occurred while posting comment",
"_%n unread comment_::_%n unread comments_" : ["%n unread comment","%n unread comments"],
@@ -24,14 +23,12 @@
"%1$s commented on %2$s" : "%1$s commented on %2$s",
"{author} commented on {file}" : "{author} commented on {file}",
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "You were mentioned on “%s”, in a comment by a user that has since been deleted",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "You were mentioned on “{file}”, in a comment by a user that has since been deleted",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"Type in a new comment..." : "Type a new comment...",
"No other comments available" : "No other comments available",
"More comments..." : "More comments...",
"{count} unread comments" : "{count} unread comments",
"You commented on %2$s" : "You commented on %2$s"
"Unknown user" : "Unknown user",
"A (now) deleted user mentioned you in a comment on “%s”" : "A (now) deleted user mentioned you in a comment on “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "A (now) deleted user mentioned you in a comment on “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+13 -15
View File
@@ -1,39 +1,37 @@
OC.L10N.register(
"comments",
{
"Comments" : "Comentarios",
"Unknown user" : "Usuario desconocido",
"New comment …" : "Comentario nuevo",
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with id {id}" : "Se ha producido un error al recuperar el comentario con ID {id}",
"Error occurred while retrieving comment with ID {id}" : "Se ha producido un error al obtener el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
"Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
"Comment" : "Comentar",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Has comentado en %1$s",
"You commented on {file}" : "Usted comentó Has comentado en {file}",
"You commented on {file}" : "Has comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Type in a new comment..." : "Escribe un nuevo comentario...",
"No other comments available" : "No hay otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"{count} unread comments" : "{count} comentarios no leídos",
"You commented on %2$s" : "Has comentado en %2$s"
"Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+13 -15
View File
@@ -1,37 +1,35 @@
{ "translations": {
"Comments" : "Comentarios",
"Unknown user" : "Usuario desconocido",
"New comment …" : "Comentario nuevo",
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Editar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡No hay comentarios, empieza la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with id {id}" : "Se ha producido un error al recuperar el comentario con ID {id}",
"Error occurred while retrieving comment with ID {id}" : "Se ha producido un error al obtener el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con ID {id}",
"Error occurred while posting comment" : "Se ha producido un error al enviar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sin leer","%nComentarios no leídos"],
"Comment" : "Comentar",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Has comentado en %1$s",
"You commented on {file}" : "Usted comentó Has comentado en {file}",
"You commented on {file}" : "Has comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para archivos",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te han mencionado en \"%s\", en un comentario por un usuario que después ha sido eliminado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te han mencionado en \"{file}\", en un comentario de un usuario que después ha sido eliminado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Type in a new comment..." : "Escribe un nuevo comentario...",
"No other comments available" : "No hay otros comentarios disponibles",
"More comments..." : "Más comentarios...",
"{count} unread comments" : "{count} comentarios no leídos",
"You commented on %2$s" : "Has comentado en %2$s"
"Files app plugin to add comments to files" : "Plugin de la app de Archivos para añadir comentarios a archivos.",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) eliminado, te mencionó en un comentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+24 -14
View File
@@ -1,25 +1,35 @@
OC.L10N.register(
"comments",
{
"Delete comment" : "Eliminar comentario",
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Modificar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with id {id}" : "Se produjo error al recuperar comentario con id {id}",
"Error occurred while updating comment with id {id}" : "Se produjo error al actualizar comentario con id {id}",
"Error occurred while posting comment" : "Se produjo error al publicar comentario",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentado",
"You commented on %2$s" : "Has comentado en %2$s",
"%1$s commented on %2$s" : "%1$s comentado en %2$s",
"Type in a new comment..." : "Escribir un nuevo comentario",
"No other comments available" : "No hay mas comentarios",
"More comments..." : "Mas comentarios...",
"{count} unread comments" : "{count} comentarios no leídos"
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+24 -14
View File
@@ -1,23 +1,33 @@
{ "translations": {
"Delete comment" : "Eliminar comentario",
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"Edit comment" : "Modificar comentario",
"[Deleted user]" : "[Usuario eliminado]",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with id {id}" : "Se produjo error al recuperar comentario con id {id}",
"Error occurred while updating comment with id {id}" : "Se produjo error al actualizar comentario con id {id}",
"Error occurred while posting comment" : "Se produjo error al publicar comentario",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Has comentado",
"%1$s commented" : "%1$s comentado",
"You commented on %2$s" : "Has comentado en %2$s",
"%1$s commented on %2$s" : "%1$s comentado en %2$s",
"Type in a new comment..." : "Escribir un nuevo comentario",
"No other comments available" : "No hay mas comentarios",
"More comments..." : "Mas comentarios...",
"{count} unread comments" : "{count} comentarios no leídos"
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+27 -1
View File
@@ -1,7 +1,33 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario ...",
"Post" : "Post",
"Cancel" : "Cancelar",
"Save" : "Guardar"
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
"Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentar",
"You commented" : "Ud. ha comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Ud. ah comentado en %1$s",
"You commented on {file}" : "Ud. ha comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+27 -1
View File
@@ -1,5 +1,31 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Nuevo comentario ...",
"Post" : "Post",
"Cancel" : "Cancelar",
"Save" : "Guardar"
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "No hay comentarios aún, iniciar la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while updating comment with id {id}" : "Se ha producido un error al actualizar el comentario con id {id}",
"Error occurred while posting comment" : "Se ha producido un error al publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentar",
"You commented" : "Ud. ha comentado",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Ud. ah comentado en %1$s",
"You commented on {file}" : "Ud. ha comentado en {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> en archivos",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te ha mencionado en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (now) usuario borrado te ha mencionado en un comentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (now) usuario borrado the ha mencionado en un comentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+31 -1
View File
@@ -1,6 +1,36 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Cancelar"
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+31 -1
View File
@@ -1,4 +1,34 @@
{ "translations": {
"Cancel" : "Cancelar"
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+29 -1
View File
@@ -1,8 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Comment" : "Comentario"
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+29 -1
View File
@@ -1,6 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Comment" : "Comentario"
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while retrieving comment with ID {id}" : "Se presentó un error al recuperar el comentario con ID {id}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Borrar comentario",
"New comment …" : "Comentario nuevo ...",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario borrado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "¡Aún no hay comentarios, inicia la conversación!",
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Se presentó un error al actualizar el comentario con Id {id}",
"Error occurred while posting comment" : "Se presentó un error al publicar el comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
"Comment" : "Comentario",
"You commented" : "Comentaste",
"%1$s commented" : "%1$s comentó",
"{author} commented" : "{author} comentó",
"You commented on %1$s" : "Usted comentó en %1$s",
"You commented on {file}" : "Hiciste un comentario de {file}",
"%1$s commented on %2$s" : "%1$s comentó en %2$s",
"{author} commented on {file}" : "{author} comentó en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Te mencionaron en \"%s\", en un comentario de un usuario que ya ha sido borrado",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Te mencionaron en \"{file}\", en un comentario de un usuario que ya ha sido borrado",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"Unknown user" : "Usuario desconocido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (ahora) borrado te mencionó en un commentario en “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (ahora) borrado te mencionó en un commentario en “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+20 -7
View File
@@ -1,22 +1,35 @@
OC.L10N.register(
"comments",
{
"Type in a new comment..." : "Kirjuta uus komentaar...",
"Edit comment" : "Muuda kommentaari",
"Delete comment" : "Kustuta kommentaar",
"New comment …" : "Uus kommentaar",
"Post" : "Postita",
"Cancel" : "Loobu",
"Edit comment" : "Muuda kommentaari",
"[Deleted user]" : "[Kustutatud kasutaja]",
"Comments" : "Kommentaarid",
"No other comments available" : "Ühtegi teist kommentaari pole saadaval",
"More comments..." : "Veel kommentaare...",
"No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
"More comments" : "Veel kommentaare ...",
"Save" : "Salvesta",
"Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
"{count} unread comments" : "{count} lugemata kommentaari",
"Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
"Error occurred while posting comment" : "Viga kommentaari postitamisel",
"_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
"Comment" : "Kommentaar",
"You commented" : "Sa kommenteerisid",
"%1$s commented" : "%1$s kommenteeris",
"You commented on %2$s" : "Sa kommenteerisid %2$s",
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s"
"{author} commented" : "{author} kommenteeris",
"You commented on %1$s" : "Sa kommmenteerisid %1$s",
"You commented on {file}" : "Sa kommenteerisid faili {file}",
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
"{author} commented on {file}" : "{author} kommenteeris faili {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentaarid</strong> failidele",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sind mainiti \"{file}\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris",
"{user} mentioned you in a comment on “{file}”" : "{user} mainis sind faili “{file}” kommentaaris",
"Unknown user" : "Tundmatu kasutaja",
"A (now) deleted user mentioned you in a comment on “%s”" : "Kustutatud kasutaja mainis sind \"%s\" kommentaaris",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Kustutatud kasutaja mainis sind faili \"{file}\" kommentaaris"
},
"nplurals=2; plural=(n != 1);");
+20 -7
View File
@@ -1,20 +1,33 @@
{ "translations": {
"Type in a new comment..." : "Kirjuta uus komentaar...",
"Edit comment" : "Muuda kommentaari",
"Delete comment" : "Kustuta kommentaar",
"New comment …" : "Uus kommentaar",
"Post" : "Postita",
"Cancel" : "Loobu",
"Edit comment" : "Muuda kommentaari",
"[Deleted user]" : "[Kustutatud kasutaja]",
"Comments" : "Kommentaarid",
"No other comments available" : "Ühtegi teist kommentaari pole saadaval",
"More comments..." : "Veel kommentaare...",
"No comments yet, start the conversation!" : "Kommentaare veel pole, alusta vestlust",
"More comments" : "Veel kommentaare ...",
"Save" : "Salvesta",
"Allowed characters {count} of {max}" : "Lubatud märkide arv {count}/{max}",
"{count} unread comments" : "{count} lugemata kommentaari",
"Error occurred while updating comment with id {id}" : "Kommentaari {id} uuendamisel tekkis tõrge",
"Error occurred while posting comment" : "Viga kommentaari postitamisel",
"_%n unread comment_::_%n unread comments_" : ["%n lugemata kommentaar","%n lugemata kommentaari"],
"Comment" : "Kommentaar",
"You commented" : "Sa kommenteerisid",
"%1$s commented" : "%1$s kommenteeris",
"You commented on %2$s" : "Sa kommenteerisid %2$s",
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s"
"{author} commented" : "{author} kommenteeris",
"You commented on %1$s" : "Sa kommmenteerisid %1$s",
"You commented on {file}" : "Sa kommenteerisid faili {file}",
"%1$s commented on %2$s" : "%1$s kommenteeris %2$s",
"{author} commented on {file}" : "{author} kommenteeris faili {file}",
"<strong>Comments</strong> for files" : "<strong>Kommentaarid</strong> failidele",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Sind mainiti \"%s\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sind mainiti \"{file}\", kommentaaris kasutataja poolt, mis on praeguseks kustutatud",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mainis sind \"%2$s\" kommentaaris",
"{user} mentioned you in a comment on “{file}”" : "{user} mainis sind faili “{file}” kommentaaris",
"Unknown user" : "Tundmatu kasutaja",
"A (now) deleted user mentioned you in a comment on “%s”" : "Kustutatud kasutaja mainis sind \"%s\" kommentaaris",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Kustutatud kasutaja mainis sind faili \"{file}\" kommentaaris"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+27 -2
View File
@@ -1,8 +1,33 @@
OC.L10N.register(
"comments",
{
"Cancel" : "Ezeztatu",
"Edit comment" : "Iruzkina editatu",
"Delete comment" : "Ezabatu iruzkina",
"New comment …" : "Iruzkin berria...",
"Post" : "Bidali",
"Cancel" : "Utzi",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Iruzkinak",
"No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
"More comments …" : "Iruzkin gehiago...",
"Save" : "Gorde",
"Comment" : "Iruzkina"
"Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
"Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
"Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
"_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
"Comment" : "Iruzkina",
"You commented" : "Iruzkindu duzu",
"%1$s commented" : "%1$s iruzkin du",
"{author} commented" : "{author}-(e)k iruzkin du",
"You commented on %1$s" : "%1$s-en Iruzkin duzu",
"You commented on {file}" : "{file}-en Iruzkin duzu",
"%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
"{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
"<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
"Unknown user" : "Erabiltzaile ezezaguna",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”"
},
"nplurals=2; plural=(n != 1);");
+27 -2
View File
@@ -1,6 +1,31 @@
{ "translations": {
"Cancel" : "Ezeztatu",
"Edit comment" : "Iruzkina editatu",
"Delete comment" : "Ezabatu iruzkina",
"New comment …" : "Iruzkin berria...",
"Post" : "Bidali",
"Cancel" : "Utzi",
"[Deleted user]" : "[Deleted user]",
"Comments" : "Iruzkinak",
"No comments yet, start the conversation!" : "Oraindik ez dago iruzkinik, izan zaitez lehena zerbait esanez!",
"More comments …" : "Iruzkin gehiago...",
"Save" : "Gorde",
"Comment" : "Iruzkina"
"Allowed characters {count} of {max}" : "Onartutako karaktereak {max}-tik {count}",
"Error occurred while updating comment with id {id}" : "Akats bat gertatu da {id} id duen iruzkina aldatzerakoan",
"Error occurred while posting comment" : "Akats bat gertatu da iruzkina bidaltzerakoan",
"_%n unread comment_::_%n unread comments_" : ["iruzkin %n irakurri gabe","%n iruzkin irakurri gabe"],
"Comment" : "Iruzkina",
"You commented" : "Iruzkindu duzu",
"%1$s commented" : "%1$s iruzkin du",
"{author} commented" : "{author}-(e)k iruzkin du",
"You commented on %1$s" : "%1$s-en Iruzkin duzu",
"You commented on {file}" : "{file}-en Iruzkin duzu",
"%1$s commented on %2$s" : "%1$s %2$s-en iruzkin du",
"{author} commented on {file}" : "{author}-(e)k {file}-en iruzkin du",
"<strong>Comments</strong> for files" : "Fitxategientzako <strong>iruzkinak",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s-(e)k aipatu zaitu iruzkinean “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user}-(e)k aipatu zaitu iruzkinean “{file}”",
"Unknown user" : "Erabiltzaile ezezaguna",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "(Orain) ezabatutako erabiltzaile batek aipatu zaitu iruzkinean “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+35
View File
@@ -0,0 +1,35 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Muokkaa kommenttia",
"Delete comment" : "Poista kommentti",
"New comment …" : "Uusi kommentti…",
"Post" : "Lähetä",
"Cancel" : "Peruuta",
"[Deleted user]" : "[Poistettu käyttäjä]",
"Comments" : "Kommentit",
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"More comments …" : "Lisää kommentteja…",
"Save" : "Tallenna",
"Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
"Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
"Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
"Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
"_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
"Comment" : "Kommentti",
"You commented" : "Kommentoit",
"%1$s commented" : "%1$s kommentoi",
"{author} commented" : "{author} kommentoi",
"You commented on %1$s" : "Kommentoit %1$s",
"You commented on {file}" : "Kommentoit tiedostoa {file}",
"%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
"{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
"<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sinut mainittiin tiedoston “{file}” kommentissa käyttäjän toimesta, joka on sittemmin poistettu",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa",
"Unknown user" : "Tuntematon käyttäjä",
"A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa"
},
"nplurals=2; plural=(n != 1);");
+33
View File
@@ -0,0 +1,33 @@
{ "translations": {
"Edit comment" : "Muokkaa kommenttia",
"Delete comment" : "Poista kommentti",
"New comment …" : "Uusi kommentti…",
"Post" : "Lähetä",
"Cancel" : "Peruuta",
"[Deleted user]" : "[Poistettu käyttäjä]",
"Comments" : "Kommentit",
"No comments yet, start the conversation!" : "Ei kommentteja vielä. Aloita keskustelu!",
"More comments …" : "Lisää kommentteja…",
"Save" : "Tallenna",
"Allowed characters {count} of {max}" : "Sallittujen merkkien määrä {count}/{max}",
"Error occurred while retrieving comment with ID {id}" : "Virhe haettaessa kommenttia tunnisteella {id}",
"Error occurred while updating comment with id {id}" : "Virhe päivittäessä kommenttia tunnisteella {id}",
"Error occurred while posting comment" : "Virhe kommenttia lähettäessä",
"_%n unread comment_::_%n unread comments_" : ["%n lukematon kommentti","%n lukematonta kommenttia"],
"Comment" : "Kommentti",
"You commented" : "Kommentoit",
"%1$s commented" : "%1$s kommentoi",
"{author} commented" : "{author} kommentoi",
"You commented on %1$s" : "Kommentoit %1$s",
"You commented on {file}" : "Kommentoit tiedostoa {file}",
"%1$s commented on %2$s" : "%1$s kommentoi kohdetta %2$s",
"{author} commented on {file}" : "{author} kommentoi tiedostoa {file}",
"<strong>Comments</strong> for files" : "Tiedostojen <strong>kommentit</strong>",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Sinut mainittiin tiedoston “{file}” kommentissa käyttäjän toimesta, joka on sittemmin poistettu",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mainitsi sinut kommentissa “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mainitsi sinut tiedoston \"{file}\" kommentissa",
"Unknown user" : "Tuntematon käyttäjä",
"A (now) deleted user mentioned you in a comment on “%s”" : "Poistettu käyttäjä mainitsi sinut kommentissa \"%s\"",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Poistettu käyttäjä mainitsi sinut tiedoston \"{file}\" kommentissa"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+13 -15
View File
@@ -1,19 +1,18 @@
OC.L10N.register(
"comments",
{
"Comments" : "Commentaires",
"Unknown user" : "Utilisateur inconnu",
"New comment …" : "Nouveau commentaire...",
"Edit comment" : "Modifier le commentaire",
"Delete comment" : "Supprimer le commentaire",
"New comment …" : "Nouveau commentaire...",
"Post" : "Poster",
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
"No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrer la conversation!",
"Comments" : "Commentaires",
"No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrez la conversation !",
"More comments …" : "Plus de commentaires ...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
"Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
"Error occurred while retrieving comment with ID {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'ID {id}",
"Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
"Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
"_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
@@ -22,18 +21,17 @@ OC.L10N.register(
"%1$s commented" : "%1$s a commenté",
"{author} commented" : "{author} a commenté",
"You commented on %1$s" : "Vous avez commenté %1$s",
"You commented on {file}" : "Vous avez commenté sur {file}",
"You commented on {file}" : "Vous avez commenté {file}",
"%1$s commented on %2$s" : "%1$s a commenté %2$s",
"{author} commented on {file}" : "{author} a commenté sur {file}",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “{file}”",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"%s\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
"Type in a new comment..." : "Écrire un nouveau commentaire...",
"No other comments available" : "Aucun autre commentaire",
"More comments..." : "Plus de commentaires...",
"{count} unread comments" : "{count} commentaires non lus",
"You commented on %2$s" : "Vous avez commenté %2$s"
"Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
"Unknown user" : "Utilisateur·trice inconnu·e",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”"
},
"nplurals=2; plural=(n > 1);");
+13 -15
View File
@@ -1,17 +1,16 @@
{ "translations": {
"Comments" : "Commentaires",
"Unknown user" : "Utilisateur inconnu",
"New comment …" : "Nouveau commentaire...",
"Edit comment" : "Modifier le commentaire",
"Delete comment" : "Supprimer le commentaire",
"New comment …" : "Nouveau commentaire...",
"Post" : "Poster",
"Cancel" : "Annuler",
"Edit comment" : "Modifier le commentaire",
"[Deleted user]" : "[Utilisateur supprimé]",
"No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrer la conversation!",
"Comments" : "Commentaires",
"No comments yet, start the conversation!" : "Il n'y a aucun commentaire, démarrez la conversation !",
"More comments …" : "Plus de commentaires ...",
"Save" : "Enregistrer",
"Allowed characters {count} of {max}" : "{count} sur {max} caractères autorisés",
"Error occurred while retrieving comment with id {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'id {id}",
"Error occurred while retrieving comment with ID {id}" : "Une erreur est survenue lors de la récupération du commentaire avec l'ID {id}",
"Error occurred while updating comment with id {id}" : "Une erreur est survenue lors de la mise à jour du commentaire avec l'id {id}",
"Error occurred while posting comment" : "Une erreur est survenue lors de l'envoi du commentaire",
"_%n unread comment_::_%n unread comments_" : ["%n commentaire non lu","%n commentaires non lus"],
@@ -20,18 +19,17 @@
"%1$s commented" : "%1$s a commenté",
"{author} commented" : "{author} a commenté",
"You commented on %1$s" : "Vous avez commenté %1$s",
"You commented on {file}" : "Vous avez commenté sur {file}",
"You commented on {file}" : "Vous avez commenté {file}",
"%1$s commented on %2$s" : "%1$s a commenté %2$s",
"{author} commented on {file}" : "{author} a commenté sur {file}",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> pour les fichiers",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur “{file}”",
"<strong>Comments</strong> for files" : "<strong>Commentaires</strong> sur les fichiers",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"%s\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”",
"Type in a new comment..." : "Écrire un nouveau commentaire...",
"No other comments available" : "Aucun autre commentaire",
"More comments..." : "Plus de commentaires...",
"{count} unread comments" : "{count} commentaires non lus",
"You commented on %2$s" : "Vous avez commenté %2$s"
"Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers",
"Unknown user" : "Utilisateur·trice inconnu·e",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
}
+26 -1
View File
@@ -1,8 +1,33 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Editar comentario",
"Delete comment" : "Eliminar comentario",
"New comment …" : "Comentario novo …",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
"More comments …" : "Máis comentarios …",
"Save" : "Gardar",
"Comment" : "Comentario"
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
"Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
"Comment" : "Comentario",
"You commented" : "Vostede comentou",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentou",
"You commented on %1$s" : "Vostede comentou en %1$s",
"You commented on {file}" : "Vostede comentou en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentou en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
"{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»",
"Unknown user" : "Usuario descoñecido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»"
},
"nplurals=2; plural=(n != 1);");
+26 -1
View File
@@ -1,6 +1,31 @@
{ "translations": {
"Edit comment" : "Editar comentario",
"Delete comment" : "Eliminar comentario",
"New comment …" : "Comentario novo …",
"Post" : "Publicar",
"Cancel" : "Cancelar",
"[Deleted user]" : "[Usuario eliminado]",
"Comments" : "Comentarios",
"No comments yet, start the conversation!" : "Aínda non hai comentarios, comeza a conversa!",
"More comments …" : "Máis comentarios …",
"Save" : "Gardar",
"Comment" : "Comentario"
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} de {max}",
"Error occurred while updating comment with id {id}" : "Produciuse un erro ao actualizar o comentario co ID {id}",
"Error occurred while posting comment" : "Produciuse un erro ao publicar o comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentario sen ler","%n comentarios sen ler"],
"Comment" : "Comentario",
"You commented" : "Vostede comentou",
"%1$s commented" : "%1$s comentados",
"{author} commented" : "{author} comentou",
"You commented on %1$s" : "Vostede comentou en %1$s",
"You commented on {file}" : "Vostede comentou en {file}",
"%1$s commented on %2$s" : "%1$s comentados en %2$s",
"{author} commented on {file}" : "{author} comentou en {file}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> para ficheiros",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mencionouno a vostede nun comentario en «%2$s»",
"{user} mentioned you in a comment on “{file}”" : "{user} mencionouno a vostede nun comentario en «{file}»",
"Unknown user" : "Usuario descoñecido",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «%s»",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un usuario (agora) eliminado, mencionouno a vostede nun comentario en «{file}»"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+19 -8
View File
@@ -1,25 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "עריכת תגובה",
"Delete comment" : "מחיקת תגובה",
"New comment …" : "תגובה חדשה",
"Post" : "פרסום",
"Cancel" : "ביטול",
"Edit comment" : "עריכת תגובה",
"[Deleted user]" : "[משתמשים מוסרים]",
"Comments" : "תגובות",
"No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!",
"More comments …" : "תגובות נוספות…",
"Save" : "שמירה",
"Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
"Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
"Error occurred while retrieving comment with ID {id}" : "אירעה שגיאה בעת קבלת התגובה עם המזהה {id}",
"Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
"Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
"_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"],
"Comment" : "תגובה",
"You commented" : "הערות שלך",
"%1$s commented" : "התקבלו תגובות %1$s",
"You commented on %2$s" : ערות שלך ב- %2$s",
"{author} commented" : תקבלה תגובה מאת {author}",
"You commented on %1$s" : "הגבת על %1$s",
"You commented on {file}" : "הגבת על {file}",
"%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
"Type in a new comment..." : "יש להכניס תגובה חדשה...",
"No other comments available" : "אין תגובות אחרות זמינות",
"More comments..." : "תגובות נוספות...",
"{count} unread comments" : "{count} תגובות שלא נקראו"
"{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
"%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
"{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
"Unknown user" : "משתמש לא ידוע",
"A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"
},
"nplurals=2; plural=(n != 1);");
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
+19 -8
View File
@@ -1,23 +1,34 @@
{ "translations": {
"Edit comment" : "עריכת תגובה",
"Delete comment" : "מחיקת תגובה",
"New comment …" : "תגובה חדשה",
"Post" : "פרסום",
"Cancel" : "ביטול",
"Edit comment" : "עריכת תגובה",
"[Deleted user]" : "[משתמשים מוסרים]",
"Comments" : "תגובות",
"No comments yet, start the conversation!" : "אין תגובות עדיין, בואו נתחיל לקשקש!",
"More comments …" : "תגובות נוספות…",
"Save" : "שמירה",
"Allowed characters {count} of {max}" : "תווים מותרים {count} מתוך {max}",
"Error occurred while retrieving comment with id {id}" : "שגיאה אירעה כאשר אוחזרה תגובה עם מספר זיהוי {id}",
"Error occurred while retrieving comment with ID {id}" : "אירעה שגיאה בעת קבלת התגובה עם המזהה {id}",
"Error occurred while updating comment with id {id}" : "שגיאה אירעה כאשר עודכנה תגובה עם מספר זיהוי {id}",
"Error occurred while posting comment" : "אירעה שגיאה בזמן פרסום תגובה",
"_%n unread comment_::_%n unread comments_" : ["תגובה אחת שלא נקראה","%n תגובות שלא נקראו","%n תגובות שלא נקראו","%n תגובות שלא נקראו"],
"Comment" : "תגובה",
"You commented" : "הערות שלך",
"%1$s commented" : "התקבלו תגובות %1$s",
"You commented on %2$s" : ערות שלך ב- %2$s",
"{author} commented" : תקבלה תגובה מאת {author}",
"You commented on %1$s" : "הגבת על %1$s",
"You commented on {file}" : "הגבת על {file}",
"%1$s commented on %2$s" : "התקבלו תגובות %1$s ב- %2$s ",
"Type in a new comment..." : "יש להכניס תגובה חדשה...",
"No other comments available" : "אין תגובות אחרות זמינות",
"More comments..." : "תגובות נוספות...",
"{count} unread comments" : "{count} תגובות שלא נקראו"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
"{author} commented on {file}" : "נוספה תגובה על {file} מאת {author}",
"<strong>Comments</strong> for files" : "<strong>תגובות</strong> על קבצים",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "אוזכרת ב־„%s”, בתגובה על ידי משתמש שנמחק בינתיים.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "אוזכרת ב־„{file}”, בתגובה של משתמש שנמחק בינתיים.",
"%1$s mentioned you in a comment on “%2$s”" : "אוזכרת על ידי %1$s בתגובה על „%2$s”",
"{user} mentioned you in a comment on “{file}”" : "אוזכרת על ידי „{user}” בתגובה על „{file}”",
"Unknown user" : "משתמש לא ידוע",
"A (now) deleted user mentioned you in a comment on “%s”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "אוזכרת על ידי משתמש שנמחק (נכון לעכשיו) בתגובה על „{file}”"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
}
+36
View File
@@ -0,0 +1,36 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Hozzászólás szerkesztése",
"Delete comment" : "Hozzászólás törlése",
"New comment …" : "Új hozzászólás...",
"Post" : "Küldés",
"Cancel" : "Mégsem",
"[Deleted user]" : "[Törölt felhasználó]",
"Comments" : "Hozzászólások",
"No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
"More comments …" : "Több hozzászólás...",
"Save" : "Mentés",
"Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
"Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú komment betöltésekor",
"Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
"Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
"_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
"Comment" : "Hozzászólás",
"You commented" : "Hozzászóltál",
"%1$s commented" : "%1$s hozzászólt",
"{author} commented" : "{author} hozzászólt",
"You commented on %1$s" : "Hozzászoltál ehhez: %1$s",
"You commented on {file}" : "Hozzászóltál ehhez: {file}",
"%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
"{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
"<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “{file}”, egy már törölt felhasználó hozzászólásában",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
"Unknown user" : "Ismeretlen felhasználó",
"A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”"
},
"nplurals=2; plural=(n != 1);");
+34
View File
@@ -0,0 +1,34 @@
{ "translations": {
"Edit comment" : "Hozzászólás szerkesztése",
"Delete comment" : "Hozzászólás törlése",
"New comment …" : "Új hozzászólás...",
"Post" : "Küldés",
"Cancel" : "Mégsem",
"[Deleted user]" : "[Törölt felhasználó]",
"Comments" : "Hozzászólások",
"No comments yet, start the conversation!" : "Még nincsenek hozzászólások, kezdd el a beszélgetést!",
"More comments …" : "Több hozzászólás...",
"Save" : "Mentés",
"Allowed characters {count} of {max}" : "Engedélyezett karakterek: {count} / {max}",
"Error occurred while retrieving comment with ID {id}" : "Hiba a {id} számú komment betöltésekor",
"Error occurred while updating comment with id {id}" : "Hiba a következő azonosítójú hozzászólás frissítése közben: {id}",
"Error occurred while posting comment" : "Hiba történt a hozzászólás küldése közben",
"_%n unread comment_::_%n unread comments_" : ["%n olvasatlan hozzászólás","%n olvasatlan hozzászólás"],
"Comment" : "Hozzászólás",
"You commented" : "Hozzászóltál",
"%1$s commented" : "%1$s hozzászólt",
"{author} commented" : "{author} hozzászólt",
"You commented on %1$s" : "Hozzászoltál ehhez: %1$s",
"You commented on {file}" : "Hozzászóltál ehhez: {file}",
"%1$s commented on %2$s" : "%1$s hozzászólt ehhez: %2$s",
"{author} commented on {file}" : "{author} hozzászólt ehhez: {file}",
"<strong>Comments</strong> for files" : "<strong>Hozzászólások</strong> fájlokhoz",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “%s”, egy már törölt felhasználó hozzászólásában",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Megemlítettek ezen: “{file}”, egy már törölt felhasználó hozzászólásában",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s megemlített egy hozzászólásban itt: “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} megemlített egy hozzászólásban itt: “{file}”",
"Unknown user" : "Ismeretlen felhasználó",
"A (now) deleted user mentioned you in a comment on “%s”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Egy (most) törölt felhasználó megemlített egy hozzászólásban itt: “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+27 -1
View File
@@ -1,7 +1,33 @@
OC.L10N.register(
"comments",
{
"Edit comment" : "Modificar commentario",
"Delete comment" : "Deler commentario",
"New comment …" : "Nove commentario ...",
"Post" : "Publicar",
"Cancel" : "Cancellar",
"Save" : "Salveguardar"
"[Deleted user]" : "[Usator delite]",
"Comments" : "Commentarios",
"No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
"More comments …" : "Plus commentarios ...",
"Save" : "Salveguardar",
"Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
"Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
"Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
"_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
"Comment" : "Commentario",
"You commented" : "Tu commentava",
"%1$s commented" : "%1$s commentava",
"{author} commented" : "{author} commentava",
"You commented on %1$s" : "Tu commentava in %1$s",
"You commented on {file}" : "Tu commentava in {file}",
"%1$s commented on %2$s" : "%1$s commentava in %2$s",
"{author} commented on {file}" : "{author} commentava in {file}",
"<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
"Unknown user" : "Usator incognite",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”"
},
"nplurals=2; plural=(n != 1);");
+27 -1
View File
@@ -1,5 +1,31 @@
{ "translations": {
"Edit comment" : "Modificar commentario",
"Delete comment" : "Deler commentario",
"New comment …" : "Nove commentario ...",
"Post" : "Publicar",
"Cancel" : "Cancellar",
"Save" : "Salveguardar"
"[Deleted user]" : "[Usator delite]",
"Comments" : "Commentarios",
"No comments yet, start the conversation!" : "Il ha nulle commentarios ancora, initia le conversation!",
"More comments …" : "Plus commentarios ...",
"Save" : "Salveguardar",
"Allowed characters {count} of {max}" : "{count} characteres permittite de {max}",
"Error occurred while updating comment with id {id}" : "Un error occurreva durante le actualisation del commentario identificate per {id}",
"Error occurred while posting comment" : "Un error occurreva durante le publication del commentario",
"_%n unread comment_::_%n unread comments_" : ["%n commentario non legite","%n commentarios non legite"],
"Comment" : "Commentario",
"You commented" : "Tu commentava",
"%1$s commented" : "%1$s commentava",
"{author} commented" : "{author} commentava",
"You commented on %1$s" : "Tu commentava in %1$s",
"You commented on {file}" : "Tu commentava in {file}",
"%1$s commented on %2$s" : "%1$s commentava in %2$s",
"{author} commented on {file}" : "{author} commentava in {file}",
"<strong>Comments</strong> for files" : "<strong>Commentarios</strong> pro files",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentionava tu in un commentario in “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} mentionava tu in un commentario in “{file}”",
"Unknown user" : "Usator incognite",
"A (now) deleted user mentioned you in a comment on “%s”" : "Un (ora) delite usator mentionava tu in un commentario in “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Un (ora) delite usator mentionava tu in un commentario in “{file}”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+16 -9
View File
@@ -1,29 +1,36 @@
OC.L10N.register(
"comments",
{
"Comments" : "Athugasemdir",
"New comment …" : "Ný athugasemd ...",
"Edit comment" : "Breyta athugasemd",
"Delete comment" : "Eyða athugasemd",
"New comment …" : "Ný athugasemd ...",
"Post" : "Senda",
"Cancel" : "Hætta við",
"Edit comment" : "Breyta athugasemd",
"[Deleted user]" : "[Eyddur notandi]",
"Comments" : "Athugasemdir",
"No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
"More comments …" : "Fleiri athugasemdir ...",
"Save" : "Vista",
"Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
"Error occurred while retrieving comment with id {id}" : "Villa kom upp við að reyna að ná í athugasemd með auðkenninu {id}",
"Error occurred while retrieving comment with ID {id}" : "Villa kom upp við að reyna að ná í ummæli með auðkenninu {id}",
"Error occurred while updating comment with id {id}" : "Villa kom upp við að reyna að uppfæra athugasemd með auðkenninu {id}",
"Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
"_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
"Comment" : "Athugasemd",
"You commented" : "Þú settir inn athugasemd",
"%1$s commented" : "%1$s setti inn athugasemd",
"{author} commented" : "{author} setti inn athugasemd",
"You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
"You commented on {file}" : "Þú settir inn athugasemd við {file}",
"%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
"{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
"<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
"Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
"No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
"More comments..." : "Fleiri athugasemdir...",
"{count} unread comments" : "{count} ólesnar athugasemdir",
"You commented on %2$s" : "Þú settir inn athugasemd við %2$s"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
"Unknown user" : "Óþekktur notandi",
"A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"
},
"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
+16 -9
View File
@@ -1,27 +1,34 @@
{ "translations": {
"Comments" : "Athugasemdir",
"New comment …" : "Ný athugasemd ...",
"Edit comment" : "Breyta athugasemd",
"Delete comment" : "Eyða athugasemd",
"New comment …" : "Ný athugasemd ...",
"Post" : "Senda",
"Cancel" : "Hætta við",
"Edit comment" : "Breyta athugasemd",
"[Deleted user]" : "[Eyddur notandi]",
"Comments" : "Athugasemdir",
"No comments yet, start the conversation!" : "Engar athugasemdir ennþá, byrjaðu umræðuna!",
"More comments …" : "Fleiri athugasemdir ...",
"Save" : "Vista",
"Allowed characters {count} of {max}" : "Leyfður stafafjöldi {count} af {max}",
"Error occurred while retrieving comment with id {id}" : "Villa kom upp við að reyna að ná í athugasemd með auðkenninu {id}",
"Error occurred while retrieving comment with ID {id}" : "Villa kom upp við að reyna að ná í ummæli með auðkenninu {id}",
"Error occurred while updating comment with id {id}" : "Villa kom upp við að reyna að uppfæra athugasemd með auðkenninu {id}",
"Error occurred while posting comment" : "Villa kom upp við að senda inn athugasemd",
"_%n unread comment_::_%n unread comments_" : ["%n ólesin athugasemd","%n ólesnar athugasemdir"],
"Comment" : "Athugasemd",
"You commented" : "Þú settir inn athugasemd",
"%1$s commented" : "%1$s setti inn athugasemd",
"{author} commented" : "{author} setti inn athugasemd",
"You commented on %1$s" : "Þú settir inn athugasemd við %1$s",
"You commented on {file}" : "Þú settir inn athugasemd við {file}",
"%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
"{author} commented on {file}" : "{author} setti inn athugasemd við {file}",
"<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár",
"Type in a new comment..." : "Skrifaðu inn nýja athugasemd...",
"No other comments available" : "Engar aðrar athugasemdir eru tiltækar",
"More comments..." : "Fleiri athugasemdir...",
"{count} unread comments" : "{count} ólesnar athugasemdir",
"You commented on %2$s" : "Þú settir inn athugasemd við %2$s"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Minnst var á þig í “%s”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Minnst var á þig í “{file}”, í athugasemd frá notanda sem síðan þá hefur verið eytt",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s minntist á þig í athugasemd við “%2$s”",
"{user} mentioned you in a comment on “{file}”" : "{user} minntist á þig í athugasemd við “{file}”",
"Unknown user" : "Óþekktur notandi",
"A (now) deleted user mentioned you in a comment on “%s”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “%s”",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Notandi (sem nú er búið að eyða) minntist á þig í athugasemd við “{file}”"
},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
}

Some files were not shown because too many files have changed in this diff Show More