Compare commits

..

3820 Commits

Author SHA1 Message Date
Morris Jobke 68a1f2074e Merge pull request #13477 from nextcloud/version/noid/13.0.9
13.0.9
2019-01-10 15:24:12 +01:00
Morris Jobke 3ff6391329 13.0.9
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-10 11:23:47 +01:00
Morris Jobke 9d4d604125 Merge pull request #13471 from nextcloud/backport/13467/stable13
[stable13] Show the repair steps and repair info output in the web for better feedback
2019-01-10 10:44:19 +01:00
Morris Jobke d3d3694432 Show the repair steps and repair info output in the web for better feedback
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-10 07:38:17 +00:00
Nextcloud bot 8a8cc531cb [tx-robot] updated from transifex 2019-01-10 01:12:35 +00:00
Roeland Jago Douma d9db6b7ec4 Merge pull request #13454 from nextcloud/version/noid/13.0.9RC2
13.0.9 RC 2
2019-01-09 20:27:09 +01:00
Morris Jobke da6ba224b8 13.0.9 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-09 19:19:42 +01:00
Morris Jobke 9681279623 Merge pull request #13443 from nextcloud/backport/13430-13
[stable13] Respect classification of calendar events in activity stream
2019-01-09 19:19:03 +01:00
Joas Schilling 63e24d0903 Prevent php info about missing index for old events
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-09 18:33:17 +01:00
Joas Schilling 5ea32a1bca Add a repair step to remove sensitive event activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-09 18:33:17 +01:00
Joas Schilling 194c4b717e Correctly handle the classification of events in the activity stream
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-09 18:33:17 +01:00
Morris Jobke 81b02e34dd Merge pull request #13422 from nextcloud/backport/9174/stable13
[stable13] log more information about insufficient storage in dav plugin
2019-01-09 18:01:16 +01:00
Nextcloud bot 084e9fd237 [tx-robot] updated from transifex 2019-01-09 01:13:09 +00:00
Robin Appelman 6252f07fbc log more information about insufficient storage in dav plugin
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-08 14:22:29 +00:00
Nextcloud bot 88455103fd [tx-robot] updated from transifex 2019-01-08 01:12:30 +00:00
Nextcloud bot 95ad0a79ba [tx-robot] updated from transifex 2019-01-07 01:12:27 +00:00
Nextcloud bot a150a986ce [tx-robot] updated from transifex 2019-01-06 01:13:33 +00:00
Roeland Jago Douma ccfd23cb32 Merge pull request #13348 from nextcloud/version/noid/13.0.9RC1
13.0.9 RC 1
2019-01-05 21:38:28 +01:00
Morris Jobke 67b94a4b1e 13.0.9 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-01-05 16:45:59 +01:00
Roeland Jago Douma de761e22d0 Merge pull request #13374 from nextcloud/backport/13363/stable13
[stable13] Fix loginflow with apptoken enter on iOS
2019-01-05 16:41:48 +01:00
Roeland Jago Douma 2757a42907 Fix loginflow with apptoken enter on iOS
It seems iOS doesn't like us to change the location. So now we submit it
to the server that geneartes the redirect.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-05 15:55:02 +01:00
Nextcloud bot 14c8416685 [tx-robot] updated from transifex 2019-01-05 01:12:27 +00:00
Morris Jobke 3c3cb71bda Merge pull request #13359 from nextcloud/backport/13351/stable13
[stable13] Update the CRL
2019-01-04 19:11:05 +01:00
Roeland Jago Douma dff2cf614b Update the CRL
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-04 17:26:30 +01:00
Nextcloud bot 4cd18afb29 [tx-robot] updated from transifex 2019-01-04 01:12:57 +00:00
Nextcloud bot 2e1701bfba [tx-robot] updated from transifex 2019-01-03 01:12:16 +00:00
Nextcloud bot c1472e0cdd [tx-robot] updated from transifex 2019-01-02 01:11:56 +00:00
Nextcloud bot 93923fbe49 [tx-robot] updated from transifex 2019-01-01 01:12:04 +00:00
Nextcloud bot fcae962594 [tx-robot] updated from transifex 2018-12-31 01:12:11 +00:00
Nextcloud bot 2ad10aa7a2 [tx-robot] updated from transifex 2018-12-30 01:13:11 +00:00
Nextcloud bot 91117e4e2e [tx-robot] updated from transifex 2018-12-29 01:12:12 +00:00
Nextcloud bot aa4a4d4415 [tx-robot] updated from transifex 2018-12-28 01:12:15 +00:00
Nextcloud bot 0e03a5c839 [tx-robot] updated from transifex 2018-12-27 01:12:12 +00:00
Nextcloud bot ae2f588305 [tx-robot] updated from transifex 2018-12-26 01:12:24 +00:00
Nextcloud bot a1e4250278 [tx-robot] updated from transifex 2018-12-25 01:12:03 +00:00
Nextcloud bot 224dbe15fd [tx-robot] updated from transifex 2018-12-24 01:12:15 +00:00
Nextcloud bot 287bcbb548 [tx-robot] updated from transifex 2018-12-23 01:12:53 +00:00
Nextcloud bot a8dbf30293 [tx-robot] updated from transifex 2018-12-22 01:12:15 +00:00
blizzz f11706e351 Merge pull request #13220 from nextcloud/backport/13187/stable13
[stable13] do not forgot to store the second displayname portion
2018-12-21 16:57:35 +01:00
Arthur Schiwon 827be719f9 do not forgot to store the second displayname portion
otherwise it causes a chain reaction of system addressbook updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-12-21 13:44:16 +00:00
Nextcloud bot 69798a20a4 [tx-robot] updated from transifex 2018-12-21 01:12:15 +00:00
Nextcloud bot b677dadf18 [tx-robot] updated from transifex 2018-12-20 01:12:13 +00:00
John Molakvoæ ea82ffdb51 Merge pull request #13153 from nextcloud/backport/13133/stable13
[stable13] Prevent special characters from breaking the file drop remote url
2018-12-19 10:56:37 +01:00
John Molakvoæ (skjnldsv) 5eff452b23 Prevent special characters from breaking the file drop remote url
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-19 08:55:43 +00:00
Nextcloud bot daea45c424 [tx-robot] updated from transifex 2018-12-19 01:12:16 +00:00
Roeland Jago Douma 32c40afdc9 Merge pull request #13125 from nextcloud/backport/13118/stable13
[stable13] Fix SAML Client login flow on Apple devices
2018-12-18 16:20:13 +01:00
Nextcloud bot f61d9a1869 [tx-robot] updated from transifex 2018-12-18 01:11:59 +00:00
Roeland Jago Douma 3b4abd550b Fix SAML Client login flow on Apple devices
Because the redirect from the SAML/SSO endpoint is a POST the lax/strict
cookies are not properly send.

Note that it is not strictly requried on this endpoint as we do not need
the remember me data. Only the real session info is enough. The endpoint
is also already protected by a state token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-17 13:20:14 +00:00
Nextcloud bot a730ad16f1 [tx-robot] updated from transifex 2018-12-17 01:11:59 +00:00
Nextcloud bot 90bd295d3c [tx-robot] updated from transifex 2018-12-16 01:12:59 +00:00
Nextcloud bot c2d7f88fdf [tx-robot] updated from transifex 2018-12-15 01:12:04 +00:00
Nextcloud bot a601e7b952 [tx-robot] updated from transifex 2018-12-14 01:12:58 +00:00
Nextcloud bot e5a6c719db [tx-robot] updated from transifex 2018-12-13 01:12:25 +00:00
Nextcloud bot f360b8df0b [tx-robot] updated from transifex 2018-12-12 01:12:04 +00:00
Nextcloud bot ab42aada9b [tx-robot] updated from transifex 2018-12-11 01:12:15 +00:00
Nextcloud bot fb158c7c4e [tx-robot] updated from transifex 2018-12-10 01:12:04 +00:00
Nextcloud bot 5802a9660c [tx-robot] updated from transifex 2018-12-09 01:12:53 +00:00
Nextcloud bot d9698149c9 [tx-robot] updated from transifex 2018-12-08 01:11:50 +00:00
Nextcloud bot af3f951a33 [tx-robot] updated from transifex 2018-12-07 01:12:10 +00:00
Nextcloud bot 1ee41dce74 [tx-robot] updated from transifex 2018-12-06 01:12:29 +00:00
Morris Jobke 71ceecc1fe Merge pull request #12864 from nextcloud/backport/12855/stable13
[stable13] Only execute query in propagateChange once
2018-12-06 00:04:53 +01:00
Roeland Jago Douma 4c88cef749 Only execute query in propagateChange once
The second execute statement should be inside the if block. Else it gets
executed twice which makes no sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-05 20:45:50 +00:00
Morris Jobke cebd51097d Merge pull request #12835 from nextcloud/backport/12831/stable13
[stable13] Do not update child all child shares on group share update
2018-12-05 09:35:46 +01:00
Christoph Wurst 0d602760df Merge pull request #12818 from nextcloud/backport/12813/stable13
[stable13] Fix the system address book
2018-12-05 08:17:40 +01:00
Nextcloud bot e545bcd54d [tx-robot] updated from transifex 2018-12-05 01:12:23 +00:00
Roeland Jago Douma b9b58b1ace Do not update child all child shares on group share update
Else we overwrite the whole share for link shares. Basically breaking
them.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-04 21:53:38 +00:00
Roeland Jago Douma d8f2e22e6b Merge pull request #12827 from nextcloud/backport/12822/stable13
[stable13] PHP module is named mbstring
2018-12-04 20:10:28 +01:00
Morris Jobke d2f89950d8 PHP module is named mbstring
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-12-04 17:58:02 +00:00
Roeland Jago Douma 094b98376f Fix the system address book
c23a66cda4 broke the system address book.
We now move the ACL rules for this special case up and all is good in
the world again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-04 14:21:51 +00:00
Nextcloud bot 0d5f3d16e9 [tx-robot] updated from transifex 2018-12-04 01:12:34 +00:00
Nextcloud bot 9a48fdd5e8 [tx-robot] updated from transifex 2018-12-03 01:12:00 +00:00
Nextcloud bot e5088791e9 [tx-robot] updated from transifex 2018-12-02 01:13:04 +00:00
Nextcloud bot f30bf3ebf5 [tx-robot] updated from transifex 2018-12-01 01:11:55 +00:00
Nextcloud bot 2e09bb48fb [tx-robot] updated from transifex 2018-11-30 01:12:26 +00:00
Nextcloud bot 8f80685426 [tx-robot] updated from transifex 2018-11-29 01:12:00 +00:00
Nextcloud bot e389bf4588 [tx-robot] updated from transifex 2018-11-28 01:12:24 +00:00
Nextcloud bot eca49de335 [tx-robot] updated from transifex 2018-11-27 01:11:59 +00:00
Nextcloud bot fffed81800 [tx-robot] updated from transifex 2018-11-26 01:11:49 +00:00
Nextcloud bot c741fe5aed [tx-robot] updated from transifex 2018-11-25 01:12:42 +00:00
Nextcloud bot 537694fc60 [tx-robot] updated from transifex 2018-11-24 01:11:47 +00:00
Morris Jobke 122ecf8ebd Merge pull request #12595 from nextcloud/backport/12448/stable13
[stable13] Load apps that have a dav type set before the dav server plugins
2018-11-23 08:35:52 +01:00
Roeland Jago Douma 8e7900c15d Merge pull request #12616 from nextcloud/backport/12592/stable13
[stable13] fix typo in original english string and all translations
2018-11-23 07:51:18 +01:00
Nextcloud bot ca4abe8da6 [tx-robot] updated from transifex 2018-11-23 01:13:30 +00:00
Patrick Baber 7e315ef983 fix typo in original english string and all translations
Signed-off-by: Patrick Baber <patrick@p-squared.de>
2018-11-22 23:37:47 +01:00
Julius Härtl 59c379bc5e Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-22 16:20:47 +00:00
Morris Jobke a966d7f9ca Merge pull request #12585 from nextcloud/version/noid/13.0.8
13.0.8
2018-11-22 14:03:46 +01:00
Morris Jobke 51a89baf9a 13.0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-22 11:02:06 +01:00
Nextcloud bot 008826f99e [tx-robot] updated from transifex 2018-11-22 01:12:38 +00:00
Roeland Jago Douma bea70d4ad3 Merge pull request #12562 from nextcloud/backport/12544/stable13
[13] Handle permission in update of share better
2018-11-21 08:57:55 +01:00
Nextcloud bot f627754965 [tx-robot] updated from transifex 2018-11-21 01:12:34 +00:00
Roeland Jago Douma 7b2a7f695f Handle permission in update of share better
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 19:38:46 +01:00
Julius Härtl d268a97d21 Merge pull request #12546 from nextcloud/backport/12543/stable13
[stable13] Bearer tokens are app token
2018-11-20 15:21:43 +01:00
Roeland Jago Douma 1794c3fdea Bearer tokens are app token
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-20 10:51:07 +00:00
Morris Jobke 9939540ce4 Merge pull request #12532 from nextcloud/version/noid/13.0.8rc2
13.0.8 RC 2
2018-11-20 09:25:47 +01:00
Nextcloud bot 0cb7c03132 [tx-robot] updated from transifex 2018-11-20 01:12:57 +00:00
Morris Jobke 77e72c7b0e 13.0.8 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-19 15:43:35 +01:00
Morris Jobke 59b4643c72 Merge pull request #12503 from nextcloud/swift-object-not-found-13
[13] forward object not found error in swift as dav 404
2018-11-19 15:32:27 +01:00
Robin Appelman 5261edb61a forward object not found error in swift as dav 404
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-19 11:37:12 +01:00
Nextcloud bot c85d6b3d69 [tx-robot] updated from transifex 2018-11-19 01:12:23 +00:00
Nextcloud bot 98c7accec8 [tx-robot] updated from transifex 2018-11-18 01:13:17 +00:00
Nextcloud bot a6c58d74dd [tx-robot] updated from transifex 2018-11-17 01:13:08 +00:00
Nextcloud bot 24a04fae3d [tx-robot] updated from transifex 2018-11-16 01:12:34 +00:00
Morris Jobke 03ea80edde Merge pull request #12437 from nextcloud/version/noid/13.0.8RC1
13.0.8 RC 1
2018-11-15 15:36:01 +01:00
Morris Jobke 1085cae542 13.0.8 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:48:12 +01:00
Morris Jobke 4a71b80b74 Merge pull request #12460 from nextcloud/bugfix-stable13/dav_shares_hickup
[stable13] fixes dav share issue with owner
2018-11-15 13:41:08 +01:00
Georg Ehrke 2a31d842ea fix caldav tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-15 13:01:40 +01:00
Nextcloud bot c2000c295c [tx-robot] updated from transifex 2018-11-15 01:12:32 +00:00
Georg Ehrke d9b5726455 fixes dav share issue with owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-14 21:52:08 +01:00
Nextcloud bot 6e07165bc2 [tx-robot] updated from transifex 2018-11-14 01:12:30 +00:00
Roeland Jago Douma b89996483d Merge pull request #12376 from nextcloud/backport/12284/stable13
[13] Properly search the root of a shared external storage
2018-11-13 15:59:01 +01:00
Morris Jobke 204466c714 Merge pull request #12434 from nextcloud/backport/12411-12413/unique-constraint-fix-13
[stable13] Unique contraint and deadlock fixes for filecache and file_locks
2018-11-13 15:03:51 +01:00
Morris Jobke 243516d785 Fix UniqueConstraintViolationException while insert into oc_file_locks
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 14:05:16 +01:00
Morris Jobke 0737a6fbe4 Fix UniqueConstraintViolationException while insert into oc_filecache
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-13 14:05:13 +01:00
Nextcloud bot 413121dea1 [tx-robot] updated from transifex 2018-11-13 01:13:02 +00:00
Nextcloud bot 357bbe1b79 [tx-robot] updated from transifex 2018-11-12 01:13:06 +00:00
Nextcloud bot 5534193d3e [tx-robot] updated from transifex 2018-11-11 01:13:26 +00:00
Nextcloud bot 3d34f6b29c [tx-robot] updated from transifex 2018-11-10 01:12:44 +00:00
Roeland Jago Douma 8b03bf7d5a Properly search the root of a shared external storage
Fixes #1020

When an external storage is shared with you in full the root is ''
(empty). This adds an extra check for an empty jail basically.

Because if the jail is on the empty string. It matches all paths.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-09 13:23:52 +01:00
Nextcloud bot 9c7f09d2ac [tx-robot] updated from transifex 2018-11-09 01:12:47 +00:00
Nextcloud bot 7afee0e583 [tx-robot] updated from transifex 2018-11-08 01:12:37 +00:00
Nextcloud bot af858c257a [tx-robot] updated from transifex 2018-11-07 01:12:49 +00:00
Morris Jobke 1cac241318 Merge pull request #12298 from nextcloud/backport/12127/stable13
[13] A folder should get a folder mimetype
2018-11-06 18:13:45 +01:00
Roeland Jago Douma fc49fa1620 A folder should get a folder mimetype
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.

If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-06 08:02:48 +01:00
Nextcloud bot 450b9e2a20 [tx-robot] updated from transifex 2018-11-06 01:12:56 +00:00
Nextcloud bot 30666be2f0 [tx-robot] updated from transifex 2018-11-05 01:12:55 +00:00
Nextcloud bot 374bfbeaca [tx-robot] updated from transifex 2018-11-04 01:14:21 +00:00
Nextcloud bot 0e125b810a [tx-robot] updated from transifex 2018-11-03 01:12:58 +00:00
Morris Jobke afed9ae664 Merge pull request #12212 from nextcloud/backport/12140/stable13
[13] Expired tokens should not trigger bruteforce protection
2018-11-02 12:33:31 +01:00
Roeland Jago Douma 40d1202076 Error out early on an expired token
Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:41:00 +01:00
Roeland Jago Douma 04617a28d4 Move ExpiredTokenException to the correct namespace
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 11:39:42 +01:00
Roeland Jago Douma 3aaeaf1316 Merge pull request #12208 from nextcloud/backport/12130/stable13
[13] Reset bruteforce on token refresh OAuth
2018-11-02 11:38:13 +01:00
Roeland Jago Douma 6971ecef9d Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 10:54:50 +01:00
Nextcloud bot 4708a2529e [tx-robot] updated from transifex 2018-11-02 01:13:56 +00:00
Nextcloud bot 68c17136dd [tx-robot] updated from transifex 2018-11-01 01:13:22 +00:00
Nextcloud bot ea7f80206b [tx-robot] updated from transifex 2018-10-31 01:13:13 +00:00
Roeland Jago Douma aa6f50aa91 Merge pull request #12142 from nextcloud/backport/12054/stable13
[stable13] LDAP: announce display name changes so that addressbook picks it up
2018-10-30 16:28:27 +01:00
Arthur Schiwon 82bb002eaa adjust tests to 13 codebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 14:10:35 +01:00
Arthur Schiwon 908e6be07e Backport of #12054 to stable13
only write when the displayname differs, but then announce it

refs #5212 and fixes #9112

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

do not run into UniqueConstraintViolationException

… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 14:10:21 +01:00
Nextcloud bot d90385caf6 [tx-robot] updated from transifex 2018-10-30 01:13:14 +00:00
Roeland Jago Douma 661062271f Merge pull request #12123 from nextcloud/backport/12107/stable13
[stable13] remove unneeded empty search attribute values, fixes #12086
2018-10-29 20:06:24 +01:00
Arthur Schiwon c4df29afb0 remove unneeded empty search attribute values, fixes #12086
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-29 17:29:32 +01:00
Morris Jobke 061846c7d0 Merge pull request #12112 from nextcloud/backport/12038/stable13
[13] Implement the size of an assembly stream
2018-10-29 17:22:03 +01:00
Morris Jobke 4e911226c6 Merge pull request #12109 from nextcloud/backport/11862/stable13
[13] Double check for failed cache with a shared storage
2018-10-29 17:20:21 +01:00
Roeland Jago Douma 8dcc7fc0f5 Implement the size of an assembly stream
This will make it possible to act propely on moves of future files if we
need to know the size (like for max size virus scanning).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-29 15:19:55 +01:00
Roeland Jago Douma f903a7637b Double check for failed cache with a shared storage
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-29 15:13:21 +01:00
Nextcloud bot 7686c03111 [tx-robot] updated from transifex 2018-10-29 01:13:27 +00:00
Nextcloud bot aa021a9407 [tx-robot] updated from transifex 2018-10-28 00:13:07 +00:00
Nextcloud bot 4e148133c9 [tx-robot] updated from transifex 2018-10-27 00:12:54 +00:00
Morris Jobke 9223159d42 Merge pull request #12060 from mikaelh/stable13
Actually return the root folder when traversing up the tree
2018-10-26 11:02:50 +02:00
Roeland Jago Douma d8a581e426 Actually return the root folder when traversing up the tree
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-26 08:36:21 +02:00
Nextcloud bot ae061c69f1 [tx-robot] updated from transifex 2018-10-26 00:13:08 +00:00
Nextcloud bot 3d54e261ee [tx-robot] updated from transifex 2018-10-25 00:13:24 +00:00
Morris Jobke 1a28789db1 Merge pull request #12006 from iPaat/Backport13/Fix11847
[stable13] Remove cookies from Clear-Site-Data Header
2018-10-24 14:35:54 +02:00
Patrick Conrad 06e43bb46a Remove cookies from Clear-Site-Data Header
In https://github.com/nextcloud/server/commit/2f87fb6b456fd109c90a5093c31b7a3f62a32040 this header was introduced. The referenced documentation says:

> When delivered with a response from https://example.com/clear, the following header will cause cookies associated with the origin https://example.com to be cleared, as well as cookies on any origin in the same registered domain (e.g. https://www.example.com/ and https://more.subdomains.example.com/).

This also applies if `https://nextcloud.example.com/` sends the `Clear-Site-Data: "cookies"` header.
This is not the behavior we want at this point!

So I removed the deletion of cookies from the header. This has no effect on the logout process as this header is supported only recently and the logout works in old browsers as well.

Signed-off-by: Patrick Conrad <conrad@iza.org>
(cherry picked from commit 1806baaeaf)
2018-10-24 08:53:46 +02:00
Nextcloud bot ae17e55f42 [tx-robot] updated from transifex 2018-10-24 00:12:50 +00:00
Roeland Jago Douma c5b0efed3b Merge pull request #11982 from nextcloud/bugfix-stable13/noid/forbid_freebusy_but_allow_local_delivery
[stable13] allow local delivery of schedule message while prohibiting FreeBusy requests
2018-10-23 21:15:08 +02:00
Roeland Jago Douma f4efa550c3 Merge pull request #11996 from nextcloud/stable13-11967-fix-opening-a-section-again-in-the-files-app
[stable13] Fix opening a section again in the Files app
2018-10-23 20:21:35 +02:00
Morris Jobke c3919b844b Merge pull request #11997 from nextcloud/assemblly-stream-lazy-13
lazy open first source stream in assemblystream
2018-10-23 19:19:51 +02:00
Morris Jobke 56812b0ae5 Merge pull request #11962 from nextcloud/backport/11931/stable13
[13] Do not emit preHooks twice on non-part-storage
2018-10-23 18:16:04 +02:00
Robin Appelman 13317da19a lazy open first source stream in assemblystream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-23 17:46:09 +02:00
Daniel Calviño Sánchez 3fbb6e7034 Add acceptance tests for opening a section in the Files app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 17:31:01 +02:00
Daniel Calviño Sánchez bc7e8cb362 Remove event handler no longer needed
The custom handler for "URL changed" events were added to reload the
file list whenever the sections for favorites and shares were opened;
this was used to fix the problem of not reloading the file lists when
opening them for a second time. However, besides that the handlers were
not really necessary, and as the root of the bug was fixed in the
previous commit those handlers are now removed.

The file list for tags uses the handler for a different purpose, though,
so that one was kept.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 17:03:37 +02:00
Daniel Calviño Sánchez 4f5b072c74 Fix opening a section again in the Files app
When a section is open in the Files app a "show" event is triggered.
File list objects handle that event by reloading themselves, but only
if the file list was shown at least once. However, the file list objects
of plugins are created when the "show" event is triggered for the first
time for their section; as the file list objects register their handler
for the "show" event when they are created they never handle the first
triggered "show" event, as the handler is set while that event is being
already handled. Therefore, from the point of view of the handler, the
second time that a "show" event was triggered it was seen as if the file
list was shown for the first time, and thus it was not reloaded. Now the
"shown" property is explicitly set for those file lists that are created
while handling a "show" event, which causes them to be reloaded as
expected when opening their section again.

Note that it is not possible to just reload the file list whenever it is
shown; the file list is reloaded also when the directory changes, and
this can happen when the web page is initially loaded and the URL is
parsed. In that case, if file lists were reloaded when shown for the
first time then it could be reloaded twice, one with the default
parameters due to the "show" event and another one with the proper
parameters once the URL was parsed, and the files that appeard in the
list would depend on which response from the server was received the
last.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-23 17:02:54 +02:00
Nextcloud bot 5de5db0280 [tx-robot] updated from transifex 2018-10-23 14:54:51 +00:00
Roeland Jago Douma b7524ee49e Merge pull request #11978 from nextcloud/bugfix-stable13/9326/make_sure_usermanager_getByEmail_only_returns_IUser
[stable13] filter null values for UserManager::getByEmail
2018-10-23 15:14:56 +02:00
Roeland Jago Douma 18b4b6c324 Merge pull request #11992 from nextcloud/backport/11972/fix-l10n-fetching-from-theme-13
[stable13] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
2018-10-23 11:50:34 +02:00
Morris Jobke 28fa1e3c7d Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js
Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-23 10:35:33 +02:00
Georg Ehrke aa94064cf5 move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-23 10:07:31 +02:00
Georg Ehrke 879538c22f filter null values for UserManager::getByEmail
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-22 15:54:41 +02:00
Roeland Jago Douma 998b646f97 Do not emit preHooks twice on non-part-storage
The old code would emit the hooks twice. Thus having the version written
twice. Which is not very performant as it is first read twice as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-21 13:59:00 +02:00
Roeland Jago Douma e3a2b9e3e6 Merge pull request #11857 from nextcloud/backport/10942/longer-password-reset-time
[stable13] Change password expiration time from 12h to 7d
2018-10-17 22:14:31 +02:00
Morris Jobke 7613801a58 Change password expiration time from 12h to 7d
We use the same logic for creating accounts without a password and there the 12h is a bit short. Users don't expect that the signup link needs to be clicked within 12h - 7d should be a more expected behavior.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-16 09:24:38 +02:00
Morris Jobke 329c2108b5 Merge pull request #11762 from nextcloud/stable13-11756-ignore-session-lifetime-if-it-can-not-be-converted-to-a-number
[stable13] Ignore "session_lifetime" if it can not be converted to a number
2018-10-11 13:25:38 +02:00
Daniel Calviño Sánchez 9eff0e5882 Ignore "session_lifetime" if it can not be converted to a number
When "session_lifetime" can not be converted to a number the interval
becomes a NaN due to dividing it by 2. This NaN was "dragged" over all
the other mathematical operations and caused the heartbeat to be post
again and again due to an infinite loop with no pauses in "setInterval".
Now, the interval is set to the default value instead if the
"session_lifetime" can not be converted to a number.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-11 12:11:10 +02:00
Morris Jobke 078c1088b6 Merge pull request #11752 from nextcloud/release/13.0.7
13.0.7
2018-10-11 09:36:24 +02:00
Roeland Jago Douma 85005450d7 13.0.7
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-11 08:56:57 +02:00
Morris Jobke 9ee44a0879 Merge pull request #11739 from nextcloud/backport/11733/fix-setupcheck-13
[stable13] Fix a misleading setup check for .well-known/caldav & carddav
2018-10-11 08:51:17 +02:00
Morris Jobke ece4cfb0fb Fix a misleading setup check for .well-known/caldav & carddav
The problem is that the version without the slash is the correct one.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-10 15:54:44 +02:00
Nextcloud bot 97b6b53d5c [tx-robot] updated from transifex 2018-10-10 00:13:36 +00:00
Morris Jobke c33167be5e Merge pull request #11713 from nextcloud/version/noid/13.0.7RC2
13.0.7 RC 2
2018-10-09 15:49:45 +02:00
Morris Jobke ce3b50c4f4 13.0.7 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-09 14:24:57 +02:00
Morris Jobke 048f99620a Merge pull request #11704 from nextcloud/backport/11677/stable13
[13] Allow the creationg of previews of files stored in appdata
2018-10-09 13:32:44 +02:00
Morris Jobke e93106a3b9 Merge pull request #11707 from nextcloud/backport/11705/update-crl-13
[stable13] Update CRL due to changed cert for linkshareex
2018-10-09 13:15:09 +02:00
Morris Jobke 1aefb61018 Update CRL due to changed cert for linkshareex
See https://github.com/nextcloud/app-certificate-requests/pull/193

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-09 11:58:03 +02:00
Roeland Jago Douma 32b4e4214f Allow the creationg of previews of files stored in appdata
To allow us to create previews of files stored in appdata we need to
construct the view differently.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-09 11:50:02 +02:00
Nextcloud bot 9ec76ba603 [tx-robot] updated from transifex 2018-10-09 00:12:46 +00:00
Nextcloud bot d632ddce04 [tx-robot] updated from transifex 2018-10-08 00:13:13 +00:00
Nextcloud bot 8d96b3790d [tx-robot] updated from transifex 2018-10-07 00:12:38 +00:00
Nextcloud bot 642a19c2b5 [tx-robot] updated from transifex 2018-10-06 00:12:31 +00:00
Nextcloud bot fbab9d66d6 [tx-robot] updated from transifex 2018-10-05 00:13:21 +00:00
Morris Jobke d11e40733d Merge pull request #11589 from nextcloud/version/noid/13.0.7RC1
13.0.7 RC 1
2018-10-04 17:18:58 +02:00
Morris Jobke d852daa354 13.0.7 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-04 16:37:48 +02:00
Robin Appelman 2e328c1050 use a dummy database name for the default postgres database name
For some reason the docker image does not setup the permissions correctly,
by using a different name the nextcloud installer will create the database instead
with the correct permissions

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-04 16:37:48 +02:00
Nextcloud bot 99c5005114 [tx-robot] updated from transifex 2018-10-04 00:12:27 +00:00
Nextcloud bot 8ef7d31599 [tx-robot] updated from transifex 2018-10-03 16:59:11 +00:00
Morris Jobke bd3d991ab6 Merge pull request #10804 from nextcloud/smb-dir-instead-of-allinfo-13
[13] prefer using dir instead of allinfo for getting smb file info
2018-10-02 19:04:15 +02:00
Roeland Jago Douma f9c14af9c2 Merge pull request #11524 from nextcloud/fix/11315/filepicker-buttons-nc13
[13] Fixes the move/copy picker buttons
2018-10-02 08:07:20 +02:00
Nextcloud bot e07611ef09 [tx-robot] updated from transifex 2018-10-02 00:13:06 +00:00
Michael Weimann 6b1663ef2d Fixes file/folder move/copy buttons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-10-01 23:10:14 +02:00
Jan-Christoph Borchardt 905097eca9 Fix buttons wrapping on long folder names
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-10-01 23:00:44 +02:00
Morris Jobke e0147a50e8 Merge pull request #11494 from nextcloud/backport/11416/show-email-authtype-none-13
[stable13] Show auth type "None" in email settings
2018-10-01 14:22:44 +02:00
Morris Jobke 35763304ab Show auth type "None" in email settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-01 10:50:54 +02:00
Nextcloud bot 052469e5e4 [tx-robot] updated from transifex 2018-10-01 00:12:49 +00:00
Nextcloud bot 0201f011c1 [tx-robot] updated from transifex 2018-09-30 00:12:16 +00:00
Nextcloud bot 7695f02852 [tx-robot] updated from transifex 2018-09-29 00:12:26 +00:00
Morris Jobke 48d359ccb6 Merge pull request #11437 from nextcloud/assemblystream-eof-13
[13] AssemblyStream is also eof if we have no more source stream
2018-09-28 17:31:42 +02:00
Robin Appelman eae523eb56 AssemblyStream is also eof if we have no more source stream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-28 15:41:53 +02:00
Morris Jobke b70d8d0832 Merge pull request #11419 from nextcloud/stable13-11411-fix-checkWellKnownUrl-not-being-executed
[stable13] Fix "checkWellKnownUrl" not being run
2018-09-28 15:30:47 +02:00
Nextcloud bot 82a5732a13 [tx-robot] updated from transifex 2018-09-28 11:14:21 +00:00
Daniel Calviño Sánchez 5883695b17 Fix "checkWellKnownUrl" not being run
The check is run only if its last parameter is true; data() tries to
convert the HTML attribute string to an actual JavaScript value, so
"true" is returned as an actual boolean instead of an string; as a
strict comparison against "true" was used the result was false and thus
the checks were not run.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-27 18:18:22 +02:00
Morris Jobke 065ec74173 Merge pull request #10884 from nextcloud/large-share-count-performance-13
[13] Improve performance when dealing with large numbers of shares
2018-09-27 17:20:13 +02:00
Roeland Jago Douma 9c0a9a4d46 Merge pull request #11400 from nextcloud/stable13-11112-do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled
[stable13] Do not hide the progress bar while the chunked upload is being assembled
2018-09-27 15:40:30 +02:00
Nextcloud bot 9fa50f48f1 [tx-robot] updated from transifex 2018-09-27 00:12:37 +00:00
Daniel Calviño Sánchez 1ee3c31f85 Do not hide the progress bar while the chunked upload is being assembled
Large files are not uploaded in a single operation, but uploaded in
several chunks; once all the chunks are uploaded then the server needs
to assemble them to get the final file.

Before, once the chunks were uploaded the progress bar was hidden.
However, this was confusing for the users, as the file could still need
some time to appear in the file list due to the assembling. Now once all
the chunks are uploaded the text in the progress bar changes to inform
the user that there are still some pending operations, and only when the
file is finally assembled the progress bar is hidden.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-26 17:46:43 +02:00
Nextcloud bot f678794470 [tx-robot] updated from transifex 2018-09-26 00:12:33 +00:00
Nextcloud bot 8a0ced9d7e [tx-robot] updated from transifex 2018-09-25 00:12:22 +00:00
Nextcloud bot e921a9c1f4 [tx-robot] updated from transifex 2018-09-24 00:12:25 +00:00
Nextcloud bot cfc711b278 [tx-robot] updated from transifex 2018-09-23 00:12:41 +00:00
Nextcloud bot ad102f4942 [tx-robot] updated from transifex 2018-09-22 00:12:19 +00:00
Nextcloud bot f2b6e38949 [tx-robot] updated from transifex 2018-09-21 00:12:22 +00:00
Nextcloud bot c3412b2f10 [tx-robot] updated from transifex 2018-09-20 00:13:09 +00:00
blizzz df7048056d Merge pull request #11284 from nextcloud/stable13-11268-include-empty-directories-in-the-default-state-of-acceptance-tests
[stable13] Include empty directories in the default state of acceptance tests
2018-09-19 15:23:25 +02:00
Nextcloud bot a588916f64 [tx-robot] updated from transifex 2018-09-19 12:38:11 +00:00
Daniel Calviño Sánchez b9122257eb Include empty directories in the default state of acceptance tests
Before each scenario of the acceptance tests is run the Nextcloud server
is reset to a default state. To do this the full directory of the
Nextcloud server is commited to a local Git repository and then reset to
that commit when needed.

Unfortunately, Git does not support including empty directories in a
commit. Due to this, when the default state was restored, it could
happen that the file cache listed an empty directory that did not exist
because it was not properly restored (for example,
"data/appdata_*/css/icons"), and that in turn could lead to an error
when the directory was used.

Currently the only way to force Git to include an empty directory is to
add a dummy file to the directory (so it will no longer be empty,
but that should not be a problem in the affected directories, even if
the dummy file is not included in the file cache); although Git FAQ
suggests using a ".gitignore" file a ".keep" file was used instead, as
it conveys better its purpose.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-19 12:51:39 +02:00
Nextcloud bot 94b13c605d [tx-robot] updated from transifex 2018-09-19 00:12:34 +00:00
Nextcloud bot 1d24a509d9 [tx-robot] updated from transifex 2018-09-18 00:12:41 +00:00
Nextcloud bot ba97e60ffc [tx-robot] updated from transifex 2018-09-17 00:12:40 +00:00
Nextcloud bot f085101422 [tx-robot] updated from transifex 2018-09-16 00:12:39 +00:00
Nextcloud bot 665db6ba80 [tx-robot] updated from transifex 2018-09-15 00:12:20 +00:00
Nextcloud bot 2d9a488cf3 [tx-robot] updated from transifex 2018-09-14 00:12:43 +00:00
blizzz acce19f2a5 Merge pull request #10824 from nextcloud/backport/10820/stable13
[stable13] [LDAP] The WebUI Wizard also should not assign empty config IDs
2018-09-13 13:11:46 +02:00
blizzz 9c68ce1556 Merge pull request #10829 from nextcloud/backport/10828/mimetype-detection-broken-for-junked-uploads
[stable13] Fix mimetype detection for junked uploads
2018-09-13 10:51:06 +02:00
Nextcloud bot 8e668729b1 [tx-robot] updated from transifex 2018-09-13 00:12:22 +00:00
Nextcloud bot 95e2d5f170 [tx-robot] updated from transifex 2018-09-12 00:12:24 +00:00
Nextcloud bot a6678dfdf1 [tx-robot] updated from transifex 2018-09-11 00:12:33 +00:00
Nextcloud bot f6fbd6ee21 [tx-robot] updated from transifex 2018-09-10 00:13:47 +00:00
Nextcloud bot ef3789e16b [tx-robot] updated from transifex 2018-09-09 00:13:18 +00:00
Nextcloud bot dfa6da5a03 [tx-robot] updated from transifex 2018-09-08 00:12:42 +00:00
Nextcloud bot 7c55f20d1d [tx-robot] updated from transifex 2018-09-07 00:12:46 +00:00
Nextcloud bot 972e8c3399 [tx-robot] updated from transifex 2018-09-06 00:13:04 +00:00
Nextcloud bot a1a578114f [tx-robot] updated from transifex 2018-09-05 00:13:00 +00:00
Nextcloud bot a08fdd8750 [tx-robot] updated from transifex 2018-09-04 00:12:26 +00:00
Roeland Jago Douma 0d8c0215d0 Merge pull request #10911 from nextcloud/customproperties-ignored-list-13
[13] use the same ignored properties list for both CustomerPropertiesBackends
2018-09-03 09:04:55 +02:00
Nextcloud bot f73724b5ec [tx-robot] updated from transifex 2018-09-03 00:12:27 +00:00
Nextcloud bot 891d923a53 [tx-robot] updated from transifex 2018-09-02 00:12:45 +00:00
Nextcloud bot 90ab77d8bb [tx-robot] updated from transifex 2018-09-01 00:12:27 +00:00
Morris Jobke 2f024dcd02 Merge pull request #10902 from nextcloud/cast-timestamp-13
[13] cast timestamps older than unix epoch to 0
2018-08-31 09:09:12 +02:00
Nextcloud bot 9bde06aab3 [tx-robot] updated from transifex 2018-08-31 00:12:18 +00:00
Morris Jobke 2a973843f0 Merge pull request #10932 from nextcloud/version/noid/13.0.6
13.0.6
2018-08-30 13:15:36 +02:00
Morris Jobke 200c3b6181 13.0.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-30 10:49:25 +02:00
Nextcloud bot 9db4afce72 [tx-robot] updated from transifex 2018-08-30 00:12:18 +00:00
Nextcloud bot 2ffcba3814 [tx-robot] updated from transifex 2018-08-29 00:12:17 +00:00
Robin Appelman 8a3f6a816b use the same ignored properties list for both CustomerPropertiesBackends
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-28 18:34:04 +02:00
Christian ed5224cd46 cast timestamps older than unix epoch to 0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-28 16:57:42 +02:00
Nextcloud bot a4daa91b42 [tx-robot] updated from transifex 2018-08-28 00:13:18 +00:00
Robin Appelman 6dae2b9250 cache parent exists status during share setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:51 +02:00
Robin Appelman e3b9e9e57c tokens can't be valid local user names
this saves searching for shares on non-public link dav requests

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:49 +02:00
Robin Appelman 110650ff58 only determine is sharing is disabled for a user once
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:47 +02:00
Robin Appelman 237e4b7521 don't check if target dir exists when using the default share target directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:45 +02:00
Robin Appelman a396c37693 re-use view instances for shared storages
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:44 +02:00
Robin Appelman c897e2af8e more efficient way to detect added and removed mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:42 +02:00
Robin Appelman f2152ecda9 more efficient unique share target generation
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:39 +02:00
Robin Appelman f199e7ed17 cache OC\Files\Mount\Manager::findIn results
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:25:37 +02:00
Robin Appelman 65c8fd3b29 cache OC\Files\Mount\Manager::findIn results
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:23:01 +02:00
Robin Appelman bb092553ef use more efficient method to find mountpoint for path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:21:20 +02:00
Robin Appelman 67ae310693 remove double loop for detecting changed mounts
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-27 16:19:50 +02:00
Nextcloud bot 1769029910 [tx-robot] updated from transifex 2018-08-27 00:12:24 +00:00
Nextcloud bot 1aae409cc8 [tx-robot] updated from transifex 2018-08-26 00:12:42 +00:00
Nextcloud bot 8ec2c933de [tx-robot] updated from transifex 2018-08-25 00:12:43 +00:00
Roeland Jago Douma 1a016f21e6 Merge pull request #10837 from nextcloud/dav-search-no-negative-mtime-13
[13] disallow negative mtime in dav search
2018-08-24 17:46:52 +02:00
Robin Appelman d69234e339 disallow negative mtime in dav search
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-24 16:25:35 +02:00
Joas Schilling 1eeea993a8 Fix mimetype detection for junked uploads
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-24 10:49:08 +02:00
Morris Jobke 2d5d8b68d2 Merge pull request #10791 from nextcloud/version/noid/13.0.6RC1
13.0.6 RC 1
2018-08-24 10:23:34 +02:00
Nextcloud bot 12a3f776a1 [tx-robot] updated from transifex 2018-08-24 00:12:32 +00:00
Morris Jobke 737fcd4fac 13.0.6 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-23 18:15:53 +02:00
Morris Jobke 3940790e79 Merge pull request #10591 from nextcloud/smb-stat-retry-13
[13] retry smb stat on timeout
2018-08-23 18:14:40 +02:00
Arthur Schiwon 7c3339521c [LDAP] The WebUI Wizard also should not assign empty config IDs
With 689df9a843 the behaviour to assign only
non-empty config IDs was introduced. Only, this was only effective for CLI
and OCS API.

Related to #3270.

The web UI creates now also a full configuration on first load. This fixes
#5094.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-23 18:02:55 +02:00
Robin Appelman 5d18d142a6 assume the same timezone when using local domain names for smb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-23 16:10:42 +02:00
Robin Appelman 05131490a7 improved fallback of timezone detection
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-23 16:10:42 +02:00
Morris Jobke 389b981aa5 Merge pull request #10285 from nextcloud/anonymous-options-13
[13] Add sabre plugin to allow anonymous options requests to the dav root
2018-08-23 16:05:56 +02:00
Morris Jobke 70fe04dada Merge pull request #10823 from nextcloud/backport/10168/allow-utf8mb4-on-maria-10.3-or-later
[stable13] MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default
2018-08-23 16:02:59 +02:00
blizzz 8a8eb605b4 Merge pull request #10821 from nextcloud/backport/10471/improve-url-detection
[stable13] Improve URL detection
2018-08-23 15:25:31 +02:00
Morris Jobke 893cccba68 Merge pull request #10816 from nextcloud/backport/10700+10815/stable13
[stable13] remove unexecutable code
2018-08-23 14:58:29 +02:00
Joas Schilling d12ff2c083 MySQL 8.0+ and MariaDB 10.3+ are large prefix and barracuda by default
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-23 14:40:33 +02:00
Joas Schilling cd5bc9b893 Improve URL detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-23 14:03:54 +02:00
Nextcloud bot 112719f457 [tx-robot] updated from transifex 2018-08-23 00:13:11 +00:00
Arthur Schiwon f404695602 returning of $tr is expected, otherwise ending up in a JS error
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-23 00:31:32 +02:00
Arthur Schiwon e1e35b42de remove unexecutable code
OCA.Sharing.SharedFileInfo was never defined and that stopped execution.
Interestingly, FF never showed me an error.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-23 00:31:10 +02:00
Robin Appelman 48f39628d0 use dir instead of allinfo where possible 2018-08-22 14:28:56 +02:00
Morris Jobke 5bc7af2510 Merge pull request #10783 from nextcloud/backport/10775/stable13
[stable13] Resolve all group memberships properly
2018-08-22 10:51:02 +02:00
Roeland Jago Douma a4e989bb75 Merge pull request #10763 from nextcloud/backport/10687/stable13
[stable13] don't blame randome people for background email updates
2018-08-22 08:50:34 +02:00
Nextcloud bot ff3b132382 [tx-robot] updated from transifex 2018-08-22 00:12:24 +00:00
Morris Jobke 4f6f3b261a Resolve all group memberships properly
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-21 17:08:22 +02:00
Nextcloud bot d3ab244b40 [tx-robot] updated from transifex 2018-08-21 00:12:31 +00:00
blizzz d0f8a431c8 Merge pull request #10762 from nextcloud/backport/10260/improved-sql-for-fetching-quota
[stable13] Use the path_hash instead of the path to query the filecache
2018-08-20 15:24:39 +02:00
Arthur Schiwon bd31fe7c9b fix unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

# Conflicts:
#	apps/user_ldap/tests/User_LDAPTest.php
2018-08-20 15:16:33 +02:00
Morris Jobke 74618d1011 Merge pull request #10760 from nextcloud/backport/10355/make-sure-error-log-always-receives-a-string
[stable13] Make sure error_log() always receives a string
2018-08-20 15:12:16 +02:00
Arthur Schiwon 0f958bf595 don't force LDAP updates on userExists anymore
and remove some deprecated code

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-20 15:05:09 +02:00
Arthur Schiwon 7dfb837766 don't blame email address changers
the information is being collected with admin_audit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-08-20 15:05:04 +02:00
Morris Jobke aef428733b Merge pull request #10552 from nextcloud/backport/10523/stable13
[stable13] Adding test for table schedulingobjects and fixing postgres LOB
2018-08-20 14:56:37 +02:00
blizzz ace570d723 Merge pull request #10698 from nextcloud/smb-log-removed-entries-13
[13] log entries that are hidden during file listing
2018-08-20 14:53:08 +02:00
Morris Jobke eea151fcec Merge pull request #10565 from nextcloud/stable13-10348-fix-transfering-ownership-of-a-share-to-user-with-same-id-as-receiver
[stable13] Fix transfering ownership of a share to user with same id as receiver
2018-08-20 14:52:15 +02:00
Morris Jobke 8d41d0066a Merge pull request #10735 from nextcloud/forgotten-pass-fix-link
[stable13] Forgotten pass fix link
2018-08-20 14:47:03 +02:00
Morris Jobke 1bd21fa351 Merge pull request #10761 from nextcloud/backport/10225/fix-url-generation-dav-app
[stable13] Fix call to OC.generateUrl for caldav birthday calendar on/off
2018-08-20 14:46:40 +02:00
Morris Jobke 995b4d996f Merge pull request #10759 from nextcloud/backport/10755/fix-comments-in-config-sample
[stable13] Fix comment style in config sample
2018-08-20 14:46:21 +02:00
Morris Jobke 391e693adf Use the path_hash instead of the path to query the filecache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-20 14:22:52 +02:00
Daniel Kesselberg ee52136772 Fix call to OC.generateUrl for caldav birthday calendar on/off
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-08-20 14:20:52 +02:00
Joas Schilling 60ced31116 Make sure error_log() always receives a string
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-20 14:12:08 +02:00
Morris Jobke c31e629713 Fix comment style in config sample
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-08-20 14:08:00 +02:00
Nextcloud bot f2f723c7c8 [tx-robot] updated from transifex 2018-08-20 00:12:36 +00:00
Nextcloud bot ff8626f46e [tx-robot] updated from transifex 2018-08-18 00:12:45 +00:00
John Molakvoæ (skjnldsv) c428c7c2bf Do not bind reset password link if an url is set
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-17 17:07:43 +02:00
Nextcloud bot 47ea2c17fd [tx-robot] updated from transifex 2018-08-16 00:12:35 +00:00
Robin Appelman b2685eb4ee log entries that are hidden during file listing
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-16 01:16:53 +02:00
blizzz 853e55e31a Merge pull request #10646 from nextcloud/fix-password-reset-stable13
[stable13] only warn about data lose on password reset if per-user keys are used
2018-08-15 19:08:11 +02:00
Nextcloud bot 294baf8e5d [tx-robot] updated from transifex 2018-08-15 00:13:48 +00:00
Roeland Jago Douma 1a3a0b4617 Merge pull request #10682 from nextcloud/backport/10680/stable13
[stable13] Update the scope of the lockdownmanager
2018-08-14 14:29:35 +02:00
Roeland Jago Douma b31cea9048 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:07 +02:00
Nextcloud bot 015c66b94f [tx-robot] updated from transifex 2018-08-14 00:12:15 +00:00
blizzz c938ea6569 Merge pull request #10620 from nextcloud/mimetype-insert-if-not-exists-13
[13] use insertIfNotExists to store new mimetypes.
2018-08-13 23:16:00 +02:00
Nextcloud bot 5327e3b4ce [tx-robot] updated from transifex 2018-08-13 00:12:18 +00:00
Nextcloud bot 7ed7c8e37a [tx-robot] updated from transifex 2018-08-11 00:12:39 +00:00
Bjoern Schiessle 5b54b8cba2 update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-10 17:26:11 +02:00
Bjoern Schiessle 9665637cd8 only warn about data lose on password reset if per-user keys are used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-10 16:54:55 +02:00
Roeland Jago Douma abef061686 Merge pull request #10581 from nextcloud/encryption-s3-fix-stable13
make file cache updates more robust
2018-08-10 08:10:03 +02:00
Nextcloud bot 93df97f1bf [tx-robot] updated from transifex 2018-08-10 00:12:36 +00:00
Robin Appelman 706813ab08 use insertIfNotExists to store new mimetypes.
Also throw an error if we can't find the mimetype after insert

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 15:31:47 +02:00
Robin Appelman 0450406c50 retry stat on timeout
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-08 16:15:31 +02:00
Bjoern Schiessle be172cc6f2 make file cache updates more robust
only update the encrypted version after the write operation is finished and the stream is closed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-08-08 10:46:14 +02:00
Nextcloud bot a5985ad0f4 [tx-robot] updated from transifex 2018-08-08 00:13:28 +00:00
Daniel Calviño Sánchez 5da4e4dc53 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:09:01 +02:00
Nextcloud bot f6c8668a7e [tx-robot] updated from transifex 2018-08-07 00:12:15 +00:00
Thomas Müller 32701e261b Adding test for table schedulingobjects and fixing postgres LOB
(cherry picked from commit afd4ebf0404e8bcd7cba0bec2dce177e97632f8a)

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2018-08-06 17:20:49 +02:00
Nextcloud bot 8e0e5a6b28 [tx-robot] updated from transifex 2018-08-06 00:12:30 +00:00
Nextcloud bot 66d74f6e56 [tx-robot] updated from transifex 2018-08-05 00:12:38 +00:00
Nextcloud bot 69af30b883 [tx-robot] updated from transifex 2018-08-04 00:12:47 +00:00
Nextcloud bot b02d1c8358 [tx-robot] updated from transifex 2018-08-03 00:12:32 +00:00
Nextcloud bot ddd6c72b1f [tx-robot] updated from transifex 2018-08-02 00:12:46 +00:00
Nextcloud bot 6e449f13cd [tx-robot] updated from transifex 2018-08-01 00:12:09 +00:00
Nextcloud bot ab6741427b [tx-robot] updated from transifex 2018-07-31 00:12:21 +00:00
Nextcloud bot f4b4fcf8e4 [tx-robot] updated from transifex 2018-07-30 00:12:17 +00:00
Nextcloud bot 9ba794c067 [tx-robot] updated from transifex 2018-07-28 00:12:17 +00:00
Nextcloud bot 628a0434a5 [tx-robot] updated from transifex 2018-07-27 00:12:29 +00:00
Nextcloud bot 0802675f47 [tx-robot] updated from transifex 2018-07-26 00:12:13 +00:00
Nextcloud bot ca139a4a81 [tx-robot] updated from transifex 2018-07-25 00:12:44 +00:00
Roeland Jago Douma e39f410a2b Merge pull request #10376 from nextcloud/background-scan-root-13
[13] Do scan the root storage in background scan
2018-07-24 16:17:29 +02:00
Robin Appelman 8aeafc63a1 Do scan the root storage in background scan
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-24 15:45:51 +02:00
Nextcloud bot ad16affc9e [tx-robot] updated from transifex 2018-07-24 00:12:13 +00:00
Morris Jobke 1a082ab2a2 Merge pull request #10350 from nextcloud/version/noid/13.0.5
13.0.5
2018-07-23 12:47:15 +02:00
Morris Jobke dbff6b4dfe 13.0.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-23 10:52:03 +02:00
Joas Schilling 9e7197cbcc Do not parse HTML in user id and display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-23 10:51:25 +02:00
Nextcloud bot ab7b4d2597 [tx-robot] updated from transifex 2018-07-23 00:12:14 +00:00
Nextcloud bot ebe599df4d [tx-robot] updated from transifex 2018-07-22 00:12:51 +00:00
Nextcloud bot ed989326fb [tx-robot] updated from transifex 2018-07-21 00:12:12 +00:00
Nextcloud bot 98ffebe21e [tx-robot] updated from transifex 2018-07-20 00:12:18 +00:00
Nextcloud bot bfd533b2f1 [tx-robot] updated from transifex 2018-07-19 00:12:14 +00:00
Robin Appelman 1a1b7b1d33 adjust to older library version
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-18 16:01:56 +02:00
Robin Appelman 94a367910e Fix lazy search backend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-18 16:01:02 +02:00
Robin Appelman 821d658ec3 Fix search related results in OPTIONS requests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-18 15:32:58 +02:00
Robin Appelman 01eb420a1e Add tests for handling anonymous auth
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-18 15:20:22 +02:00
Robin Appelman 01413281db Add sabre plugin to allow anonymous options requests to the dav root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-18 15:20:15 +02:00
Nextcloud bot 86279015e8 [tx-robot] updated from transifex 2018-07-18 00:12:15 +00:00
Nextcloud bot 9a92629a94 [tx-robot] updated from transifex 2018-07-17 00:12:18 +00:00
Morris Jobke 43785cf1a8 Merge pull request #10236 from nextcloud/version/noid/13.0.5RC2
13.0.5 RC 2
2018-07-16 09:48:00 +02:00
Nextcloud bot 96463faaf1 [tx-robot] updated from transifex 2018-07-16 00:12:20 +00:00
Nextcloud bot 706ff0011f [tx-robot] updated from transifex 2018-07-15 00:12:15 +00:00
Nextcloud bot 807662f0f1 [tx-robot] updated from transifex 2018-07-14 00:12:25 +00:00
Morris Jobke 9ef0a2eb82 13.0.5 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-13 17:53:13 +02:00
Morris Jobke 761daeab1e Merge pull request #10233 from nextcloud/backport/10227/ldap-bind-loop
[stable13] Only bind to ldap if configuration for the first server is set
2018-07-13 17:52:49 +02:00
Julius Härtl 9f9f1d8cb0 Fix tests for backup ldap server connection
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-13 15:42:34 +02:00
Julius Härtl 7c8cec808f Only bind if configuration for the first server is available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-13 15:42:31 +02:00
Nextcloud bot 30dea9906a [tx-robot] updated from transifex 2018-07-13 00:12:14 +00:00
Morris Jobke 31d30f5657 Merge pull request #10172 from nextcloud/version/noid/13.0.5RC1
13.0.5 RC 1
2018-07-12 13:25:41 +02:00
Morris Jobke 69ff4dd5c6 13.0.5 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-12 12:21:59 +02:00
Roeland Jago Douma 2639533422 Merge pull request #10201 from nextcloud/smb-rename-invalidargument-retry-13
[13] also retry rename operation on InvalidArgumentException
2018-07-12 09:49:43 +02:00
Nextcloud bot dc0fd5f2d2 [tx-robot] updated from transifex 2018-07-12 00:12:52 +00:00
Roeland Jago Douma 9c5b1852ca Use ILogger for consts
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-11 22:43:34 +02:00
Roeland Jago Douma b660dd8d74 Merge pull request #10202 from nextcloud/backport/10199/improve-url-detection-in-comments
[stable13] Improve url detection in comments
2018-07-11 19:46:17 +02:00
Joas Schilling f879ea142d Improve url detection in comments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 16:40:16 +02:00
Robin Appelman 4f9aac4002 also retry rename operation on InvalidArgumentException
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-11 16:38:35 +02:00
Morris Jobke e8af003b41 Merge pull request #10195 from nextcloud/backport/10193/sanitize-parameter-13
[stable13] Sanitize parameters in createSessionToken() while logging
2018-07-11 16:31:01 +02:00
Morris Jobke d88da34f95 Sanitize parameters in createSessionToken() while logging
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-11 14:45:13 +02:00
Morris Jobke 73c1fa6b64 Merge pull request #10115 from nextcloud/backport/10098/ldap-image-attribute
[stable13] allow admin to disable fetching of avatars as well as a specific attribute
2018-07-11 11:45:26 +02:00
Morris Jobke cc09db6c5b Merge pull request #10189 from nextcloud/backport/10020/email-address-misparsed-in-comments-and-chat
[stable13] Fix "parsing" of email-addresses in comments and chat messages
2018-07-11 11:41:32 +02:00
Morris Jobke a9b4be205a Merge pull request #10188 from nextcloud/backport/10078/invalid-actor-and-calendar-for-link-shares
[stable13] Correctly parse the subject parameters for link (un)shares of calendars
2018-07-11 11:41:11 +02:00
Morris Jobke 5f029e6136 Merge pull request #10185 from nextcloud/backport/10161/correctly-handle-users-with-numeric-user-ids-13
[stable13] Correctly handle users with numeric user ids
2018-07-11 10:03:27 +02:00
Morris Jobke 9d3a4b428d Merge pull request #10186 from nextcloud/backport/10156/behat-3.3
[stable13] Fix the behat version to 3.3.*
2018-07-11 10:03:01 +02:00
Morris Jobke 4ff6ea9a55 Merge pull request #10170 from nextcloud/backport/9823/stable13
[stable13] Allow updating the token on session regeneration
2018-07-11 10:02:30 +02:00
Joas Schilling 4e99dc2318 Fix "parsing" of email-addresses in comments and chat messages
\\b matches any non-word character, including \@ and \-
In order to not detect urls in the middle of email-addresses,
we need to check for white space characters and beginning of the
message instead.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:51:59 +02:00
Joas Schilling 77f7a95699 Correctly parse the subject parameters for link (un)shares of calendars
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:45:10 +02:00
John Molakvoæ c99529834c Merge pull request #10169 from nextcloud/backport/9955/stable13
[stable13] Request a valid property for DAV opendir
2018-07-11 09:42:20 +02:00
Joas Schilling 33bde0f62a Fix the behat version to 3.3.*
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:32:26 +02:00
Joas Schilling 03a6b2b49a Correctly handle users with numeric user ids
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-11 09:26:29 +02:00
Morris Jobke 922c2c64b5 Merge pull request #10180 from nextcloud/lock-negative-13
[13] prevent lock values from going negative with memcache backend
2018-07-11 09:02:19 +02:00
Nextcloud bot ef1a695707 [tx-robot] updated from transifex 2018-07-11 00:12:24 +00:00
Robin Appelman 1fa6115779 prevent lock values from going negative with memcache backend
This can be caused by the code releasing more locks then it acquires,
once the lock value becomes negative it's likely that it will never be able
to change into an exclusive lock again.

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-10 17:50:45 +02:00
Nextcloud bot 7843a9b21a [tx-robot] updated from transifex 2018-07-10 08:21:28 +00:00
Roeland Jago Douma f84789f88b Allow updating the token on session regeneration
Sometimes when we force a session regeneration we want to update the
current token for this session.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 16:27:12 +02:00
Roeland Jago Douma d03b389b56 Request a valid property for DAV opendir
Apperently Sabre and Onedrive are not friends when requesting a single
404 property. I need to dig deeper on why this is. Anyways requesting a
valid property makes it work like a charm.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 16:07:04 +02:00
Morris Jobke 57ca183ea4 Merge pull request #10166 from nextcloud/backport/10039/codecov-disabling
[stable13] Disable codecov status and comment
2018-07-09 15:51:06 +02:00
Morris Jobke 0404acfc81 Merge pull request #10165 from nextcloud/backport/9914/settings-wording-13
[stable13] Fixed English grammatical error on Settings page.
2018-07-09 15:50:25 +02:00
Morris Jobke 9ba31f3565 Merge pull request #10164 from nextcloud/backport/9893/update-message-13
[stable13] Update message shown when unsharing a file
2018-07-09 15:38:44 +02:00
Morris Jobke 00e632eec1 Disable codecov status and comment
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-09 15:30:53 +02:00
Jaczel f774a88927 Fixed English grammatical error on Settings page. 2018-07-09 15:22:21 +02:00
Kevin Ndung'u 1bd58c1718 Update message shown when unsharing a file
Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com>
2018-07-09 15:16:59 +02:00
Morris Jobke 83d99449d0 Merge pull request #10121 from nextcloud/stable13-allow-disable-encryption
[stable13] allow to disable encryption
2018-07-09 14:46:06 +02:00
Bjoern Schiessle 3a45bb52bc allow to disable encryption
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:09 +02:00
Arthur Schiwon 7f78958056 adjust and add more unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:50:08 +02:00
Arthur Schiwon 37a20cede1 allow admin to disable fetching of avatars as well as a specific attribute
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:26:45 +02:00
blizzz 486dff0934 Merge pull request #10089 from nextcloud/backport/10083/stable13
[stable13] let user set avatar in nextcloud von LDAP provides invalid image data
2018-07-05 00:54:04 +02:00
Morris Jobke f5bbe21155 Merge pull request #10093 from nextcloud/smb-log-connection-errors-13
[13] Improved logging of smb connection errors
2018-07-03 23:05:58 +02:00
Robin Appelman 6d68d34f2f Improved logging of smb connection errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 18:12:31 +02:00
Arthur Schiwon 55a6851791 let user set avatar in nextcloud von LDAP provides invalid image data
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 13:12:00 +02:00
blizzz d1df33a190 Merge pull request #10076 from nextcloud/backport/10034/stable13
[stable13] lower log level for quota manipulation cases
2018-07-02 13:10:33 +02:00
Arthur Schiwon ea62d7a9f5 constants belong to Util in 13
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 12:51:51 +02:00
Arthur Schiwon 56aaa40dde lower log level for quota manipulation cases
and simplify the forest of ifs a little bit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 11:53:49 +02:00
Morris Jobke 42de484162 Merge pull request #10044 from nextcloud/stable13-10040-fix-filenames-in-sharing-integration-tests
[stable13] Fix filenames in sharing integration tests
2018-06-29 09:03:20 +02:00
Daniel Calviño Sánchez eeab10df11 Check all paths for own files and shares
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
Daniel Calviño Sánchez 6d9b322413 Fix filenames in sharing integration tests
When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.

As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
Nextcloud bot 37063bc657 [tx-robot] updated from transifex 2018-06-29 00:12:27 +00:00
Morris Jobke a5dfc3e0ee Merge pull request #10032 from nextcloud/backport/10031/stable13
[stable13] LDAP backup server should not be queried when auth fails
2018-06-28 08:39:58 +02:00
Nextcloud bot 6292c4857d [tx-robot] updated from transifex 2018-06-28 00:12:40 +00:00
Arthur Schiwon 993342f6a1 LDAP backup server should not be queried when auth fails
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:15:44 +02:00
Nextcloud bot fb9f4e3ebf [tx-robot] updated from transifex 2018-06-27 10:06:32 +00:00
Nextcloud bot c4e79862c4 [tx-robot] updated from transifex 2018-06-27 00:12:10 +00:00
Roeland Jago Douma f69c7d7d6c Merge pull request #9986 from nextcloud/dav-upload-no-partfile-lock-13
[13] properly lock the target file on dav upload when not using part files
2018-06-26 09:15:12 +02:00
Nextcloud bot 257c7191b3 [tx-robot] updated from transifex 2018-06-26 00:12:27 +00:00
Robin Appelman 547177b482 properly lock the target file on dav upload when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-25 12:18:18 +02:00
Nextcloud bot ea89600ca0 [tx-robot] updated from transifex 2018-06-25 00:12:07 +00:00
Nextcloud bot 38040951f5 [tx-robot] updated from transifex 2018-06-24 00:12:26 +00:00
Nextcloud bot 891bd63310 [tx-robot] updated from transifex 2018-06-23 00:13:03 +00:00
John Molakvoæ 64b3614182 Merge pull request #9958 from nextcloud/backport/7818/stable13
[stable13] Log full exception in cron instead of only the message
2018-06-22 07:37:11 +02:00
Nextcloud bot 3ac6f4d504 [tx-robot] updated from transifex 2018-06-22 00:12:31 +00:00
Morris Jobke 20f1523c0e Log full exception in cron instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-21 23:17:45 +02:00
Nextcloud bot 869aa64d0d [tx-robot] updated from transifex 2018-06-21 00:13:07 +00:00
Nextcloud bot 4d8285553a [tx-robot] updated from transifex 2018-06-20 00:12:46 +00:00
John Molakvoæ 6a29c408e5 Merge pull request #9843 from nextcloud/backport/9724/stable13
[stable13] Add parent index to share table
2018-06-19 16:02:13 +02:00
Nextcloud bot 54bc862c9d [tx-robot] updated from transifex 2018-06-19 00:13:16 +00:00
Nextcloud bot 1b940a3c7e [tx-robot] updated from transifex 2018-06-18 00:12:54 +00:00
Nextcloud bot 6bc2a993f7 [tx-robot] updated from transifex 2018-06-17 00:13:08 +00:00
Nextcloud bot 3214e69761 [tx-robot] updated from transifex 2018-06-16 00:13:34 +00:00
Nextcloud bot 64835d0acd [tx-robot] updated from transifex 2018-06-15 00:13:10 +00:00
Nextcloud bot a5425c7029 [tx-robot] updated from transifex 2018-06-14 00:13:26 +00:00
Roeland Jago Douma 0fa82e585f Merge pull request #9837 from nextcloud/stable13-9807-fix-highlighting-of-the-upload-drop-zone
[stable13] Fix highlighting of the upload drop zone
2018-06-13 08:30:50 +02:00
John Molakvoæ 0d9c33838b Merge pull request #9839 from nextcloud/backport/8221/stable13
[stable13] Apply ldapUserFilter on members of group
2018-06-13 06:55:41 +02:00
Nextcloud bot cf8860e5ba [tx-robot] updated from transifex 2018-06-13 00:13:22 +00:00
blizzz f43fb0d5d0 Merge pull request #9844 from nextcloud/backport/9276/remove-unused-config-sample
[stable13] Remove unused config option
2018-06-12 23:33:53 +02:00
Morris Jobke 8a98b44fc4 Remove unused config option
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-12 22:27:08 +02:00
Morris Jobke 6945e1fae6 Merge pull request #9841 from nextcloud/backport/9814/stable13
[stable13] Make the DELETION of groups match greedy on the groupID
2018-06-12 22:17:25 +02:00
Roeland Jago Douma 191cc74386 Add parent index to share table
Fixes #9327

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-12 21:09:20 +02:00
Roeland Jago Douma d269258ac9 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:13 +02:00
Roland Tapken ed78703275 dn2ocname: also apply group filter to readAttribute()
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-06-12 18:21:22 +02:00
Roland Tapken 57a8fa1b22 Apply ldapUserFilter on members of group
Refers to issue #8220

user_ldap configured with custom filters for active directory access
(group-member-association is "member"). Then it can happen that the
members of a group contain members that don't belong to the users
available in Nextcloud (the most trivial reason is that the user filter
contains "(!(UserAccountControl:1.2.840.113556.1.4.803:=2))" to exclude
disabled users from being imported).

This can be fixed by applying the ldapUserFilter when resolving the UID
for a DN fetched from the group's member list.

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-06-12 18:21:11 +02:00
Daniel Calviño Sánchez 85d9264a14 Do not show an error message when draging and dropping text
When the browser reports a drag of items other than files (for example,
text) and then triggers a drop event with no files no error message
should be shown to the user, as in that case there would be no highlight
of the drop zone and no indication that the drop would be valid (except
for the mouse cursor); the error message should be shown only when
the drop event with no files follows a file drag.

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

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

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

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Daniel Calviño Sánchez 981b757099 Remove duplicated code
"disableDropState" was set as the event handler in 8d4e5747f3, but
the duplicated code was accidentally added back in 786e858d23.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Nextcloud bot 59a27ceb13 [tx-robot] updated from transifex 2018-06-12 00:13:07 +00:00
Morris Jobke 5c97dc3de3 Merge pull request #9821 from nextcloud/version/noid/13.0.4
13.0.4
2018-06-11 10:21:04 +02:00
Morris Jobke b8ab0a031d 13.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-11 09:50:54 +02:00
Roeland Jago Douma dfd7ea3c45 Merge pull request #9820 from nextcloud/backport/9798/stable13
[stable13] enable caldav for webdav subtree public-calendars
2018-06-11 09:49:50 +02:00
John Molakvoæ bf7620d868 Merge pull request #9803 from nextcloud/backport/9802/stable13
[stable13] Make the token expiration also work for autocasting 0
2018-06-11 09:16:57 +02:00
Georg Ehrke fa0c51d1dd enable caldav for webdav subtree public-calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-11 09:15:26 +02:00
Nextcloud bot ebdd9a0408 [tx-robot] updated from transifex 2018-06-11 00:12:58 +00:00
Nextcloud bot c56da1aaab [tx-robot] updated from transifex 2018-06-10 00:13:21 +00:00
Nextcloud bot 5cd6d9c4a3 [tx-robot] updated from transifex 2018-06-09 00:13:26 +00:00
Roeland Jago Douma 88c7c6abe3 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:26:30 +02:00
Nextcloud bot c55e842478 [tx-robot] updated from transifex 2018-06-08 00:13:15 +00:00
Morris Jobke 98e9bc33e0 Merge pull request #9788 from nextcloud/notify-credentials-env-13
[13] allow setting notify credentials in environment
2018-06-07 16:14:03 +02:00
Robin Appelman 642bdb5bb5 allow setting notify credentials in environment
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-07 15:47:36 +02:00
Morris Jobke 8a0093d9ca Merge pull request #9778 from nextcloud/version/noid/13.0.3
13.0.3
2018-06-07 11:43:51 +02:00
Morris Jobke 299c47a565 13.0.3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-07 11:23:48 +02:00
Nextcloud bot a19310e2cf [tx-robot] updated from transifex 2018-06-07 00:13:06 +00:00
Nextcloud bot 9009d0cae8 [tx-robot] updated from transifex 2018-06-06 00:12:58 +00:00
Morris Jobke b5b17b0ed0 Merge pull request #9731 from nextcloud/version/noid/13.0.3RC2
13.0.3 RC 2
2018-06-04 17:37:19 +02:00
Morris Jobke 80ae131e3b 13.0.3 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-04 16:47:54 +02:00
Morris Jobke e656c8e98b Merge pull request #9732 from nextcloud/stable13-fix-contacts-menu-local-null-check
[stable13] Fix local users check in contacts menu
2018-06-04 16:41:28 +02:00
Christoph Wurst e5fb98d9fc Fix syntax for php5.6
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:12:57 +02:00
Christoph Wurst 2b0ae6df9f Fix local users check in contacts menu
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:05:40 +02:00
Morris Jobke 778c411e6c Merge pull request #9727 from nextcloud/nav-fix
[stable13] Fix header nav
2018-06-04 14:22:16 +02:00
John Molakvoæ (skjnldsv) 0159d4419d [stable13] Fix header nav
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-04 11:38:45 +02:00
Nextcloud bot 4eea45d981 [tx-robot] updated from transifex 2018-06-04 00:12:47 +00:00
Nextcloud bot 6d3cef1493 [tx-robot] updated from transifex 2018-06-03 00:13:09 +00:00
Nextcloud bot 9dd9da60cc [tx-robot] updated from transifex 2018-06-02 00:12:51 +00:00
Morris Jobke c04ba4b7af Merge pull request #9700 from nextcloud/version/noid/13.0.3RC1
13.0.3 RC 1
2018-06-01 15:08:57 +02:00
Morris Jobke 337838a49d 13.0.3 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 14:41:37 +02:00
Morris Jobke 52b3582250 Merge pull request #9712 from nextcloud/backport/9711/stable13
[stable13] Fix the unit tests
2018-06-01 14:41:14 +02:00
Roeland Jago Douma 718bfb8c3f Fix the master unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-01 14:16:38 +02:00
Morris Jobke 271bbaa809 Merge pull request #9610 from nextcloud/bugfix-stable13/3830/invitations_for_shared_calendars
[stable13] send invitations for shared calendars
2018-06-01 12:37:07 +02:00
Morris Jobke cf4ff7716e Merge pull request #9694 from nextcloud/backport/9692/stable13
[stable13] Make sure the log doesn't try to read from PUT if it can't
2018-06-01 12:21:26 +02:00
Morris Jobke 5c92da2269 Merge pull request #9707 from nextcloud/bugfix-stable13/noid/override_freebusy_sharing_rules
[stable13] allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities
2018-06-01 12:01:43 +02:00
Nextcloud bot 3595aa68b9 [tx-robot] updated from transifex 2018-06-01 00:12:48 +00:00
Roeland Jago Douma f7372bea86 Merge pull request #9655 from nextcloud/backport/9268/stable13
[stable13] Do not load calendar/addressbook plugins if not needed
2018-05-31 19:53:07 +02:00
Georg Ehrke 08ad45e40b allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-31 18:55:55 +02:00
Morris Jobke d62f5c10d3 Remove not needed change
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-31 17:20:33 +02:00
Morris Jobke fa41a4cc21 Remove type hints for PHP 5.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-31 17:16:47 +02:00
Nextcloud bot cc6317f2af [tx-robot] updated from transifex 2018-05-31 00:13:02 +00:00
Roeland Jago Douma 188a41a2be 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:16:18 +02:00
Roeland Jago Douma 4fae9bedc9 Move repairstep to a custom command
People that have issues can run it manually

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:52 +02:00
Roeland Jago Douma 29f1ea2fbe Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:51 +02:00
Roeland Jago Douma 1ea356cd6a Adding repair step which cleans shares of invalid principals
https://github.com/owncloud/core/pull/30149/commits/edacf22fbce4deefc181c53dd84c5fb278a9a28d

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:51 +02:00
Roeland Jago Douma 0f88f3f00e CalDAV and CardDAV plugins need to be registered for the principals collection as well
https://github.com/owncloud/core/pull/30149/commits/9f2e6431b88a9635b291b0e824abf74ba766616d

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:51 +02:00
Roeland Jago Douma 3a133b151f When sharing calendars and addressbooks the principal has to be verified to be valid
https://github.com/owncloud/core/pull/30149/commits/d3fb8fcdd3a6b00bde0c3c9eb4039876e7fc1967

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:51 +02:00
Roeland Jago Douma ed0069b8e6 Do not load calendar/addressbook plugins if not needed
Fixes #6711
Based on https://github.com/owncloud/core/pull/30149/commits/f0fb21cf3563088284c56be4eac48c7d9725cb21

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-30 13:27:51 +02:00
Morris Jobke 4c1f88efb1 Merge pull request #9654 from nextcloud/backport/9360/stable13
[stable13] Fix "Invalid argument supplied for foreach()"
2018-05-30 11:50:35 +02:00
Morris Jobke 3acfcc433a Merge pull request #9668 from nextcloud/backport/9666/stable13
[stable13] Make sure the file is readable before attempting to create a preview
2018-05-30 11:34:29 +02:00
Morris Jobke db59474868 Merge pull request #9662 from nextcloud/backport/9640/stable13
[stable13] check user state when fetching to avoid dealing with offline objects
2018-05-30 09:19:24 +02:00
Morris Jobke d95757b7d0 Merge pull request #9657 from nextcloud/backport/9256/stable13
[stable13] improve error reporting and move format parameter to the options
2018-05-30 09:18:36 +02:00
Morris Jobke fd9c134d66 Merge pull request #9672 from nextcloud/drone-mysqlmb4-fix-stable13
[stable13] Fix drone mysqlmb4 tests
2018-05-30 09:17:41 +02:00
John Molakvoæ (skjnldsv) 9a0126cadd Fix drone mysqlmb4 tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-30 08:57:51 +02:00
Nextcloud bot b889259b1e [tx-robot] updated from transifex 2018-05-30 00:12:31 +00:00
Roeland Jago Douma e55effc5ef 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:03:43 +02:00
Morris Jobke b71c90bac1 Merge pull request #9650 from nextcloud/backport/8842/stable13
[stable13] fix(AmazonS3):  fix loop $result['Contents'] error
2018-05-29 20:56:03 +02:00
Arthur Schiwon d33ba08b05 check user state when fetching to avoid dealing with offline objects
fixes #9502

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-29 20:54:48 +02:00
Roeland Jago Douma d6ab2a4ddb Merge pull request #9661 from nextcloud/backport/9288/stable13
[stable13] LDAP password renewal fixes
2018-05-29 20:16:05 +02:00
Morris Jobke a52f0150af Merge pull request #9659 from nextcloud/backport/9653/stable13
[stable13] The OAuth endpoint needs to support Basic Auth
2018-05-29 17:12:00 +02:00
Morris Jobke 5c9f2dd99f Merge pull request #9651 from nextcloud/backport/9271/stable13
[stable13] Fix undefined variables
2018-05-29 17:08:40 +02:00
Morris Jobke b3e9e36b14 Merge pull request #9656 from nextcloud/backport/9490/stable13
[stable13] Make LargeFileHelper.php faster by avoiding execs as much as possible
2018-05-29 17:08:12 +02:00
Morris Jobke de539c6e27 Merge pull request #9649 from nextcloud/sabre-head-dont-open-file-13
[13] dont open the file on dav HEAD request
2018-05-29 17:02:47 +02:00
Morris Jobke 9f793f91c9 Merge pull request #9608 from nextcloud/smb-exceptions-on-listing
[13] Handle exception while itterating trough smb file listing
2018-05-29 17:01:51 +02:00
Roger Szabo 49c1a7f2ae Remove unneeded semicolon and parentheses
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:50 +02:00
Roger Szabo b3b774dfc5 css indent alignment
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:46 +02:00
Roger Szabo 733eae5b91 adjust css to nc13 core changes
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:43 +02:00
Roger Szabo 4ba9556bc2 remove reset password link
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 16:40:39 +02:00
Morris Jobke c61e9577e6 Merge pull request #9652 from nextcloud/search-category-stable13
[stable13] Add search category icon
2018-05-29 16:39:43 +02:00
Roeland Jago Douma d48333910e The OAuth endpoint needs to support Basic Auth
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-29 15:57:04 +02:00
Robin Appelman a8b674fd8c dont open the file on dav HEAD request
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-29 15:42:29 +02:00
Bjoern Schiessle 58be1f1b2f improve error reporting and move format parameter to the options
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-05-29 15:34:32 +02:00
marco44 184a0b97fc Make LargeFileHelper.php faster by avoiding execs as much as possible
Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
2018-05-29 15:31:55 +02:00
Roger Szabo 0b25317269 adjust unit tests for \"Invalid argument supplied for foreach()\" fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 15:21:23 +02:00
Roger Szabo 27fca0eebc Fix "Invalid argument supplied for foreach()"
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-29 15:21:19 +02:00
John Molakvoæ (skjnldsv) 221f3a4819 Add search category icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-29 15:13:58 +02:00
Morris Jobke 57489f1013 Remove a check for an unused variable
Left over from a refactoring

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

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:13:57 +02:00
Morris Jobke 6a4a7c868c Fix undefined variable - found by Phan
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-29 15:12:10 +02:00
enoch 65bb12032d fix(AmazonS3): fix loop $result['Contents'] error
Invalid argument supplied for foreach() at /var/www/html/apps/files_external/lib/Lib/Storage/AmazonS3.php#295
2018-05-29 15:03:28 +02:00
blizzz af2ecbbd5a Merge pull request #9647 from nextcloud/release/noid/theming-1.4.5-translations
[stable13] prepare another theming release including translations for recently added imprint and privacy policy strings
2018-05-29 14:37:23 +02:00
Morris Jobke b03752b1d9 Merge pull request #9620 from nextcloud/backport/9576/stable13
[stable13] Emit event when running ./occ db:add-missing-indices
2018-05-29 14:30:27 +02:00
Arthur Schiwon c2041c5d4a prepare another theming release including translations for recently
added imprint and privacy policy strings.

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

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-29 14:13:58 +02:00
Nextcloud bot 00edb8f2d4 [tx-robot] updated from transifex 2018-05-29 00:12:43 +00:00
Roeland Jago Douma c07f23ca72 Merge pull request #9629 from nextcloud/backport/9627/stable13
[stable13] Limit Sinon version to 5.0.7 at most
2018-05-28 13:27:34 +02:00
Morris Jobke 8889220f55 Merge pull request #9622 from nextcloud/backport/9475/stable13
[stable13] Delete the previews when a version is restored
2018-05-28 11:20:18 +02:00
Daniel Calviño Sánchez fe93f0935b Limit Sinon version to 5.0.7 at most
When using fake servers with Sinon.JS, the JavaScript test framework,
the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of
XMLHttpRequest was modified to normalize the header values (as requested
by the spec), but since then only string values are accepted; null or
integer values can no longer be passed to "setRequestHeader", as it
expects the "replace" function to be available in the object. However,
in the tests null and integer values are passed to "setRequestHeader",
which causes them to fail.

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-28 11:07:11 +02:00
Roeland Jago Douma 5536d17181 Merge pull request #9619 from nextcloud/backport/9515/stable13
[stable13] Regenerate session id after public share auth
2018-05-28 09:05:53 +02:00
Roeland Jago Douma dd5995a2f8 Emit event when running ./occ db:add-missing-indices
This allows apps to listen to this event in order to also update
indecies there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-28 09:04:59 +02:00
Nextcloud bot 5a20bb6980 [tx-robot] updated from transifex 2018-05-28 00:13:05 +00:00
Nextcloud bot f800c1697c [tx-robot] updated from transifex 2018-05-27 00:13:28 +00:00
Roeland Jago Douma 7249f73832 Merge pull request #9621 from nextcloud/backport/9418/stable13
[stable13] Add PHP missing message to index.php
2018-05-26 20:37:51 +02:00
Roeland Jago Douma d33834f07a Delete the previews when a version is restored
Fixes #9469

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

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

Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-05-25 15:00:35 +02:00
Nextcloud bot d8e3c3cb22 [tx-robot] updated from transifex 2018-05-25 00:15:16 +00:00
Morris Jobke e2133ae2d8 Merge pull request #9590 from nextcloud/bug/9514/fix-settings-menu
[stable13] Fix settings menu
2018-05-24 18:14:12 +02:00
Morris Jobke 866568d4d2 Merge pull request #9579 from nextcloud/bugfix_stable13/noid/fix_force_language_html_attr
[stable13] make sure force language is reflected in html lang attribute
2018-05-24 17:59:58 +02:00
Morris Jobke cef2e190a1 Merge pull request #9586 from nextcloud/feature/9577/privacy-link
[stable13] add privacy link to theming and fix scrollbars
2018-05-24 17:57:25 +02:00
Julius Härtl d6bde6a281 Fix scope of nav css rule
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-24 16:43:38 +02:00
Arthur Schiwon cee2d1783d bump theming version ¯\_(ツ)_/¯
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon ac22c28045 addjust footer height when legal links are present. fixes #9572
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:58 +02:00
Arthur Schiwon 323b665e88 also add a privacy link
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 16:26:51 +02:00
Roeland Jago Douma 930c11a6cd Always set the request language to the force language
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-24 13:08:10 +02:00
Georg Ehrke 0493d0e3fb make sure force language is reflected in html lang attribute
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-24 13:07:54 +02:00
Roeland Jago Douma 5bd9087cb7 Merge pull request #9573 from nextcloud/fix/9568/theming-wo-sig
bump version for theming again 🙇
2018-05-24 08:58:39 +02:00
Nextcloud bot c3a1d33959 [tx-robot] updated from transifex 2018-05-24 00:14:07 +00:00
Arthur Schiwon 67340846f9 bump version for theming again 🙇
also make appinfo compliant with appstore's schema. except default_enable…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-24 00:19:20 +02:00
Morris Jobke fe20bb4b27 Merge pull request #9566 from nextcloud/backport/9395/stable13
[stable13] cleanup locks in scanner on error
2018-05-23 22:57:42 +02:00
Roeland Jago Douma 56b8a889c1 Merge pull request #9392 from nextcloud/dav-upload-lock-13
[13] only allow a single concurrent dav write to a file
2018-05-23 20:14:19 +02:00
Robin Appelman 874e312980 cleanup locks in scanner on error
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-23 20:05:54 +02:00
Morris Jobke 2f059d1caf Merge pull request #9540 from nextcloud/backport/9517/stable13
[stable13] Improve OAuth
2018-05-23 15:42:22 +02:00
Roeland Jago Douma 01d3586a0f Merge pull request #9522 from nextcloud/backport/9325/stable13
[stable13] Fix for unbound cloned LDAP connections
2018-05-23 09:18:21 +02:00
Nextcloud bot 82d0d1d704 [tx-robot] updated from transifex 2018-05-23 00:16:07 +00:00
Morris Jobke 04ff701090 Merge pull request #9548 from remyj38/stable13
[stable13] Fix translation bug on lost password page
2018-05-22 21:58:53 +02:00
Julius Härtl c628b613b9 Merge pull request #9547 from nextcloud/bump/noid/theming
[stable13] bump theming version for extraordinary release
2018-05-22 21:44:43 +02:00
Rémy Jacquin 0b8908b8df Fix translation bug on lost password page
Fix nextcloud/password_policy#26

Signed-off-by: Rémy Jacquin <remy@remyj.fr>
2018-05-22 18:43:27 +02:00
Arthur Schiwon 3a73b9c0bb bump theming version for extraordinary release
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-22 17:03:41 +02:00
Morris Jobke 5744827696 Merge pull request #9516 from nextcloud/backport/9437/stable13
[stable13] allow to specify a link to a legal notice
2018-05-22 16:54:07 +02:00
Morris Jobke bae5ec5cb0 Merge pull request #9525 from nextcloud/backport/8504/stable13
[stable13] Dont use $info as array when its not an array
2018-05-22 16:33:04 +02:00
Roeland Jago Douma 3c002706a4 Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:39 +02:00
Roeland Jago Douma 73f8373151 Don't use special chars to avoid confusion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:30 +02:00
Roeland Jago Douma d03265fb62 Rotate token
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:17 +02:00
Roeland Jago Douma 30750e4f92 Authenticate the clients on requesting a token
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:12 +02:00
Roeland Jago Douma a04ea70fca Fail if the response type is not properly set
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:51:03 +02:00
Roeland Jago Douma 000cf1951c Set OAuth token expiration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-22 14:50:58 +02:00
Roeland Jago Douma 46aafe4f11 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-22 14:26:13 +02:00
Roeland Jago Douma 8fcb7d4334 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-22 12:51:25 +02:00
Nextcloud bot 41cd6076fb [tx-robot] updated from transifex 2018-05-22 00:13:54 +00:00
Nextcloud bot ef95c1c5e3 [tx-robot] updated from transifex 2018-05-21 00:14:03 +00:00
Nextcloud bot 352d0af868 [tx-robot] updated from transifex 2018-05-20 00:13:45 +00:00
Nextcloud bot 3304991965 [tx-robot] updated from transifex 2018-05-19 00:14:03 +00:00
Joas Schilling ccedb314a8 Dont use $info as array when its not an array
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-18 23:50:10 +02:00
Roger Szabo 8c43834dbc unbound cloned connection fix
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2018-05-18 15:09:51 +02:00
Arthur Schiwon c3d28885b0 Backport of #9437
allow to specify a link to a legal notice

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

fix tests

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

fix undo for url-typed inputs

and minor adjustments

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

Use link not address in labels for URLs

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

this file does not belong here

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-05-18 11:26:57 +02:00
Nextcloud bot c101ad3a65 [tx-robot] updated from transifex 2018-05-18 00:14:09 +00:00
Nextcloud bot b08e53d365 [tx-robot] updated from transifex 2018-05-17 00:14:09 +00:00
Morris Jobke edd5712c6e Merge pull request #9454 from nextcloud/stable13-9245-fix-race-condition-when-preparing-upload-folder
[stable13] Fix race condition when preparing upload folder
2018-05-14 13:41:47 +02:00
Morris Jobke e3d694fea2 Merge pull request #9453 from nextcloud/stable13-9237-fix-ids-of-permission-checkboxes-for-shares
[stable13] Fix ids of permission checkboxes for shares
2018-05-14 13:41:02 +02:00
Morris Jobke 003cc5acfd Merge pull request #9432 from nextcloud/backport/9225/ipv6-database-host
[stable13] Allow IPv6 database host
2018-05-14 13:36:21 +02:00
Morris Jobke 1aa149a615 Merge pull request #9436 from nextcloud/backport/9373/stable13
[stable13] Get correct version of an app
2018-05-14 13:33:14 +02:00
Nextcloud bot d3d750fdc4 [tx-robot] updated from transifex 2018-05-14 00:13:48 +00:00
Nextcloud bot a46b8e34f9 [tx-robot] updated from transifex 2018-05-13 00:13:19 +00:00
Nextcloud bot cd3b0ca7da [tx-robot] updated from transifex 2018-05-12 00:13:27 +00:00
Nextcloud bot 465397fa02 [tx-robot] updated from transifex 2018-05-11 00:13:23 +00:00
Daniel Calviño Sánchez 2b5d933b63 Remove no longer needed escaping of special characters
The escaping of special characters was needed when the ids of the
permission checkboxes for shares were based on the "shareWith" field.
Since they are based on the "shareId" field the escaping is no longer
needed, as the "sharedId" is expected to always contain compatible
characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 21:40:36 +02:00
Daniel Calviño Sánchez 0734325dda Fix ids of permission checkboxes for shares
The ids of permission checkboxes for shares were generated using the
"shareWith" field of the share. The "shareWith" field can contain spaces
(as spaces are allowed, for example, in user or circle names), so this
could cause the id attribute of the HTML element to contain spaces too,
which is forbidden by the HTML specification.

It is not just a "formal" issue, though; when the list was rendered
after a permission change, if the id contained a space the selector to
get the checkbox element was wrong (as it ended being something like
"#canEdit-view1-name with spaces") and thus the updated state of the
checkbox was not properly set.

Besides that, "shareWith" can contain too single quotes, which would
even cause the jQuery selector to abort the search and leave the UI in
an invalid state.

Instead of adding more cases to the regular expression to escape special
characters and apply it too when the ids are created now the ids of
permission checkboxes for shares are based on the "shareId" field
instead of on "shareWith", as "shareId" is expected to always contain
compatible characters.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 21:39:14 +02:00
Daniel Calviño Sánchez d74b5231b8 Fix race condition when preparing upload folder
Before any upload is submitted the upload is registered in a list of
known uploads; this is needed to retrieve the upload object at several
points of the upload process. When a chunked upload is submitted first a
directory to upload all the chunks is created and, once that is done,
the chunks are sent; in order to send a chunk the upload object needs to
be retrieved from the list of known uploads.

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-05-10 16:58:43 +02:00
Roeland Jago Douma 3a013b127c Merge pull request #9433 from nextcloud/backport/9224/accessibility-improvements-13
[stable13] Add labels for Contacts menu and Settings
2018-05-10 09:30:56 +02:00
Nextcloud bot e2f5355f73 [tx-robot] updated from transifex 2018-05-10 00:13:31 +00:00
Roeland Jago Douma a7948069c5 Get correct version of an app
Related to #8929

We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.

Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-09 12:15:39 +02:00
Joas Schilling ea834dab28 php 5.6 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 12:12:13 +02:00
Jan-Christoph Borchardt 223f034068 Fix form labels and main landmark on log in page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:42:09 +02:00
Jan-Christoph Borchardt 575354a09c Do not restrict zooming in
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:42:01 +02:00
Jan-Christoph Borchardt 2f88376674 Add aria-label to more-apps menu as well
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:39:23 +02:00
Jan-Christoph Borchardt e7d6410f25 Ensure proper color contrast according to WCAG AA
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:39:16 +02:00
Jan-Christoph Borchardt 0dc52bf1c9 Add proper ARIA attributes and structure to header for accessibility, thanks to @MarcoZehe
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-05-09 11:37:58 +02:00
Morris Jobke eb429e7ee6 Add tests for special domain name
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-09 10:51:26 +02:00
Morris Jobke 229667c84c Add tests for domains
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-09 10:51:14 +02:00
Joas Schilling 7bb44214a1 Move regex to a function and add tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:50:56 +02:00
Joas Schilling 02388a3942 Allow IPv6 database hosts
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-09 10:50:47 +02:00
Morris Jobke 44255faab3 Merge pull request #9430 from nextcloud/stable13-9407
[13] Fix jsunit tests
2018-05-09 09:14:33 +02:00
Morris Jobke fe2d99f3fb Merge pull request #9409 from nextcloud/backport/9393/workflow-rules-error-when-changing-operation
[stable13] workflow rules error when changing operation
2018-05-09 08:41:58 +02:00
Julius Härtl 2329f7e2c6 Fix jsunit tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-09 08:21:21 +02:00
Nextcloud bot d8d09475c4 [tx-robot] updated from transifex 2018-05-09 00:11:50 +00:00
Nextcloud bot 583176d36d [tx-robot] updated from transifex 2018-05-08 00:11:56 +00:00
Morris Jobke 7bf713edaf Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13
[13] Log lock state on conflict
2018-05-07 16:29:42 +02:00
Morris Jobke 284b23333d Merge pull request #9391 from nextcloud/getcachentry-lock-13
[13] remove unneeded locks in getCacheEntry
2018-05-07 16:29:22 +02:00
Joas Schilling a134bf7349 Do not error when the tag does not exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 15:30:12 +02:00
Joas Schilling 0579529145 Reset the value when changing the check class (because it might be invalid)
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-05-07 15:29:57 +02:00
Nextcloud bot c77b66e179 [tx-robot] updated from transifex 2018-05-07 00:11:59 +00:00
Nextcloud bot 923520823e [tx-robot] updated from transifex 2018-05-06 00:12:02 +00:00
Nextcloud bot 635814f6a9 [tx-robot] updated from transifex 2018-05-05 00:12:11 +00:00
Robin Appelman 187acecff7 only allow a single concurrent dav write to a file
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 15:08:56 +02:00
Robin Appelman a6ea5eb1b5 remove unneeded locks in getCacheEntry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 15:06:39 +02:00
Robin Appelman bc1a17a9e2 always log locking errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 13:35:26 +02:00
Robin Appelman a070c1177a Log more info about locking conflicts for memcache locking backends
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-05-04 13:35:26 +02:00
Morris Jobke 642ebea490 Merge pull request #9259 from nextcloud/various-css-fixes-bckprt
[stable13] backport various scss fixes #8777
2018-05-04 11:19:10 +02:00
Nextcloud bot 1a900c6928 [tx-robot] updated from transifex 2018-05-04 00:12:17 +00:00
Morris Jobke 1dcf40515f Merge pull request #9377 from nextcloud/9318_SCSSCacher_resetCache_catch_exception_stable13
Issue #9318: catch exceptions in SCSSCacher::resetCache()
2018-05-03 13:56:45 +02:00
Roland Tapken cc54429646 Issue #9318: catch exceptions in SCSSCacher::resetCache()
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-05-03 11:02:53 +02:00
Nextcloud bot 5756a8d8ff [tx-robot] updated from transifex 2018-05-03 00:12:19 +00:00
Roeland Jago Douma 9763e7dd40 Merge pull request #9358 from nextcloud/stable13-9348
[stable13] Replace deprecated sinon reset() call with resetHistory()
2018-05-02 10:09:50 +02:00
Julius Härtl f3b3b5f2d0 Replace deprecated sinon reset() call with resetHistory()
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-05-02 08:52:22 +02:00
Roeland Jago Douma 6976241e4e Merge pull request #9344 from nextcloud/stable13-9248
[stable13] Fix ellipsis in filename column
2018-05-01 19:58:38 +02:00
Nextcloud bot 0d91288f49 [tx-robot] updated from transifex 2018-05-01 00:12:15 +00:00
Julius Härtl 5c6084a545 Add min-width to trick the table width calculation in safari
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-30 11:03:40 +02:00
Julius Härtl 7e39215142 Use flex based layout inside the filename table cell
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-30 11:02:43 +02:00
Nextcloud bot d216d7aff5 [tx-robot] updated from transifex 2018-04-30 00:12:11 +00:00
Nextcloud bot 6b67651951 [tx-robot] updated from transifex 2018-04-29 00:12:11 +00:00
Nextcloud bot 1a3d61cbd3 [tx-robot] updated from transifex 2018-04-28 00:12:20 +00:00
Nextcloud bot 8029998a60 [tx-robot] updated from transifex 2018-04-27 00:12:15 +00:00
Morris Jobke 2495577a3b Merge pull request #9300 from nextcloud/final-13.0.2
13.0.2
2018-04-26 09:19:58 +02:00
Nextcloud bot a21b4469c9 [tx-robot] updated from transifex 2018-04-26 00:12:33 +00:00
Morris Jobke ebb410b122 13.0.2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-25 15:19:03 +02:00
Nextcloud bot 9311d4972b [tx-robot] updated from transifex 2018-04-25 00:12:15 +00:00
Nextcloud bot d4ec708867 [tx-robot] updated from transifex 2018-04-24 00:12:18 +00:00
Nextcloud bot c49ec66188 [tx-robot] updated from transifex 2018-04-23 00:12:13 +00:00
Nextcloud bot cc533aad3b [tx-robot] updated from transifex 2018-04-22 00:12:14 +00:00
Nextcloud bot 8c0624149f [tx-robot] updated from transifex 2018-04-21 00:12:06 +00:00
John Molakvoæ (skjnldsv) 721ff40c5c [stable13] backport various scss fixes #8777
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-20 17:34:18 +02:00
Nextcloud bot 3fe5649b42 [tx-robot] updated from transifex 2018-04-20 00:12:26 +00:00
Morris Jobke ff5e666a89 Merge pull request #9228 from nextcloud/13.0.2-RC1
13.0.2 RC 1
2018-04-19 10:57:50 +02:00
Nextcloud bot 75f9dd6d67 [tx-robot] updated from transifex 2018-04-19 00:12:16 +00:00
Morris Jobke da924a79c7 13.0.2 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-19 00:46:54 +02:00
Morris Jobke 51ae913513 Merge pull request #9238 from nextcloud/13-8945
[stable13] Fixed files copy/move when in favorites or recent section
2018-04-18 22:47:15 +02:00
Morris Jobke 5262685e57 Merge pull request #9236 from nextcloud/13-8996
[stable13] Fix webdav support for OneNote clients
2018-04-18 22:46:26 +02:00
Morris Jobke 26c153667a Merge pull request #9231 from nextcloud/13-9205
[stable13] Provide an option to disable HTML emails
2018-04-18 22:38:33 +02:00
Roeland Jago Douma a1c4bdfdf8 Merge pull request #9233 from nextcloud/13-9159
[stable13] fix appinfo parsing when a single localized option is provided
2018-04-18 21:18:37 +02:00
Roeland Jago Douma cbe03cb561 Merge pull request #8986 from nextcloud/backport/8821/show-eol-warning
[stable13] Show EOL warning in the update section
2018-04-18 21:14:55 +02:00
Daniel Calviño Sánchez 807955c26c Merge pull request #9230 from nextcloud/13-9206
[stable13] Fix user selectable text for public links for text files
2018-04-18 20:56:27 +02:00
Julius Härtl 89c77c3073 Merge pull request #9234 from nextcloud/13-7661
[stable13] Use multibyte substring
2018-04-18 19:15:50 +02:00
John Molakvoæ (skjnldsv) 5253343885 Fixed files copy/move when in favorites or recent section
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-18 17:54:04 +02:00
Brandon Kirsch 78a6e94b52 Fix webdav support for OneNote clients 2018-04-18 17:40:36 +02:00
Roeland Jago Douma de70df0031 Use multibyte substring
Fixes #7661

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-18 17:35:09 +02:00
Robin Appelman 5fbba7854b fix appinfo parsing when a single localized option is provided
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-18 17:32:19 +02:00
Morris Jobke 01278056a5 Provide an option to disable HTML emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-18 16:59:34 +02:00
Morris Jobke 21ca50168a Fix user selectable text for public links for text files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-18 16:45:55 +02:00
Joas Schilling 6b97429ebe Show EOL warning in the update section
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-18 13:46:25 +02:00
Nextcloud bot fa65aaf1fc [tx-robot] updated from transifex 2018-04-18 00:13:55 +00:00
Morris Jobke e01b15adc5 Merge pull request #9213 from nextcloud/13-update-crl
[stable13] Update CRL to include old quicknotes cert
2018-04-17 17:16:23 +02:00
Morris Jobke 2644eb93ae Update CRL to include old quicknotes cert
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-17 11:44:12 +02:00
Nextcloud bot eff3add8f9 [tx-robot] updated from transifex 2018-04-17 00:13:32 +00:00
Nextcloud bot 90102937e4 [tx-robot] updated from transifex 2018-04-16 00:12:10 +00:00
Nextcloud bot a82eacf1f3 [tx-robot] updated from transifex 2018-04-14 00:12:10 +00:00
Nextcloud bot 24eaf35d2f [tx-robot] updated from transifex 2018-04-13 00:12:11 +00:00
Nextcloud bot f192bcccf9 [tx-robot] updated from transifex 2018-04-12 00:19:44 +00:00
Nextcloud bot 3339fc64f3 [tx-robot] updated from transifex 2018-04-11 00:21:56 +00:00
Roeland Jago Douma 656df69cf0 Merge pull request #9073 from nextcloud/backport/9070/guessing_without_target_is_useles-13
[stable13] When formatting a share node an Empty target is invalid
2018-04-11 00:36:07 +02:00
Nextcloud bot 6209a66f16 [tx-robot] updated from transifex 2018-04-10 00:12:35 +00:00
John Molakvoæ 3f19eb06a0 Merge pull request #9124 from nextcloud/stable13-9085-fix-progress-bar-hidden-before-the-upload-ends
[stable13] Fix progress bar hidden before the upload ends
2018-04-09 13:20:52 +02:00
Daniel Calviño Sánchez 9e9e053b73 Fix progress bar hidden before the upload ends
The jQuery File Upload plugin triggers the "stop" event once there are
no more files being uploaded (even if some of them were added when
another upload was already in progress). Therefore, the progress bar
should be hidden in the "fileuploadstop" callback.

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

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

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-04-09 11:20:18 +02:00
Nextcloud bot 2b0b717258 [tx-robot] updated from transifex 2018-04-09 00:12:23 +00:00
Nextcloud bot 8ba8719ec3 [tx-robot] updated from transifex 2018-04-08 00:12:25 +00:00
Nextcloud bot 7f2838cf68 [tx-robot] updated from transifex 2018-04-07 00:12:12 +00:00
John Molakvoæ d45a889fe2 Merge pull request #8779 from nextcloud/backport/8255/show-group-display-names
[stable13] Show group display names
2018-04-06 15:14:12 +02:00
Morris Jobke b9ca121671 Merge pull request #9095 from JaredBoone/bugfix/8387
Do not convert email addresses with idn_to_ascii if…
2018-04-06 11:44:51 +02:00
Nextcloud bot 80c5eda800 [tx-robot] updated from transifex 2018-04-06 00:14:46 +00:00
Roeland Jago Douma 4e732b866d Merge pull request #9094 from nextcloud/13-9092
[stable13] Add more logging for the object storage during creation of the buckets
2018-04-05 21:45:20 +02:00
Jared Boone 52c7f17faf Do not convert email addresses with idn_to_ascii if INTL_IDNA_VARIANT_UTS46 is undefined.
Fixes https://github.com/nextcloud/server/issues/8387.

Signed-off-by: Jared Boone <jared.boone@gmail.com>
2018-04-05 11:28:31 -07:00
Morris Jobke bb656750f5 Add more logging for the object storage during creation of the buckets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-05 17:29:44 +02:00
Morris Jobke 1c891a5c90 Merge pull request #9089 from nextcloud/backport/9087/windows10_webdav_netdrive-13
[stable13] Allow usage of Windows 10 WebDav Netdrive
2018-04-05 14:23:17 +02:00
Roeland Jago Douma 41b37c905c 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:22 +02:00
Roeland Jago Douma 652d0413cf Merge pull request #9071 from nextcloud/backport/9006/ignore_encrypted_custom_properties-13
[stable13] Do not treat is-encrypted as custom property
2018-04-05 08:53:28 +02:00
Morris Jobke 4732a34b04 Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13
[stable13] Move on with the next user if we found the user on one user back-end
2018-04-05 08:13:26 +02:00
Nextcloud bot 2c6a534d5d [tx-robot] updated from transifex 2018-04-05 00:12:13 +00:00
Bjoern Schiessle bd0672530b Move on with the next user if we found the user on one user back-end
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-04 17:13:47 +02:00
Roeland Jago Douma ce7a835772 Merge pull request #9017 from nextcloud/smb-2.0.5-13
[13] update icewind/smb to 2.0.5
2018-04-04 14:08:28 +02:00
Morris Jobke ba29fd19ec Merge pull request #9072 from nextcloud/backport/8891/fix_8890-13
[stable13] Fix proper permissions for multiple file access
2018-04-04 13:59:05 +02:00
Roeland Jago Douma 36bd4b7dde When formatting a share node an Empty target is invalid
Fixes #9028

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

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:03:25 +02:00
Roeland Jago Douma af317a1e38 Fix test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:42 +02:00
Roeland Jago Douma 5a74b9cb99 Fix proper permissions for multiple file access
Fixes #8890

In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write

Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.

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

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

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 11:56:59 +02:00
Roeland Jago Douma e95184ee25 Merge pull request #9064 from nextcloud/fix-copy-encrypted-files-stable13
[stable13] reset encryptionVersion to '1' if a file was stream copied
2018-04-04 11:54:54 +02:00
Nextcloud bot ef14f3c0b0 [tx-robot] updated from transifex 2018-04-04 00:13:52 +00:00
Bjoern Schiessle d4f64b94f2 reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:12:16 +02:00
Morris Jobke a0818ab6be Merge pull request #9019 from nextcloud/stable13-8939
[stable13] Fix search text overlapping close button
2018-04-03 10:29:33 +02:00
Morris Jobke 7bb8ce0e67 Merge pull request #9015 from nextcloud/backport-apps-versions
[stable13] Use app version to generate scss filename
2018-04-03 10:28:17 +02:00
Morris Jobke 4f5d057777 Merge pull request #9020 from nextcloud/stable13-8983
[stable13] Clear any theming prefixed cache on cache buster increase
2018-04-03 10:09:33 +02:00
Nextcloud bot e5684a9287 [tx-robot] updated from transifex 2018-04-03 00:12:13 +00:00
Nextcloud bot 9c1c47400f [tx-robot] updated from transifex 2018-04-02 00:12:13 +00:00
Nextcloud bot 4f34eb7616 [tx-robot] updated from transifex 2018-04-01 00:12:11 +00:00
Nextcloud bot 77bdbb6443 [tx-robot] updated from transifex 2018-03-31 00:14:19 +00:00
Nextcloud bot b6cb092bc6 [tx-robot] updated from transifex 2018-03-30 00:12:01 +00:00
Nextcloud bot ea01c9e92d [tx-robot] updated from transifex 2018-03-29 00:14:00 +00:00
Julius Härtl 7f209be51d Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:36 +02:00
Julius Härtl 541bb71513 Clear any theming prefixed cache on cache buster increase
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:35 +02:00
Julius Härtl 334d733d48 Fix search text overlapping clode button
fixes #8701

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:30:16 +02:00
Robin Appelman 6e13e31188 update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:17:56 +02:00
Robin Appelman a691b52daf Revert "update icewind/smb to 2.0.5"
accidental push to wrong branch

This reverts commit 3b35cd0749.
2018-03-28 16:17:30 +02:00
Robin Appelman 3b35cd0749 update icewind/smb to 2.0.5
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:15:27 +02:00
John Molakvoæ (skjnldsv) 05f76b3469 Use app version to generate scss filename
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 16:11:10 +02:00
Nextcloud bot f2e69bd868 [tx-robot] updated from transifex 2018-03-28 00:21:41 +00:00
Nextcloud bot c2ec519bc4 [tx-robot] updated from transifex 2018-03-27 00:12:04 +00:00
Nextcloud bot f8b1acfcfd [tx-robot] updated from transifex 2018-03-26 00:13:40 +00:00
Nextcloud bot cda89f16d8 [tx-robot] updated from transifex 2018-03-25 01:10:27 +00:00
Nextcloud bot 3604fe1ec5 [tx-robot] updated from transifex 2018-03-24 01:12:43 +00:00
Nextcloud bot 6ef65b3016 [tx-robot] updated from transifex 2018-03-23 01:11:55 +00:00
Nextcloud bot b3ffcda8ff [tx-robot] updated from transifex 2018-03-22 01:12:05 +00:00
Nextcloud bot 684f6b6429 [tx-robot] updated from transifex 2018-03-21 01:12:19 +00:00
Roeland Jago Douma 52a97e826b Merge pull request #8905 from nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle
[stable13] Set "share with" field to the ID of the circle
2018-03-20 23:17:25 +01:00
Roeland Jago Douma d9f512e593 Merge pull request #8900 from nextcloud/backport/8822/stable13
[stable13] the FN is optional, carrying the displayname if present
2018-03-20 23:16:59 +01:00
Daniel Calviño Sánchez 3bd92edd9c Use the display name in the avatar for a circle share
Before, the avatar for a circle share was generated using the
"share_with" field as the seed for "imageplaceholder". Due to this, when
the "share_with" field is set to the circle ID the character shown in
the avatar was just a random character instead of the first character of
the display name. Now the "share_with" is still used as the seed for the
colour, but the display name is used as the text of the avatar.

This adds support for "share_with" fields set to the circle ID while
being backwards compatible with "share_with" fields set to the circle
name.

Note that when "share_with" fields is set to the circle name the colour
of the avatar is different in the list of suggested sharees and in the
list of current sharees, but that also happened before these changes
(due to a different seed being used in each place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:42:27 +01:00
Daniel Calviño Sánchez df5cd18394 Set "share_with" field to the ID of the circle
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:42:27 +01:00
Arthur Schiwon e2e27004ff the FN is optional, carrying the displayname if present
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-20 14:35:46 +01:00
Nextcloud bot a6f1721c2d [tx-robot] updated from transifex 2018-03-20 01:11:59 +00:00
Nextcloud bot 17ae973d6f [tx-robot] updated from transifex 2018-03-19 01:12:01 +00:00
Nextcloud bot 2b57ddc74d [tx-robot] updated from transifex 2018-03-18 01:12:13 +00:00
Nextcloud bot 23022d5dd7 [tx-robot] updated from transifex 2018-03-17 01:11:55 +00:00
Roeland Jago Douma 9117a982f4 Merge pull request #8849 from nextcloud/backport/8835/stable13
[stable13] group existence check works without attribute (like with users)
2018-03-16 14:25:18 +01:00
Joas Schilling 5e15c76d21 Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-16 10:50:18 +01:00
Arthur Schiwon 588ee6af06 existence check works without attribute (like with users)
cn is not necessarily given everywhere

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-16 10:26:29 +01:00
Nextcloud bot 161a0f29d9 [tx-robot] updated from transifex 2018-03-16 01:11:55 +00:00
Nextcloud bot 4939ff36a0 [tx-robot] updated from transifex 2018-03-15 01:12:05 +00:00
Nextcloud bot 66eaea9259 [tx-robot] updated from transifex 2018-03-14 01:11:56 +00:00
Morris Jobke c2cea293d5 Merge pull request #8807 from nextcloud/final-13.0.1
[stable13] 13.0.1
2018-03-13 19:46:51 +01:00
Morris Jobke ef2de71988 13.0.1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 18:22:12 +01:00
Nextcloud bot f66af48d49 [tx-robot] updated from transifex 2018-03-13 01:12:30 +00:00
John Molakvoæ (skjnldsv) ae369e870d Fixed caldav tests and metadata 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-12 12:02:14 +01:00
Joas Schilling 2609b30df0 Fix group displaynames in activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:01:37 +01:00
Joas Schilling 63089821a4 Correctly return the group name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:01:19 +01:00
Joas Schilling 97dbaa26c4 Show the displayname in the users group list
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-12 12:00:54 +01:00
Nextcloud bot 93f5745700 [tx-robot] updated from transifex 2018-03-12 01:12:46 +00:00
Nextcloud bot 8e27fed9d3 [tx-robot] updated from transifex 2018-03-11 01:12:36 +00:00
Nextcloud bot 8e8368ae0b [tx-robot] updated from transifex 2018-03-10 01:12:24 +00:00
Morris Jobke 8d165d63ed Merge pull request #8748 from nextcloud/13.0.1-RC1
13.0.1 RC1
2018-03-09 21:22:14 +01:00
Morris Jobke d1e600773c 13.0.1 RC1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 16:19:00 +01:00
Morris Jobke b0f0c26fe3 Merge pull request #8745 from nextcloud/stable13-8716
[13] Remove base url from global cache prefix
2018-03-09 16:15:48 +01:00
Morris Jobke 17f75d6797 Mock method of actual cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 15:36:53 +01:00
Morris Jobke f17cabd63e Merge pull request #8758 from nextcloud/stable13-8594-add-acceptance-tests-for-permissions-on-public-shared-folders
[stable13] Add acceptance tests for permissions on public shared folders
2018-03-09 15:23:09 +01:00
Roeland Jago Douma 43243380f1 Always return the depscache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 14:43:54 +01:00
Nextcloud bot f22bae3546 [tx-robot] updated from transifex 2018-03-09 13:31:55 +00:00
Daniel Calviño Sánchez e9f5073677 Add acceptance tests for creation of subfolders in public shared folders
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 4337de7559 Extract common "wait for" functions to a helper class
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-09 12:26:58 +01:00
Daniel Calviño Sánchez 05fd72937b 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 create a new folder named :folderName in the public shared
folder" instead of "I create a new folder named :folderName") 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-09 12:26:58 +01:00
Daniel Calviño Sánchez 7ebbd666a8 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-09 12:26:58 +01:00
Daniel Calviño Sánchez 0709f4fd67 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-09 12:26:58 +01:00
Daniel Calviño Sánchez da6743277b Extract file list locators and steps to its own class
Besides the extraction some minor adjustments (sorting locators for file
action menu entries to reflect the order of the menu entries in the UI,
moving parametrized locators like "createMenuItemFor" 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-09 12:26:58 +01:00
Roeland Jago Douma 56a4c9d68e Merge pull request #8755 from nextcloud/backport/8747/apps-are-updated
[stable13] Revert wording back to updates
2018-03-09 12:12:29 +01:00
Morris Jobke 6176296c80 Merge pull request #8749 from nextcloud/backport/8596/sharee-email-matches-not-limited
[stable13] Sharee email matches not limited
2018-03-09 11:29:15 +01:00
Joas Schilling 92793e9d92 Revert wording back to updates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 11:25:25 +01:00
Morris Jobke 0f1567d8fa Merge pull request #8752 from nextcloud/13-8112
[stable13] Fix integer overflow in ChunkingPlugin
2018-03-09 11:23:28 +01:00
Julius Härtl e2728aaf38 Merge pull request #8746 from nextcloud/8705_13
[stable13] Check if the cached js file exists
2018-03-09 10:37:15 +01:00
Morris Jobke 4fa0cac17c Merge pull request #8725 from nextcloud/objectstore-no-part-files-13
[13]  disable part files for object stores
2018-03-09 10:34:33 +01:00
Morris Jobke ba7cc279e6 Fix integer overflow in ChunkingPlugin
Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 10:27:41 +01:00
Joas Schilling a2f3f0a681 Fix calculation if there are more results
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:42 +01:00
Joas Schilling a31439e89d Add tests for finding own email and user results pagination
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:12 +01:00
Joas Schilling 932fcc9859 Add the users result only when non empty so tests stay the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:25 +01:00
Joas Schilling 5b6590f1e9 Also array_slice wide email matches of local users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:04 +01:00
Roeland Jago Douma 85ba5adb33 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:36 +01:00
Roeland Jago Douma 2d7d8ca125 Check if the cached js file exists
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:32 +01:00
Julius Härtl 88e9542d12 Use cache prefix for theming as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:52 +01:00
Julius Härtl d4d3cecbf8 Fix tests to use ICacheFactory
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:50 +01:00
Julius Härtl b14e4ec6a6 Actually clear cache values for all base urls
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:07 +01:00
Julius Härtl a098b57817 Use JSCombiner from server container when searching for JS files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:07 +01:00
Julius Härtl c4539c34c9 Move base url from global cache prefix to frontend related ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:06 +01:00
Roeland Jago Douma d1547ee3b0 Merge pull request #8738 from nextcloud/stable13-8728-better-handling-of-invisible-elements-in-acceptance-tests
[stable13] Better handling of invisible elements in acceptance tests
2018-03-09 08:31:49 +01:00
Daniel Calviño Sánchez fc6c290a4f 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:17:04 +01:00
Daniel Calviño Sánchez f0cbeecf21 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:17:04 +01:00
Nextcloud bot b593fd1406 [tx-robot] updated from transifex 2018-03-09 01:12:37 +00:00
Robin Appelman 9342f97a28 emit pre-hooks earlier when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:09 +01:00
Robin Appelman a95ccf4248 disable part files for object stores
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:02 +01:00
Roeland Jago Douma d7a70aba84 Merge pull request #8686 from nextcloud/backport/8298/fix-activities-for-end2end-encryption
[stable13] Fix activities for end2end encryption
2018-03-06 22:44:54 +01:00
Roeland Jago Douma 41f8f68a5a Merge pull request #8693 from nextcloud/13-8173
[stable13] Fix undefined index problem
2018-03-06 19:27:30 +01:00
michaelletzgus 7e651ffd54 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-06 18:37:52 +01:00
Roeland Jago Douma a637e0d686 Merge pull request #8687 from nextcloud/backport/8328/filter-out-the-current-user-by-email-too
[stable13] Filter out the current user when searching for emails too
2018-03-06 17:11:49 +01:00
Roeland Jago Douma 56d5eb17fe Merge pull request #8688 from nextcloud/13-8557
[stable13] Fix check if theming defaults instance is available
2018-03-06 17:11:37 +01:00
Joas Schilling 173388dcd4 PHP 5.6 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 14:05:14 +01:00
Morris Jobke 1bdf4f55cb Merge pull request #8685 from nextcloud/backport/8664/add-missing-settings-page-title-again
[stable13] Set the correct active navigation entry
2018-03-06 13:57:25 +01:00
Morris Jobke 47fa0988d9 Merge pull request #8683 from nextcloud/8474_13
[stable13] Log exceptions that happen when writing the app store reply to storage
2018-03-06 13:39:49 +01:00
Morris Jobke ed8e4cc785 Merge pull request #8667 from nextcloud/8158_13
[stable13] Use a more widely available method to test s3 settings
2018-03-06 13:38:23 +01:00
Morris Jobke 16fa18ab49 Merge pull request #8678 from nextcloud/7707_13
[stable13] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:37:21 +01:00
Morris Jobke eefbcb32ed Fix check if theming defaults instance is available
The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error.

Fixes #8420

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-06 13:24:18 +01:00
Morris Jobke 5f8c773b27 Merge pull request #8680 from nextcloud/8391_13
[stable13] Don't use double quotes in MySQL queries
2018-03-06 13:18:59 +01:00
Joas Schilling 18968e84fc Filter out the current user when searching for emails too
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:20:24 +01:00
Joas Schilling d16aa27516 Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:12 +01:00
Joas Schilling 8f8d7cf9d3 Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:04 +01:00
Joas Schilling 5d8aaf9696 Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:57 +01:00
Joas Schilling 7c15b99a49 Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:51 +01:00
Joas Schilling f1e01dbbbc Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:45 +01:00
Joas Schilling 737af44b63 Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:36 +01:00
Joas Schilling 0911f3bde1 Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:13 +01:00
Joas Schilling e11dab4047 Set the correct active navigation entry
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:05:19 +01:00
Roeland Jago Douma 242f0c0b5a Merge pull request #8676 from nextcloud/8297_13
[stable13] Fix example regex for user agent matching
2018-03-06 11:54:27 +01:00
Morris Jobke 0667a32c83 Merge pull request #8673 from nextcloud/stable13-8634
[stable13] do not create empty userid when attribute does not have allowed chars
2018-03-06 11:30:48 +01:00
Joas Schilling de1f223961 Log exceptions that happen when writing the app store reply to storage
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:29:05 +01:00
Robin Müller 619ee56835 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:07 +01:00
Georg Ehrke 6171940717 generate different UIDs for Birthday, Anniversary and Death event
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:20:53 +01:00
Joas Schilling 02af9b2f6f Fix example regex for user agent matching
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:16:41 +01:00
Roeland Jago Douma ff7237a098 Merge pull request #8668 from nextcloud/8217_13
[stable13] Use proper lanugage in langauge code
2018-03-06 09:47:20 +01:00
Roeland Jago Douma f4aae102f7 Merge pull request #8675 from nextcloud/stable13-8601
[13] Remove too restrict check for background image/color
2018-03-06 09:46:52 +01:00
Julius Härtl 80842e1611 Remove to restrict check for background image/color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-06 09:08:49 +01:00
Nextcloud bot d3d0d9e11d [tx-robot] updated from transifex 2018-03-06 01:12:41 +00:00
blizzz 0045e823fe Merge pull request #8669 from nextcloud/8218_13
[stable13] Display the proper language strings in setttings
2018-03-05 23:46:26 +01:00
Arthur Schiwon 6e3c05f513 do not create empty userid when attribute does not have allowed chars
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 23:14:36 +01:00
Roeland Jago Douma 19ded76b77 Display the proper language strings in setttings
Since this was moved to lib, we have to the lib language files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 19:48:16 +01:00
Roeland Jago Douma 34671d6ad4 Use proper lanugage in langauge code
Fixes #8180

The _ is not valid in language codes use - instead.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 19:44:54 +01:00
Robin Appelman 3036fb95ae Use a more widely available method to test s3 settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-05 19:41:56 +01:00
Roeland Jago Douma 655e39ffcd Merge pull request #8610 from nextcloud/stable13-8588-fix-breadcrumbs-width-calculation
[stable13] Fix breadcrumbs width calculation
2018-03-05 19:37:53 +01:00
Roeland Jago Douma 07aba8cdac Merge pull request #8663 from nextcloud/fix-ie11-datepicker-display-backport
[stable13] Fixed date/time picker on IE11
2018-03-05 19:35:25 +01:00
John Molakvoæ (skjnldsv) 1b0416b1a1 Fixed date/time picker on IE11
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-05 16:40:44 +01:00
Roeland Jago Douma 9432c59db4 Merge pull request #8654 from nextcloud/stable13-8630
[stable13] use hash algo that's robust against collisions
2018-03-05 14:48:49 +01:00
Arthur Schiwon 962b046ab5 use hash algo that's robust against collisions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-05 13:20:22 +01:00
Joas Schilling 6104a7043e Merge pull request #8636 from nextcloud/8289_13
[stable13] AppData hardening
2018-03-05 12:38:43 +01:00
Joas Schilling 479b9465c0 Merge pull request #8631 from nextcloud/stable13-8372
[13] Properly encapsulate require_once for app.php
2018-03-05 12:35:50 +01:00
Nextcloud bot d74bad2dc1 [tx-robot] updated from transifex 2018-03-05 01:12:36 +00:00
Nextcloud bot 7717dbbe30 [tx-robot] updated from transifex 2018-03-04 01:13:07 +00:00
Nextcloud bot e23f06561a [tx-robot] updated from transifex 2018-03-03 01:12:39 +00:00
Roeland Jago Douma 46bb3fee81 Merge pull request #8609 from nextcloud/ie11-nav-flex-fix
[stable13] Fixed app navigation for IE11
2018-03-02 21:27:20 +01:00
Roeland Jago Douma 9413f97b92 Hardening of SimpleFile getContent
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-02 21:23:41 +01:00
Julius Härtl 9f7e05e737 Add throws annotation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:16:36 +01:00
Julius Härtl a61608e8c7 Properly encapsulate require_once for app.php
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-02 17:16:36 +01:00
Joas Schilling 364e7fe1be Merge pull request #8621 from nextcloud/13-8612
[stable13] Update commentstabview.js
2018-03-02 11:24:22 +01:00
rakekniven cbba3e2432 Update commentstabview.js
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes

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

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

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

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

tests for systemtags related to numeric user ids

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

fix systemtags event with numeric user ids

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 2fd3fa20df Replace attribute with local variable
The "usedWidth" attribute was not used elsewhere outside the "_resize"
method, so it was replaced with a local variable. Moreover, it was also
renamed to a more suitable name ("availableWidth").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
Daniel Calviño Sánchez 61bd3631d9 Set the width of the parent element in breadcrumb tests
Setting the width of the parent element of the breadcrumbs and then
explicitly calling "_resize" is enough to test the resizing behaviour.
This makes possible to remove the "setMaxWidth" method and its related
code, which was used only for testing purposes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 20:33:14 +01:00
John Molakvoæ (skjnldsv) bc2032bed7 fixup! Fixed app navigation for IE11
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-01 20:22:49 +01:00
John Molakvoæ (skjnldsv) b768040fca Fixed app navigation for IE11
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-01 20:22:42 +01:00
Roeland Jago Douma a2672a2ad8 Merge pull request #8561 from nextcloud/ext-strg-warning-fix
[stable13] Ext storage error warning
2018-03-01 19:36:55 +01:00
Morris Jobke 5a20f64300 Merge pull request #8595 from nextcloud/stable13-8589-fix-upload-button-visible-on-read-only-folders
[stable13] Fix upload button visible on read-only folders
2018-03-01 11:56:59 +01:00
Nextcloud bot 03f127f162 [tx-robot] updated from transifex 2018-03-01 01:12:37 +00:00
Daniel Calviño Sánchez 14abe6a9e0 Fix upload button visible on read-only folders
The div that contains the elements related to the creation of new files,
and thus the upload button, is always present in the DOM; it is hidden
or shown based on the folder permissions by adding or removing the
"hidden" CSS class. However, as the other CSS classes for the div are
"actions" and "creatable" and a "display: flex" rule was defined for
".actions.creatable" below the "display: none" rule for
".actions.hidden" the last one took precedence and the div ended being
always visible, even if the "hidden" CSS class was set. Now the rules
for the ".actions.hidden" selector are defined below the rules for the
".actions.creatable" selector and thus the "display: none" rule is
applied as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-01 01:52:08 +01:00
Roeland Jago Douma d7e5a660ca Merge pull request #8577 from nextcloud/8576_13
[stable13] Set autocomplete=new-password for mail share password
2018-02-28 21:07:08 +01:00
Roeland Jago Douma 2c6f3c88cf Merge pull request #8099 from nextcloud/7873_13
[stable13] Don't perform CSRF check on OCS routes with Bearer auth
2018-02-28 14:34:20 +01:00
Roeland Jago Douma 338795a03d Set autocomplete=new-password for mail share password
This avoids the browser to do autocompletion on the mail share password
field.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-28 14:01:43 +01:00
Nextcloud bot d33a93c6f9 [tx-robot] updated from transifex 2018-02-28 01:12:57 +00:00
John Molakvoæ (skjnldsv) 30b9c139b6 Updated error message
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 12:14:34 +01:00
John Molakvoæ (skjnldsv) 6ff85e1dd6 Fixed default urls
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 12:14:29 +01:00
John Molakvoæ (skjnldsv) 018ff68f45 Show error if no external storage configured
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-02-27 12:14:23 +01:00
Julius Härtl 282b79c4b1 Merge pull request #8554 from kyrofa/backport_13/8462/theming_app_outside_root
[stable13] theming: handle not being in the serverroot
2018-02-27 10:37:46 +01:00
Nextcloud bot 4c52fed779 [tx-robot] updated from transifex 2018-02-27 01:14:50 +00:00
Kyle Fazzari 4ecf31541b 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:24:34 -08:00
Morris Jobke 88ece3f5d7 Merge pull request #8532 from nextcloud/8499-stable13
[stable13]  Avoid fruitless login attempts
2018-02-26 15:10:52 +01:00
Morris Jobke bf2f744bc7 Merge pull request #8536 from nextcloud/8522-stable13
[stable13] Fix retrieval of group members with numerical uids from LDAP
2018-02-26 15:10:26 +01:00
Arthur Schiwon 8acec5309c fix retrieving group members with numerical uids from LDAP
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:33:35 +01:00
Arthur Schiwon b02d3a27ba tests for retrieving group members with numerical uids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 13:33:25 +01:00
Arthur Schiwon fb2ebbd232 don't try login with the same name that just failed
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 10:32:38 +01:00
Arthur Schiwon f015d38a89 track the state of the bind result
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-26 10:32:31 +01:00
Roeland Jago Douma 7e424e52a3 Merge pull request #8518 from nextcloud/stable13-8507
Add some whitespace around change.svg icon (stable13)
2018-02-24 16:25:51 +01:00
Roeland Jago Douma 3c3d007068 Merge pull request #8515 from nextcloud/13-8502
[stable13] Show hint in OCS API for user creation
2018-02-24 16:24:58 +01:00
Nextcloud bot 1eb8aee0e6 [tx-robot] updated from transifex 2018-02-24 01:12:42 +00:00
blizzz a4fbe80f73 Merge pull request #8517 from nextcloud/stable13-8416
[stable13] Fix hiding and event propagation issues with the user management popover
2018-02-23 13:01:43 +01:00
Marin Treselj 5d2feda77c Add some whitespace around change.svg icon (stable13)
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2018-02-23 11:11:20 +01:00
Julius Härtl fef3f23492 Fix hiding and event propagation issues with the user management popover
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-23 11:10:03 +01:00
Morris Jobke 168f188596 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:24:26 +01:00
Nextcloud bot a5b73fe761 [tx-robot] updated from transifex 2018-02-23 01:12:43 +00:00
Nextcloud bot 367770adab [tx-robot] updated from transifex 2018-02-22 01:12:53 +00:00
Roeland Jago Douma 27aa0761bc Merge pull request #8470 from nextcloud/13-8468
[stable13] Use mb_* string methods to extract first character for generated avatars
2018-02-21 13:29:28 +01:00
Morris Jobke f1568b96ce Use mb_* string methods to extract first character for generated avatars
This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server.

See also http://php.net/manual/en/function.mb-strtoupper.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-21 12:40:16 +01:00
Nextcloud bot 86be2687fb [tx-robot] updated from transifex 2018-02-21 01:12:33 +00:00
Morris Jobke 58cc34b816 Merge pull request #8267 from nextcloud/8206_13
[stable13] Better result handling of email search
2018-02-20 23:54:16 +01:00
Joas Schilling d63caf5829 Better result handling of email search
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-20 17:47:54 +01:00
Roeland Jago Douma a3de507b76 Merge pull request #8440 from nextcloud/8428_13
[stable13] Use TTF fonts for avatar generation
2018-02-20 08:21:04 +01:00
Nextcloud bot 16a4e7192c [tx-robot] updated from transifex 2018-02-20 01:12:21 +00:00
Roeland Jago Douma a4159378be Avatar generation use ttf (for ancient compatibility)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-19 22:12:56 +01:00
Roeland Jago Douma 535816a6d4 Add TTF of OpenSand-{Ligh,Semibold}
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-19 22:12:51 +01:00
Nextcloud bot b5029f8975 [tx-robot] updated from transifex 2018-02-19 01:12:17 +00:00
Nextcloud bot 3d06d946b0 [tx-robot] updated from transifex 2018-02-18 01:12:28 +00:00
Morris Jobke 577a3cf145 Merge pull request #8407 from nextcloud/stable13-8376-devgals
[stable13] Fix edit tag textbox size
2018-02-17 15:38:34 +01:00
Aastha Gupta 09dbcd9647 Fix edit tag textbox size
Fixes #7586

Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
2018-02-17 15:56:59 +05:30
Nextcloud bot b631cc1286 [tx-robot] updated from transifex 2018-02-17 01:12:30 +00:00
Morris Jobke 964b511b39 Merge pull request #8395 from nextcloud/stable13-8382-make-acceptance-tests-for-comments-more-consistent-with-the-others
[stable13] Make acceptance tests for comments more consistent with the others
2018-02-16 14:33:49 +01:00
Daniel Calviño Sánchez 5fd7de5275 Take into account the comment message when looking for it
Instead of checking that the list contains one comment it is now checked
that a comment with certain message is visible. This makes the step (and
the locator) more reusable in future tests and also simplifies the code.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-16 12:24:35 +01:00
Daniel Calviño Sánchez d9e66b2114 Adjust timeouts in the step to create a new comment
Depending on the previous steps the new comment field may be already
shown or not when the step to create a new comment is executed.
Therefore, the timeout was increased from 2 to the "standard" 10 seconds
used in other tests.

If the new comment field was found there is no need to use a timeout
when looking for the new comment button; it is either there or not, it
will not appear after some time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-16 12:24:35 +01:00
Daniel Calviño Sánchez f6737e43e9 Move locators above step definitions
The locators are moved above the step definitions for consistency with
other context files; besides that I made some minor adjustments for
consistency too in the locator descriptions and identation, and moved
the locators for ".newCommentRow" descendants together.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-16 12:24:35 +01:00
Daniel Calviño Sánchez 38a03f3193 Add acceptance tests for comments to Drone
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-02-16 12:24:34 +01:00
Nextcloud bot de9865b9d9 [tx-robot] updated from transifex 2018-02-16 01:12:34 +00:00
Nextcloud bot ef367f8bfe [tx-robot] updated from transifex 2018-02-14 21:37:55 +00:00
Nextcloud bot adb9ad29fa [tx-robot] updated from transifex 2018-02-14 01:12:17 +00:00
Nextcloud bot 7d1c9eef8d [tx-robot] updated from transifex 2018-02-13 10:48:56 +00:00
Roeland Jago Douma 57e3900095 Merge pull request #8261 from nextcloud/s3-folder-delete-13
[13] Fix deleting folders when using s3 external storage
2018-02-13 07:45:02 +01:00
Nextcloud bot 2e271313c9 [tx-robot] updated from transifex 2018-02-12 21:34:01 +00:00
Robin Appelman 2a6f8e65c2 fix invalidating folder cache for s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-12 20:23:10 +01:00
Robin Appelman 3257bf2424 adjust s3 bulk delete to new sdk syntax
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-12 20:23:10 +01:00
Morris Jobke 4c21fc802f Merge pull request #8309 from nextcloud/8308_13
[stable13] Show open graph preview in WhatsApp
2018-02-12 14:24:17 +01:00
Roeland Jago Douma ad7c31914f Show open graph preview in WhatsApp
Whatsapp is picky about the size of the open graph images.
So we do some special handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-12 11:12:27 +01:00
John Molakvoæ e47e1f6bdd Merge pull request #8287 from nextcloud/stable13-8165
[13] Remove jquery ui background image
2018-02-10 00:05:01 +01:00
John Molakvoæ 3f91eaedfc Merge pull request #8286 from nextcloud/stable13-8155
[13] Fix styling issues of guest pages #8155
2018-02-10 00:04:40 +01:00
Julius Härtl f248c7a583 Remove jquery ui background image
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 17:47:19 +01:00
Julius Härtl ef571d69f3 Add space on guest pages with custom logo
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 17:46:48 +01:00
Julius Härtl 1b3e3dfada Load guest css on any guest and error page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 17:46:48 +01:00
Julius Härtl e3fb91756a Make sure theming logo css only applies when a logo is set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-09 17:46:47 +01:00
Nextcloud bot 9c9c438c8b [tx-robot] updated from transifex 2018-02-09 15:29:20 +00:00
Morris Jobke 832c0c480b Merge pull request #8271 from nextcloud/13-8270
[stable13] Update CRL to revoke files_rightclick
2018-02-09 09:57:36 +01:00
Morris Jobke 9586dc6c92 Merge pull request #8145 from nextcloud/13-unperl-l10n
[stable13] Remove old perl script to update l10n files
2018-02-09 09:56:26 +01:00
Morris Jobke 9bc0de9ab6 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:44:55 +01:00
Nextcloud bot 2845166e2a [tx-robot] updated from transifex 2018-02-09 01:11:05 +00:00
Roeland Jago Douma 71cadf465b Merge pull request #8264 from nextcloud/fix_dev_man_link_13
[stable13] Link to NC13 dev manual
2018-02-08 20:05:35 +01:00
Morris Jobke 95ac2e31ae Remove old perl script to update l10n files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 18:22:04 +01:00
Roeland Jago Douma a6bb42d3e8 [stable13] Link to NC13 dev manual
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 15:13:51 +01:00
Morris Jobke 197c97e242 Merge pull request #8102 from nextcloud/s3-uploader-13
[13] Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:31:23 +01:00
Morris Jobke e2cb6a3b3c Merge pull request #8183 from robert-scheck/pki-validation-stable13
[stable13] Handle SSL certificate verifications for others than Let's Encrypt
2018-02-08 11:02:33 +01:00
Joas Schilling 78e3b6400a Merge pull request #8253 from nextcloud/13-8252
[stable13] Remove invalid link to documentation
2018-02-08 10:20:39 +01:00
Roeland Jago Douma 55d5868da5 Update tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 10:16:38 +01:00
Roeland Jago Douma f1cd334281 Don't perform CSRF check on OCS routes with Bearer auth
Fixes #5694

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-08 10:16:38 +01:00
Roeland Jago Douma 202dd62951 Merge pull request #8250 from nextcloud/8233_13
[stable13] actually return stream from swift
2018-02-08 09:07:33 +01:00
Morris Jobke 7701c7fab6 Remove invalid link to documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-08 08:46:36 +01:00
Robin Appelman 6296c498b2 actually return stream from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 08:10:08 +01:00
Nextcloud bot 5e3cb24efa [tx-robot] updated from transifex 2018-02-08 01:10:40 +00:00
Joas Schilling 36eb93deac Merge pull request #8228 from nextcloud/dav-dir-exception-previous-13
[13] keep previous exception when transforming to dav exception
2018-02-07 17:05:27 +01:00
Robin Appelman 38cb28db1f keep previous exception when transforming to dav exception
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-07 14:44:11 +01:00
Nextcloud bot f8740a1f0c [tx-robot] updated from transifex 2018-02-07 11:32:08 +00:00
Roeland Jago Douma 7486d021b1 Merge pull request #8197 from nextcloud/stable13-8144
[stable13] Repair step to clear frontend related caches
2018-02-07 09:02:37 +01:00
Nextcloud bot 1ec43c8265 [tx-robot] updated from transifex 2018-02-07 01:10:36 +00:00
Morris Jobke b16824db31 Merge pull request #8195 from nextcloud/13-8172
[stable13] Use a phan version instead of master
2018-02-06 16:41:58 +01:00
Roeland Jago Douma b55b1b5854 Merge pull request #8045 from nextcloud/8002_13
[stable13] Dont polute the log on DAV emaillogin
2018-02-06 15:34:28 +01:00
Roeland Jago Douma c1423eec24 Use a phan version instead of master
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 14:20:30 +01:00
Roeland Jago Douma b837d3f332 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-06 12:32:51 +01:00
Julius Härtl 69b22c2d61 Move depsCache clearing to SCSSCacher/JSCombiner
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:50 +01:00
Julius Härtl bf24b4db24 Add tests and class mapping
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:50 +01:00
Julius Härtl 31313178a5 Add repair step to clear frontend related caches
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-06 12:32:48 +01:00
Morris Jobke b2068704e7 Merge pull request #8156 from nextcloud/stable13-8078
[Stable13] Scss hardening
2018-02-06 12:17:45 +01:00
Morris Jobke 0fc97b2104 Merge pull request #8177 from nextcloud/8160_13
[stable13] Do not try to get the jailed path if we can't find the id
2018-02-06 11:18:46 +01:00
Nextcloud bot 9da8032b39 [tx-robot] updated from transifex 2018-02-06 01:10:34 +00:00
Morris Jobke 3b4285e13f Merge pull request #8187 from nextcloud/13-final
Final 13.0.0
2018-02-06 01:24:06 +01:00
Morris Jobke bc171d46e6 Final 13.0.0
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-05 18:20:47 +01:00
Robert Scheck de07c82a4d 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:37:23 +01:00
Roeland Jago Douma b88aeb2166 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-05 12:42:47 +01:00
Nextcloud bot 976e5e35f7 [tx-robot] updated from transifex 2018-02-05 01:10:30 +00:00
Nextcloud bot e268181b84 [tx-robot] updated from transifex 2018-02-04 01:10:40 +00:00
Nextcloud bot 064ff027fd [tx-robot] updated from transifex 2018-02-03 01:10:43 +00:00
Morris Jobke 9e907901a0 Merge pull request #8151 from nextcloud/13-8150
[stable13] Update CRL because user_sql cert was lost
2018-02-02 13:34:28 +01:00
Julius Härtl 7870cc2b67 Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:06:50 +01:00
Julius Härtl 9915ebb75f Add tests for URL rewriting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:06:04 +01:00
Julius Härtl 106af04355 Do not rewrite absolute URLs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:58 +01:00
Julius Härtl cee941a6a3 Clear injectect variables when resetting the cache
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:52 +01:00
Julius Härtl 76c79ff18f Only override image styles if the theming values are set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:41 +01:00
Julius Härtl 73ae7b0c5f Make sure that injected variables do not break the CSS generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:25 +01:00
Julius Härtl d8e0a6ee32 SCSS files are only cached if their size is > 0
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-02 13:05:03 +01:00
Morris Jobke b2e3e29266 Merge pull request #8142 from nextcloud/13-update-server
[stable13] Use correct update server
2018-02-02 12:18:29 +01:00
Morris Jobke 254be1dacd 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 11:59:24 +01:00
Nextcloud bot 6989c65acf [tx-robot] updated from transifex 2018-02-02 01:10:28 +00:00
Nextcloud bot 501685288b [tx-robot] updated from transifex 2018-02-01 18:28:19 +00:00
Nextcloud bot d5e56b34c4 [tx-robot] updated from transifex 2018-02-01 17:20:02 +00:00
Christoph Wurst 62f4454d99 Merge pull request #8138 from nextcloud/13-update-doc-version
Update doc link version to 13
2018-02-01 14:45:45 +01:00
Morris Jobke d9e229ab70 Use correct update server
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 14:43:53 +01:00
Morris Jobke f46573d836 Update doc link version to 13
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-01 13:53:24 +01:00
Nextcloud bot 2e6e969fbc [tx-robot] updated from transifex 2018-02-01 01:11:06 +00:00
Morris Jobke 88d5f6ec63 Merge pull request #8127 from nextcloud/13-final-rc
13.0.0 RC 4
2018-01-31 20:31:17 +01:00
Morris Jobke 2cc1cdba6f 13.0.0 RC 4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-31 17:31:18 +01:00
Morris Jobke c39a40f15f Merge pull request #8126 from nextcloud/13-8121
[stable13] Create the migrations table also with the UTF8mb4 collation
2018-01-31 17:29:00 +01:00
Roeland Jago Douma dabce9685b Merge pull request #8124 from nextcloud/app-nav-flex-margins-fix
[stable13] Fixed app navigation flex margins
2018-01-31 15:56:18 +01:00
Joas Schilling 119de6467f Create the migrations table also with the UTF8mb4 collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-31 15:54:28 +01:00
John Molakvoæ (skjnldsv) 22c083b58a Fixed app navigation flex margins
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-31 14:51:27 +01:00
Morris Jobke bb7a2b2329 Merge pull request #8073 from nextcloud/stable13-8069
[stable13] do not catch and ignore ServerNotAvailable in the wrong spot
2018-01-31 14:46:55 +01:00
Morris Jobke 10110e85eb Merge pull request #8116 from nextcloud/8111_13
[stable13] Only handle encrypted property on folders
2018-01-31 14:46:18 +01:00
Nextcloud bot fb11969916 [tx-robot] updated from transifex 2018-01-31 01:11:04 +00:00
Roeland Jago Douma f924a6d7d9 Only handle encrypted property on folders
Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).

Better to not confuse the output.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-30 21:56:32 +01:00
Nextcloud bot c30e958dac [tx-robot] updated from transifex 2018-01-30 01:11:20 +00:00
Robin Appelman 7ab3a7e2c3 Use S3Client::upload instead of splitting single/multipart upload ourselves
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-29 16:11:05 +01:00
Nextcloud bot 7b227d8712 [tx-robot] updated from transifex 2018-01-29 01:11:05 +00:00
Nextcloud bot 5700467c29 [tx-robot] updated from transifex 2018-01-27 01:11:03 +00:00
Arthur Schiwon d61dd36fdd 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:35:26 +01:00
Morris Jobke d82d1a8a81 Merge pull request #8027 from nextcloud/13.0.0-last-rc
13.0.0 RC3
2018-01-26 15:27:57 +01:00
Morris Jobke fabf75a7d3 13.0.0 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 14:43:20 +01:00
Nextcloud bot 0aca61d73e [tx-robot] updated from transifex 2018-01-26 01:11:04 +00:00
Roeland Jago Douma 2bed7a7f95 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 12:23:56 +01:00
Roeland Jago Douma 9dfd3544c2 Don't polute log when loggin into dav with email
* We first try the email as username but this fails
* Then we get the uid from the email and try again

We should not log the first attempt since it polutes the log with failed
login attempts while the login actually is valid.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 12:23:50 +01:00
Nextcloud bot e79a755d08 [tx-robot] updated from transifex 2018-01-25 01:11:19 +00:00
Roeland Jago Douma d76f08dfbd Merge pull request #8034 from nextcloud/13-8032
[stable13] Fix missing clipboard icon in shared links
2018-01-24 19:19:46 +01:00
Daniel Calviño Sánchez 326af0c9c3 Fix missing clipboard icon in shared links
The clipboard icon in shared links appears either directly on the link
input field or, if any social sharing app is enabled, in a menu. The
clipboard icon uses the same CSS rules as other icons (like the
information icon) to be posioned on the end of the input field, and
those rules have to be "cancelled" when the icon is shown in the menu.

Fixes #7990

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-24 17:25:50 +01:00
Morris Jobke 52149d2c54 Merge pull request #8031 from nextcloud/7921_12
[stable13] Removed additional and uneccessary request on password reset, to fix redirection afterwards.
2018-01-24 17:24:51 +01:00
Morris Jobke a0f62b71c8 Merge pull request #8030 from nextcloud/7986_12
[stable13] If the preview is size 0 it is invalid
2018-01-24 16:40:44 +01:00
Roeland Jago Douma 1a21524f6f Merge pull request #8025 from nextcloud/13-8020
[stable13] Make sure we always know for sure if an avatar is generated or not
2018-01-24 16:28:55 +01:00
Morris Jobke 76636dea9c Merge pull request #8029 from nextcloud/13-7991
[stable13] Send a proper response for status.php on trusted domain error
2018-01-24 16:22:06 +01:00
Luca Adrian Lindhorst 6b954e6cd6 Removed additional and uneccessary request on password reset, to fix redirection afterwards.
Signed-off-by: Luca Adrian Lindhorst <info@lucalindhorst.de>
2018-01-24 16:14:37 +01:00
Roeland Jago Douma f259e1cb8c If the preview is size 0 it is invalid
* delete it
* throw a NotFound Exception
  - This should a proper 404 to the user
  - Next time it is then regenerated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-24 16:11:36 +01:00
Morris Jobke 986623e2ac Send a proper response for status.php on trusted domain error
* fixes #7732

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-24 15:42:25 +01:00
Julius Härtl 0209690d55 Make sure we always know for sure if an avatar is generated or not
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-24 15:05:38 +01:00
Nextcloud bot 3b35c226ce [tx-robot] updated from transifex 2018-01-24 01:11:02 +00:00
Robin Appelman 3d10c3ace5 increase the time we wait for smb notifications in the test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-23 09:54:34 +01:00
Nextcloud bot 924298f740 [tx-robot] updated from transifex 2018-01-23 01:11:03 +00:00
Nextcloud bot 823a14fae6 [tx-robot] updated from transifex 2018-01-22 01:10:53 +00:00
Nextcloud bot 883817e62a [tx-robot] updated from transifex 2018-01-21 01:11:04 +00:00
Nextcloud bot 4c431d39eb [tx-robot] updated from transifex 2018-01-20 01:11:10 +00:00
Roeland Jago Douma 1ecf10e26d Merge pull request #7963 from nextcloud/smb-2.0.4-13
[13] update icewind/smb to 2.0.4
2018-01-19 20:24:21 +01:00
Robin Appelman 31b922d2f5 update icewind/smb to 2.0.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-19 16:23:22 +01:00
Nextcloud bot bec72bf9ff [tx-robot] updated from transifex 2018-01-19 01:11:08 +00:00
Morris Jobke 6719c7723a Merge pull request #7940 from nextcloud/13.0.0-rc2-prep
13.0.0 RC2
2018-01-18 17:41:43 +01:00
Morris Jobke 0b3623a71d 13.0.0 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 17:05:46 +01:00
Morris Jobke eb03435377 Merge pull request #7944 from nextcloud/backport/7912/correctly-drop-owncloud-migrations-table
[stable13] Correctly drop the ownCloud migrations table
2018-01-18 17:03:15 +01:00
Morris Jobke b7da6f13ff Merge pull request #7942 from nextcloud/7941-stable13
[stable13] remove hardcoded sharepoint icon path
2018-01-18 16:47:55 +01:00
Morris Jobke 0a76d72a1d Merge pull request #7943 from nextcloud/backport/7812/make-sure-the-arrays-are-arrays
[stable13] Make sure the arrays are arrays
2018-01-18 16:47:16 +01:00
Morris Jobke 9cda3206ff Properly catch InvalidTokenException for better error response
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 16:11:21 +01:00
Joas Schilling 809928c176 Correctly drop the ownCloud migrations table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-18 15:59:05 +01:00
Joas Schilling 73a6717016 Make sure the arrays are arrays
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-18 15:56:24 +01:00
Arthur Schiwon 1703c25b26 remove hardcoded sharepoint icon path
it does not exist and if it would, it was not themable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-18 15:47:25 +01:00
Daniel Calviño Sánchez a0499e0258 Merge pull request #7932 from nextcloud/7914-stable13
[stable13] format self-mentions, but don't offer them
2018-01-18 14:20:26 +01:00
Arthur Schiwon 92bc33dd1e Backport of format self-mentions, but don't offer them #7914
comments should compile mentions also if done by author

it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.

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

do not offer the handle of the current user for auto completion

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

add types to php doc

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-18 12:08:08 +01:00
Nextcloud bot 266c64069f [tx-robot] updated from transifex 2018-01-18 01:10:52 +00:00
Roeland Jago Douma 414d6e2184 Merge pull request #7915 from nextcloud/backport/7909/fix-migration-type-hints
Fix the type hints of migrations and correctly inject the wrapped sch…
2018-01-17 14:55:18 +01:00
Joas Schilling ed999066e5 Fix the type hints of migrations and correctly inject the wrapped schema into migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-17 13:53:09 +01:00
Morris Jobke 9efdd684c4 Merge pull request #7903 from nextcloud/13-7891
[stable13] Fix systemtags/list to be compliant
2018-01-17 11:40:56 +01:00
Nextcloud bot c042ae8d61 [tx-robot] updated from transifex 2018-01-17 01:11:11 +00:00
Morris Jobke 7ea3623cd9 Merge pull request #7887 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors
[stable13] Keep all shipped apps enabled because they should be okay
2018-01-16 21:52:36 +01:00
Morris Jobke e643af16d3 Fix systemtags/list to be compliant
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 21:48:32 +01:00
Roeland Jago Douma 4b2e98953b Merge pull request #7883 from nextcloud/search-and-13
[13] Support arbitrary number of arguments for d:or and d:and in search queries
2018-01-16 20:21:08 +01:00
Joas Schilling c32a13fb5b Merge pull request #7886 from nextcloud/13-7885
[stable13] Add OCP\User deprecations to app code checker
2018-01-16 14:17:36 +01:00
Joas Schilling d639dfacb7 Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 13:41:09 +01:00
Morris Jobke 0fafa794da Add OCP\User deprecations to app code checker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 13:33:58 +01:00
Robin Appelman 3a1390fdb7 Support arbitrary number of arguments for d:or and d:and in search queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-16 13:27:52 +01:00
Christoph Wurst c25da25180 Merge pull request #7878 from nextcloud/13-7877
[stable13] Deprecated checkLoggedIn and other old ways to access control
2018-01-16 12:23:39 +01:00
Morris Jobke 09908a737f Deprecated checkLoggedIn and other old ways to access control
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 10:43:03 +01:00
Nextcloud bot 43a53c0c8e [tx-robot] updated from transifex 2018-01-16 01:11:05 +00:00
Morris Jobke 3baa5fada8 Merge pull request #7806 from nextcloud/fix-7805
Fix bug with proxies
2018-01-15 00:50:25 +01:00
Joas Schilling f2706cb572 Add unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-15 00:49:28 +01:00
Mario Danic c7eaa26f73 Fix bug with proxies
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 00:49:22 +01:00
Morris Jobke 4f30c2fbe4 Merge pull request #7764 from nextcloud/13rc1
13.0.0 RC1
2018-01-11 20:34:42 +01:00
Morris Jobke b66117583d 13.0.0 RC1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-11 17:22:27 +01:00
Morris Jobke 9898ec95c1 Merge pull request #7796 from nextcloud/ldap-sync-fixes
LDAP Sync fixes: revert recursion resolution, fixed handling of pagingsize of 0
2018-01-11 17:22:00 +01:00
Morris Jobke 33b82f34be Merge pull request #7709 from nextcloud/fix-password-displayed-as-username-in-password-manager
Fix password displayed as username in Firefox password manager dialog
2018-01-11 15:21:35 +01:00
Arthur Schiwon f84ec92563 revert resolving of recursion (3628d4d65d)
without recursion we have issues with internal states. paged search status
are set to false, cookies are not being set. In the end we have  endless
requests which pile up enormously with a high initial offset.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 15:17:18 +01:00
Morris Jobke aab39ba5bd Merge pull request #7776 from nextcloud/theming-capabilties-enhancements
More detailed theming capabilities
2018-01-11 14:56:58 +01:00
Arthur Schiwon 9031ae0281 fix return value when ldapPagingSize returns null
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 14:47:51 +01:00
Morris Jobke f3eb9eeb1d Merge pull request #7791 from nextcloud/bugfix/noid/fix-update-notification
Fix displaying of the HTML update notification
2018-01-11 14:23:33 +01:00
Arthur Schiwon 15a3f4659f enrich log message with backtrace, but level it down to DEBUG
The message is not helpful anyway for an admin, and oftentimes is just
valid (e.g. when searching with an offset beyond users in LDAP).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 14:17:14 +01:00
Daniel Calviño Sánchez b83204bf2c 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 14:08:47 +01:00
Morris Jobke cc410fb9ab Merge pull request #7790 from nextcloud/usermanagement-fixes
Fix popover and styling in user management
2018-01-11 14:01:33 +01:00
Morris Jobke a987f39565 Merge pull request #7650 from rpirritano/master
made small changes to login screen
2018-01-11 13:55:39 +01:00
Arthur Schiwon f292f98060 when paged results are turned off, all (max possible) users are returned
thus hasMoreResult should return false

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-11 13:20:17 +01:00
Joas Schilling fd19d944cc Fix displaying of the HTML notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-11 13:04:56 +01:00
Robert Pirritano a82c8f58cc made small changes to login screen
added height back 70px back to footer and removed .htaccess file

Signed-off-by: Robert R Pirritano <rpirritano@gmail.com>
2018-01-11 12:37:47 +01:00
Julius Härtl 7de3cced7a Merge pull request #7783 from nextcloud/fix-empty-details-view-after-renaming-a-file
Fix empty details view after renaming a file
2018-01-11 12:27:07 +01:00
Julius Härtl f8910ad898 Fix popover and styling in user management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-11 12:13:10 +01:00
Joas Schilling 7e48344eb1 Merge pull request #7778 from nextcloud/zip_imp
[3rdparty] Improve zip support
2018-01-11 12:00:10 +01:00
Roeland Jago Douma 118ccca29b Merge pull request #7787 from nextcloud/add-noopener-to-_blank-links
Adds rel="noopener noreferrer" to _blank links inside comments
2018-01-11 11:58:19 +01:00
Roeland Jago Douma d56c566ff5 Merge pull request #7785 from nextcloud/mount-type-federated-shares
return correct mount type for federated shares
2018-01-11 11:45:29 +01:00
Thomas Citharel feb4dc383e Adds rel="noopener noreferrer" to _blank links inside comments
For more details, check out https://mathiasbynens.github.io/rel-noopener/ for instance

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-01-11 11:02:45 +01:00
Bjoern Schiessle 286de0c239 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:17:05 +01:00
Daniel Calviño Sánchez dab4a70bcf 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 04:30:52 +01:00
Daniel Calviño Sánchez f29c1cf13a 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 02:47:11 +01:00
Daniel Calviño Sánchez 7a088cfcf5 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 02:45:47 +01:00
Nextcloud bot 2a24f45b5f [tx-robot] updated from transifex 2018-01-11 01:11:35 +00:00
Roeland Jago Douma c8c4ce2da5 Bump strengthify to 0.5.3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 21:48:24 +01:00
Morris Jobke 00a823f62e Merge pull request #7765 from nextcloud/fix_5574
Don't encode paths that will be passed to the davclient
2018-01-10 21:00:19 +01:00
Roeland Jago Douma 03a7d9bbfa Merge pull request #7635 from Abijeet/bug-7106
Fixes password input being prompted every time.
2018-01-10 20:10:40 +01:00
Daniel Calviño Sánchez 9c22e99331 Add extra test cases for password confirmation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-10 16:42:25 +01:00
Abijeet b246ca96ff Added test cases for the fix for the password confirmation box appearing repeatedly.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-10 16:41:27 +01:00
Roeland Jago Douma 9a95d8a3d2 [3rdparty] Improve zip support
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 16:24:58 +01:00
Morris Jobke 4823ac969a Merge pull request #7763 from nextcloud/pos_fix_7751
Do not instantiate node when not needed
2018-01-10 15:40:10 +01:00
Morris Jobke 9978cee1e3 Merge pull request #7773 from nextcloud/add-events-for-favorites
Add events for favorites
2018-01-10 14:42:31 +01:00
Julius Härtl d4e106f2b3 More detailed theming capabilities
This will allow clients to easily check if a custom background is used

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-10 13:23:22 +01:00
Roeland Jago Douma 9c017084e5 Merge pull request #7767 from nextcloud/fix-theming-regression
Fix appmenu svg double invert
2018-01-10 13:10:20 +01:00
Morris Jobke 4f561e2bca Merge pull request #7769 from nextcloud/fix-ie-svg-size
Set height for sidebar icons
2018-01-10 12:36:02 +01:00
blizzz fe12b2b05d Merge pull request #7766 from nextcloud/log_properly_7755
Log a missing setting as INFO not as WARNING
2018-01-10 12:25:49 +01:00
Morris Jobke 1f85b98b1d Merge pull request #7772 from nextcloud/coc_ci
Fix CI after Code of Conduct merge
2018-01-10 11:29:52 +01:00
Joas Schilling 3af6d112ce Add events for favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-10 11:20:21 +01:00
Roeland Jago Douma c715045749 Fix CI after Code of Conduct merge
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 11:03:12 +01:00
Julius Härtl e8399953df 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 09:51:48 +01:00
Morris Jobke da030b667d Merge pull request #7768 from nextcloud/code-of-conduct
Create CODE_OF_CONDUCT.md
2018-01-10 09:48:49 +01:00
Jos Poortvliet 89d3c5e5b9 Create CODE_OF_CONDUCT.md
By adding (a link to) our code of conduct to the github repo, Github will be able to show it to people. Yay!
2018-01-10 09:32:58 +01:00
Julius Härtl 927626cbaa 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-10 09:11:32 +01:00
Roeland Jago Douma f6d84bdb23 Log a missing setting as INFO not as WARNING
It can happen for all kinds of reasons that a setting is not available.
(A user removes a folder, a setting got deleted). So don't polute the
log on default settings.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 09:02:01 +01:00
Roeland Jago Douma 88388cadb0 Merge pull request #7760 from nextcloud/remove-useless-output
Remove "DEBUG OUTPUT:" from failing OCS API requests
2018-01-10 08:45:15 +01:00
Roeland Jago Douma d4f163b230 Don't encode paths passed to the OC.Files.Client
This is handled already in the client. So double encoding breaks things
in some situations.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 08:35:40 +01:00
Roeland Jago Douma e5cc8ebe7a Return proper principal on the uploads collection listing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-10 08:35:20 +01:00
Nextcloud bot e18c0b2ac3 [tx-robot] updated from transifex 2018-01-10 01:11:20 +00:00
Morris Jobke 8257689e35 Merge pull request #7705 from nextcloud/theming-calc-adjust
Adjust theming color calculations using sRGB luma
2018-01-09 23:04:30 +01:00
Roeland Jago Douma 4596423b14 Do not instantiate node when not needed
Use the lazy functions is possible. This avoids getting the node if not
required.

Possible fix for #7751

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 19:51:50 +01:00
Morris Jobke 167f4624ce Merge pull request #7713 from nextcloud/fix-sync-offset
Fix LDAP Background Sync does not reset offset
2018-01-09 18:39:31 +01:00
Morris Jobke ca74a54dfa Remove "DEBUG OUTPUT:" from failing OCS API requests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-09 18:34:25 +01:00
Morris Jobke 8c9e584c6b Merge pull request #7756 from nextcloud/fix-theming-rebase-url
Fix SCSS processing when undoing theming values
2018-01-09 17:40:34 +01:00
Julius Härtl 3379290a73 Fix SCSS processing when undoing theming values
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-09 14:18:03 +01:00
Jan-Christoph Borchardt 9386b07ed8 Merge pull request #7731 from nextcloud/preview_size_inc
Max preview size to 4096x4096
2018-01-09 11:07:02 +01:00
Jan-Christoph Borchardt c747d6c95d Merge pull request #7729 from nextcloud/fix-tooltip-shadow
Improve shadow of tooltips
2018-01-09 11:05:51 +01:00
Nextcloud bot 4dd4e43320 [tx-robot] updated from transifex 2018-01-09 01:11:15 +00:00
Roeland Jago Douma 0fb1c986de Merge pull request #7739 from nextcloud/_blank
opens comments links in _blank 🙊
2018-01-08 20:42:37 +01:00
Roeland Jago Douma 7d87e8305d Merge pull request #7692 from nextcloud/dont_lie_preview_mimetype
Don't lie about the preview mimetype
2018-01-08 20:38:12 +01:00
Abijeet de5467811a Fixes password input being prompted every time.
Fixes #7106

- Echoing the current server time via a JS variable and storing the current time on page load in JS.
- Calculating the diff and taking it into account when deciding whether to show the password confirmation.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-08 23:47:52 +05:30
Julius Härtl 9bb0299c98 Add colors to tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 16:50:03 +01:00
Arthur Schiwon 770c744e45 opens comments links in _blank 🙊
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 16:06:24 +01:00
Morris Jobke 9c3ac19b33 Merge pull request #7716 from nextcloud/hide-favourite-icon-in-details-view-if-favourite-action-is-not-available
Hide favourite icon in details view if favourite action is not available
2018-01-08 15:42:58 +01:00
Roeland Jago Douma e2352cc06f Max preview size to 4096x4096
With HiDPI screens. And even normal HD screens you want more detail from
your pictures. Or the ability to somewhat zoom on you previews. For this
we need somewhat larger previews.

Moving the default to 4096x4096 is a step up. Users that want the old
behavior can still set the values in config.php

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 15:35:55 +01:00
Morris Jobke db7bde6ae6 Merge pull request #7733 from nextcloud/no_max_sf
The max_scale_factor is not used anymore.
2018-01-08 14:10:46 +01:00
Arthur Schiwon cf915b0f75 extend test for rotating prefixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:46:07 +01:00
Arthur Schiwon 7c3db54ff6 fix changing to next cycle
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:45:06 +01:00
Arthur Schiwon 0d3f945209 add tests for whole run command
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:44:45 +01:00
Arthur Schiwon b17c5fec40 add unit test for qualifies to run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 13:08:59 +01:00
Arthur Schiwon e4310648df add unit test for determining next cycle
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-08 12:57:14 +01:00
Roeland Jago Douma 1e74c8fba9 The max_scale_factor is not used anymore.
We never generate previews larger than the original. So the config
setting can be removed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-08 11:42:36 +01:00
Julius Härtl 27f00bf7fe Improve shadow of tooltips
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 11:40:50 +01:00
Morris Jobke a30dfc5b50 Merge pull request #7711 from nextcloud/fix-avatar-behaviour
Fix avatar display to not overwrite display style
2018-01-08 11:36:57 +01:00
Julius Härtl fd8f0788b1 Fix tests
The avatar plugin should not change the display element, since the
avatar is always shown by default and the display value is up to the
developers

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:36:06 +01:00
Julius Härtl 04a18098e4 Remove show() function since we always show the avatar container
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:36:06 +01:00
Julius Härtl 9b668d01f5 Fix preview when theming changes invertion of icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:32:25 +01:00
Julius Härtl e4f9c75a05 Adjust theming color calculations using sRGB luma
based on https://robots.thoughtbot.com/closer-look-color-lightness

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-08 10:31:34 +01:00
Morris Jobke ecf8850464 Merge pull request #7728 from nextcloud/fix-new-menu-shown-behind-the-controls-in-the-file-list
Fix "New" menu shown behind the multiselect header in the file list
2018-01-08 08:33:40 +01:00
Daniel Calviño Sánchez 696dad8c3e Fix "New" menu shown behind the multiselect header in the file list
The "New" menu is a descendant of the controls bar, and the controls bar
and the multiselect header belong to the same stacking context. As they
had the same z-index but the multiselect header appears after the
controls bar in the DOM the controls bar and its descendants, including
the "New" menu, were rendered behind the multiselect header. Now the
controls bar has a z-index value higher than the one used for the
multiselect header to ensure that the "New" menu is rendered in front of
the multiselect header.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-08 03:57:15 +01:00
Nextcloud bot 75f3b605d3 [tx-robot] updated from transifex 2018-01-08 01:11:17 +00:00
Roeland Jago Douma faa68b28cb 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-07 14:36:37 +01:00
Roeland Jago Douma 5b21650097 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-07 11:41:54 +01:00
Nextcloud bot f25e51c369 [tx-robot] updated from transifex 2018-01-07 01:11:11 +00:00
Nextcloud bot 2e683d3502 [tx-robot] updated from transifex 2018-01-06 01:11:09 +00:00
Daniel Calviño Sánchez 3113ee1129 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-05 19:06:06 +01:00
Morris Jobke 68e205e827 Merge pull request #7712 from nextcloud/jsconfig_l10n
Use correct L10N files for jsconfig
2018-01-05 15:22:10 +01:00
Roeland Jago Douma 30ac28f950 Use correct L10N files for jsconfig
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-05 14:33:03 +01:00
Arthur Schiwon a565bf0b9f fix offset is never being reset
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 14:29:11 +01:00
Arthur Schiwon 82da4fde18 create failing test for this case
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 14:27:36 +01:00
Morris Jobke 62656dc5c2 Merge pull request #7664 from nextcloud/13beta4
13.0.0 beta 4
2018-01-05 12:19:49 +01:00
Morris Jobke 11c6186087 13.0.0 beta 4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-05 10:55:24 +01:00
Morris Jobke 05bcdf937b Merge pull request #7477 from nextcloud/date-time-picker-position-fix
Date time picker position fix & design fixes
2018-01-05 10:54:32 +01:00
Morris Jobke ad8e9b2f5f Merge pull request #7710 from nextcloud/theming-fix-scss
Fix url rebase when changing the theming color
2018-01-05 10:43:16 +01:00
Julius Härtl 24233162a0 Fix faulty path in theming scss generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 09:43:09 +01:00
John Molakvoæ (skjnldsv) 6127d19f54 Fixed default expire date and placeholder
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:26:01 +01:00
Daniel Calviño Sánchez 58d00bf6fb 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-05 02:45:34 +01:00
Nextcloud bot 1f8896d8c9 [tx-robot] updated from transifex 2018-01-05 01:11:18 +00:00
Morris Jobke 08dbcd238d Merge pull request #7696 from nextcloud/fix-appmenu-height
Fix small issues with the app menu
2018-01-04 17:55:21 +01:00
Morris Jobke f87977ef2d Merge pull request #7702 from nextcloud/composer_upd
Composer updated
2018-01-04 17:24:09 +01:00
Morris Jobke 9c2660e22c Merge pull request #7698 from nextcloud/fix_7697
Clear login token once apppassword is generated
2018-01-04 16:53:57 +01:00
Morris Jobke e7aebcfd6b Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it
Drop the ownCloud migration table instead of reusing it
2018-01-04 16:52:52 +01:00
Roeland Jago Douma 0280cff66f Composer updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Joas Schilling 7154050201 Drop the ownCloud migration table instead of reusing it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-04 14:58:01 +01:00
Roeland Jago Douma 82f03e1314 Clear login token once apppassword is generated
Fixes #7697

When using the new login flow a token will be generated since we login.
However after that we generate yet another token to return (as we
should).

However we should kill the current session token as we are done with it.
And will never use it again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 14:30:40 +01:00
Morris Jobke e655732458 Merge pull request #7570 from nextcloud/s3-legacy-auth
add option to use legacy v2 auth with s3
2018-01-04 13:17:58 +01:00
Julius Härtl a3753193ef Fix popover shadow in app menu
Make sure the app menu popover shadow does overlay the active indicator

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-04 12:33:10 +01:00
Julius Härtl 738c144a21 Fix app menu popover alignment
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-04 12:32:22 +01:00
Morris Jobke d984c4cdf1 Merge pull request #7693 from splitt3r/fix-js-type-hint
Fixed js typehint for showHtml method
2018-01-04 11:01:02 +01:00
Nextcloud bot 298b79410d [tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
splitt3r 6ca7a3e650 Fixed js typehint for showHtml method 2018-01-04 10:05:15 +01:00
Roeland Jago Douma 493c255f7f Merge pull request #7686 from nextcloud/fix-quota-update-3
Fixed quota update on upload and on delete
2018-01-04 08:32:36 +01:00
Morris Jobke 19280adc0d Merge pull request #7611 from nextcloud/fix-7445
Don't attempt to translate login names to uids when uids are provided
2018-01-03 23:45:31 +01:00
Arthur Schiwon e9eccf34f9 removes invalid tests, adapts another one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 21:44:30 +01:00
Roeland Jago Douma 5011142024 Merge pull request #7685 from nextcloud/link-to-update
Make update notification open the new update view from apps management
2018-01-03 21:30:52 +01:00
John Molakvoæ (skjnldsv) 88dd8e46f9 Fixup! removed unwanted line
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 17:55:53 +01:00
John Molakvoæ (skjnldsv) ab1985b62b Fixed quota update on upload and on delete
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 17:53:48 +01:00
Julius Härtl bdea20330d Make update notification open the new update view from apps management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 17:21:41 +01:00
Roeland Jago Douma 62d71158a9 Merge pull request #7680 from nextcloud/fix-7609
format links in comments
2018-01-03 16:59:08 +01:00
Morris Jobke 722097f7a0 Merge pull request #7669 from nextcloud/ie-fix-invert
Fix inverted app icons on IE11
2018-01-03 16:58:11 +01:00
Morris Jobke 0bc6a7d7fd Merge pull request #7681 from nextcloud/fix-quota-update-2
Update quotas on each upload
2018-01-03 16:30:19 +01:00
Morris Jobke 876238ce8b Merge pull request #7533 from nextcloud/oc-28545-handle-oc-total-length-in-new-chunking
[oc] Handle OC-Total-Length in new chunking
2018-01-03 16:18:24 +01:00
Julius Härtl 63b4d7e183 Remove css invert since we are using svg filters for now
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:08 +01:00
Julius Härtl a79d276324 Fix height of table rows in apps management on IE11
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:08 +01:00
Julius Härtl 7f86d4af65 Fix icon rendering in apps management for IE11
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:07 +01:00
Julius Härtl 8a226811dc Invert app icons on IE11 as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 14:42:07 +01:00
Morris Jobke ee0653d68b Merge pull request #7678 from nextcloud/fix-share-logo
Use guest css on sharing authentication page
2018-01-03 14:18:17 +01:00
Morris Jobke b4a473869e Add margin around inline links
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-03 14:09:10 +01:00
John Molakvoæ (skjnldsv) d190754e2b Fix am-pm
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 14:02:45 +01:00
John Molakvoæ (skjnldsv) bcad10075e Share datepicker fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 14:02:45 +01:00
John Molakvoæ (skjnldsv) fe43330e73 Datepicker design fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 14:02:45 +01:00
Morris Jobke fa34b53b50 Merge pull request #7668 from nextcloud/fix-popover-menu-not-closing-in-user-settings
Fix popover menu not closing in user settings
2018-01-03 14:02:14 +01:00
John Molakvoæ (skjnldsv) 51eb26e183 Fix unwanted var
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 14:01:47 +01:00
John Molakvoæ (skjnldsv) c4490c6ba8 Update quotas on each upload
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 13:59:36 +01:00
Arthur Schiwon 4f3d52a364 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-03 13:25:00 +01:00
Arthur Schiwon 2fde21e318 extend tests for status quo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:24:56 +01:00
Arthur Schiwon 282567fced format links in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:11:20 +01:00
Roeland Jago Douma a8ab67ff48 Merge pull request #7676 from nextcloud/fix-slash-in-filename
Show warning if slash is entered as filename
2018-01-03 13:07:26 +01:00
Julius Härtl aed7052a38 Use guest css on sharing authentication page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 12:03:26 +01:00
Morris Jobke 0b4d18673e Do not log user errors as log level 4
* hides log entries for the case the parent folder does not exist

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-03 11:58:55 +01:00
blizzz 02b092f358 Merge pull request #7487 from nextcloud/no-password-confirm-with-sso
disable password confirmation with SSO
2018-01-03 11:48:45 +01:00
Morris Jobke 31c0efc299 Show warning if slash is entered as filename
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-03 11:42:49 +01:00
Roeland Jago Douma 86d33cf50f Merge pull request #7670 from nextcloud/fix-logo-url
Fix logo URL in SCSS variables
2018-01-03 10:08:34 +01:00
Julius Härtl c7fbf4dfb1 Fix logo URL in SCSS variables
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-03 09:32:33 +01:00
Roeland Jago Douma f159d8d835 Merge pull request #7634 from Abijeet/bug-7539
Fixes the delete button not appearing on certain lower resolutions
2018-01-03 08:28:26 +01:00
Roeland Jago Douma db9b14733c Merge pull request #7665 from nextcloud/bugreport-from-customer
Note about enterprise users
2018-01-03 08:03:22 +01:00
Daniel Calviño Sánchez 160e1e1882 Close menu on "mouseup" instead of on "click" events in the document
"click" events are handled by several elements in user settings, and
some of them (like the edit icon in the user name) stop the propagation
of the event. Due to this the event never reaches the document and thus
the menu was not closed in those cases. "click" events are always
preceded by "mouseup" events (as "click" events are generated when
"mousedown" and "mouseup" events occur in the same element), so now the
menu is closed when a "mouseup" is received in the document.

The described problem would happen too if an element stopped the
propagation of the "mouseup" event; currently no element does that in
the user settings, so now the menu is always closed as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-03 06:24:51 +01:00
Daniel Calviño Sánchez 023e7c5594 Fix popover menu not closing in user settings
A popover menu is displayed when its element has the "open" CSS class.
That class is added when clicking on the menu toggle, but it was removed
only when clicking again on the toggle, so the popover menu in user
settings could be closed only by clicking again on the menu toggle. Now
the "open" CSS class is removed too when clicking on the body, either
directly or through event propagation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-03 05:13:56 +01:00
Daniel Calviño Sánchez c500b19762 Remove margin for selected files summary
The selected files summary shown in the multiselect header has a margin
to align it with the names of the files in the contents of the file
list. However, on very narrow screens, and depending on the verbosity of
the language, the summary can overlap with the actions when the
selection contains files and folders. To try to mitigate this, besides
showing only the icons for the actions, the summary margin is removed
too in very narrow screens.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-03 02:22:00 +01:00
Daniel Calviño Sánchez 64c0874a15 Increase touch area for header icons
On narrow screens only the action icons are shown in the multiselect
header of the file list. In that case the padding of those icons is
increased to provide a larger touch area (the padding used is the same
as in the inline actions of the file list).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-03 01:32:39 +01:00
Morris Jobke 4d0315ceae Merge pull request #7599 from nextcloud/quieter-debug-log
don't show recurring log msg when paged result was turned off
2018-01-03 00:40:46 +01:00
Morris Jobke 7be9b38e51 Merge pull request #7658 from nextcloud/update-external-storages-to-current-file-list-layout
Update "External storages" to current file list layout
2018-01-03 00:37:41 +01:00
Morris Jobke 9d43724d45 Merge pull request #7526 from nextcloud/make-possible-for-apps-to-disable-the-navigation-bar-slide-gesture
Make possible for apps to disable the navigation bar slide gesture
2018-01-03 00:12:54 +01:00
Abijeet 361aaf0c95 Fixes the delete icon not appearing on certain resolutions.
Fixes #7539

Also fixes overlap of text on mobile devices by resorting to just icons on lower resolutions.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-01-02 23:24:43 +01:00
Roeland Jago Douma 57050146f6 Move passwordconfirmation to its own midleware
Add tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 21:58:14 +01:00
Bjoern Schiessle 1bcbeb24bc disable password confirmation with SSO
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-02 20:30:37 +01:00
Roeland Jago Douma 7fdd9097bb Merge pull request #7663 from nextcloud/fix-file-list-visible-behind-the-multiselect-header
Fix file list visible behind the multiselect header
2018-01-02 19:58:17 +01:00
Roeland Jago Douma 194e955c88 Merge pull request #7662 from nextcloud/ldap-shutdown
throw ServerNotAvailableException when LDAP is caught shutting down
2018-01-02 19:57:11 +01:00
Morris Jobke 588b0085dd Merge pull request #7598 from nextcloud/fix-closing-menu-on-second-click-in-sharing-page
Fix closing menu on second click in sharing page
2018-01-02 15:11:30 +01:00
Morris Jobke d97341d986 Merge pull request #7660 from nextcloud/fix-7646
Also log exception for failed appstore request
2018-01-02 15:05:33 +01:00
Morris Jobke aac9a1c41a Merge pull request #7631 from nextcloud/fix-scss-webroot-and-url-rewrite
Fix scss webroot and url rewrite
2018-01-02 15:03:07 +01:00
Jos Poortvliet 275ec2b9ba Note about enterprise users
It is sometimes annoying to have users come here and complain about wrong priorities, especially when they are clearly running a (large) corporate instance. They should either contribute themselves or get a support contract...
2018-01-02 14:44:19 +01:00
Daniel Calviño Sánchez 0b494b1f20 Fix file list visible behind the multiselect header
Some parts of the file list contents (file name and actions) had a
higher z-index than the file list multiselect header. That header is
fixed in place, so when the file list contents were scrolled and those
parts with a higher z-index overlapped the multiselect header they were
fully visible. Now the z-index for the multiselect header has a higher
value (the same used in the controls bar) to ensure that the contents
are shown behind the header.

Fixes #7540

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-02 14:05:15 +01:00
Arthur Schiwon c8851e24a8 throw ServerNotAvailableException when LDAP is caught shutting down
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-02 12:20:44 +01:00
Morris Jobke 99175c32e5 Merge pull request #7583 from nextcloud/comradekingu-patch-1
Spelling: No ...., upgrades and email.
2018-01-02 11:44:39 +01:00
Morris Jobke 37ed5b5523 Merge pull request #7590 from nextcloud/flow-hide-stay-logged-in
Hide stay logged in checkbox when flow authentication is used
2018-01-02 11:27:14 +01:00
Roeland Jago Douma 9e49b6e2bb Merge pull request #7659 from nextcloud/fix_7657
Get correct translations for SecurityProvider
2018-01-02 11:14:39 +01:00
Roeland Jago Douma 75d4f0bcda Merge pull request #7644 from nextcloud/fix_7184
Do not run SyncJob in cron
2018-01-02 11:12:14 +01:00
Roeland Jago Douma d9419f333b Merge pull request #7648 from nextcloud/fix_7414
Show max warning comment lenth again
2018-01-02 11:11:38 +01:00
Roeland Jago Douma 4c0c3c0bef Show max warning comment lenth again
Fixes #7414

Since we no longer use an input field we have to use text instead of
val.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 10:28:09 +01:00
Morris Jobke fa2fe34b7a Merge pull request #7624 from nextcloud/fix-fileActions-currentFile-not-set-before-using-it
Fix "fileActions.currentFile" not set before using it
2018-01-02 10:28:04 +01:00
Roeland Jago Douma 0585b776fb 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-02 10:00:01 +01:00
Roeland Jago Douma f801dc8a6d Fix mail attribute
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 09:47:54 +01:00
Allan Nordhøy e037bae7ad Spelling: No ...., upgrades and email. 2018-01-02 09:47:54 +01:00
Roeland Jago Douma d628341649 Get correct translations for SecurityProvider
Fixes #7657

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 09:46:53 +01:00
Morris Jobke c5f852d90c Also log exception for failed appstore request
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-02 09:40:03 +01:00
Roeland Jago Douma a2a4a5596d Merge pull request #7646 from nextcloud/no_exction_logging_appstore_timeout
Don't spam the log when we could not properly connect to the appstore
2018-01-02 09:29:38 +01:00
John Molakvoæ (skjnldsv) c0c4443ffc Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) b71c9205ef Correctly remove temp test directory tree
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) 02bfc867ef 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>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) 88b72fd027 Fixup! getWebdir return
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv) dc938628f7 Use OC_Util function for app web path
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) ad20af619f getWebDir function
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) 89ca9cb35c Fixed webroot for scss files
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv) fb6c5cc416 Fixed scss url rewriting
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:43 +01:00
Roeland Jago Douma 752055220f Don't spam the log when we could not properly connect to the appstore
If we can't connect to the appstore for some reason we don't have to log
the exception just an info entry is enough.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-29 15:55:05 +01:00
Roeland Jago Douma ea858fcb55 Merge pull request #7626 from nextcloud/fixed-files-multiselect-top-margin
Fixed top position of multiselected files table
2017-12-28 11:22:44 +01:00
Julius Härtl f5f6ed664d Hide stay logged in checkbox when flow authentication is used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-28 11:15:26 +01:00
Roeland Jago Douma 08cbfb6c6b Merge pull request #7592 from nextcloud/update-quota-on-files-upload
Update quota on files upload
2017-12-28 10:53:14 +01:00
Roeland Jago Douma 46958e4c3f Merge pull request #7608 from nextcloud/pimp_timestampformatter
Fixes for TimestampFormatter
2017-12-28 10:51:41 +01:00
Daniel Calviño Sánchez 11125164be Disable selection in "External storages" file list
When the checkbox was moved to where the favourite icon was shown before
the layout of the file list was modified. The checkbox is no longer a
descendant of the ".filename" element, so it is no longer removed by the
"External storages" file list.

However, even before the checkbox was moved, explicitly removing it was
not the best approach, as file list rows could still be selected using
"Ctrl/Shift+click". This did not provide much value, as the selection
header has no actions; it simply states the number of selected elements.
The proper way to disable the selection is by setting "_allowSelection"
to false in the file list instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-27 16:31:22 +01:00
Daniel Calviño Sánchez 78891ac320 Fix selectors for file list elements
When the checkbox was moved to where the favourite icon was shown before
the layout of the file list was modified. The first column is no longer
the file name, so neither the thumbnail nor the name link were found.
Due to this the thumbnail was not set to the appropriate icon, and the
dummy event handler was not removed from the name link, so clicks on the
name were basically ignored. Now the selectors are based on the
".filename" CSS class instead of relying on the column position.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-27 16:17:00 +01:00
John Molakvoæ (skjnldsv) 84c961919b Fixed top position of multiselected files table
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-26 17:22:18 +01:00
John Molakvoæ (skjnldsv) c8db1ed741 Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-26 16:37:34 +01:00
Daniel Calviño Sánchez ea40ade8ad Fix "fileActions.currentFile" not set before using it
When an empty area of a file row was clicked and the "Details" action
was executed "fileActions.currentFile" was not guaranteed to be set to
the appropriate object (it depended on the previous actions of the
user), so when it was used by "getCurrentMimeType()" and other
FileActions functions they may not work as expected. Now it is
explicitly set to the appropriate value before its use.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-26 04:56:25 +01:00
Roeland Jago Douma 735b9fb81a Fixup code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-22 13:08:00 +01:00
Morris Jobke e37fa60784 Merge pull request #7591 from nextcloud/trigger-events-before-and-after-a-file-action-is-executed
Trigger events before and after a file action is executed
2017-12-22 12:31:55 +01:00
Roeland Jago Douma e40d6f6d8c Merge pull request #7597 from nextcloud/fix-anchor-change-when-clicking-on-sharing-page-menu
Fix anchor change when clicking on sharing page menu
2017-12-22 12:28:27 +01:00
Roeland Jago Douma 1477b971b2 Merge pull request #7605 from nextcloud/wait-for-the-shared-link-to-be-set-in-the-acceptance-tests
Wait for the shared link to be set in the acceptance tests
2017-12-22 10:35:27 +01:00
Daniel Calviño Sánchez e24a1c51e8 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>
2017-12-22 09:13:47 +01:00
Daniel Calviño Sánchez 8916735dd3 Add missing timeout multiplier
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-22 09:13:47 +01:00
John Molakvoæ d0e7b0d8c3 Merge pull request #7478 from nextcloud/breadcrumbs-buttons-fixes-gallery
Fixed breadcrumbs calculation and actions flow
2017-12-22 09:11:16 +01:00
Daniel Calviño Sánchez 37238725d6 Fix typo in callback name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-22 08:57:50 +01:00
John Molakvoæ (skjnldsv) 8cc90ab4de Fixed breadcrumbs tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-21 16:22:54 +01:00
Arthur Schiwon 82fd09c294 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>
2017-12-21 14:29:56 +01:00
Daniel Calviño Sánchez eb256b3ed5 Fix anchor change when clicking on sharing page menu
The share menu toggle and some share menu items included an 'href="#"'
attribute, so they were handled as internal links by the browser, which
changed the current anchor when they were clicked. However, there was no
real need to change the anchor in those cases, and it could interfere
with other apps (for example, the PDF viewer sets the current anchor to
"#pdfviewer" when it is shown and it hides itself when that anchor is
modified). According to the HTML 5 spec the "href" attribute is not
mandatory for "a" elements, so they were removed.

Other options would have been to change the elements from "a" to "div"
or something like that, but that would have required changes to the CSS
rules too, or to prevent the default event handling for those elements
through JavaScript, which would have been a workaround instead of the
proper solution.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-21 14:19:29 +01:00
Daniel Calviño Sánchez 372e7acfaf Fix closing menu on second click in sharing page
When a "mouseup" event was triggered on any element except on the share
menu or its descendants the share menu was closed. The share menu toggle
is not a descendant of the share menu, so clicking on it when the share
menu was shown closed it by removing its "open" CSS class. However, once
that happened the click event was then handled by the share menu toggle,
which toggled the "open" CSS class in the share menu and thus added it
again. So, from the user point of view, nothing happened when clicking
on the share menu toggle if the share menu was open.

Now a "mouseup" event on the share menu toggle no longer closes the
share menu, and thus toggling the "open" CSS class when handling the
"click" event works as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-21 12:37:35 +01:00
John Molakvoæ (skjnldsv) 0cb45f681f Update quota on file upload and deletion
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-21 10:48:43 +01:00
Daniel Calviño Sánchez c059fbd409 Remove internal unused property
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-21 02:08:40 +01:00
Daniel Calviño Sánchez 96ed73343e Trigger the "Details" action when clicking on an empty file row space
Clicking on an empty space in a file row causes the details view to be
shown. As it is a user initiated action on the file list now it is done
by triggering the Details action instead of directly calling
"_updateDetailsView"; the result is the same in both cases, but using
the action is more consistent (clicking on the file name triggers the
default action, and clicking on the inline actions triggers those
actions) and also makes possible to use the "beforeTriggerAction" and
"afterTriggerAction" listeners.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-21 00:36:40 +01:00
Morris Jobke 0b8a9fcaea Merge pull request #7572 from nextcloud/fix-box-shadow
Fix box shadow of header elements
2017-12-20 13:52:53 +01:00
John Molakvoæ (skjnldsv) 3105a2780b zindex fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-20 13:50:44 +01:00
Morris Jobke 0fef608927 Add the webkit sticky position prefix
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-20 13:48:09 +01:00
Morris Jobke 9e6f9564ec Properly show action icons
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-20 13:48:09 +01:00
Marin Treselj eebc70cf1e Make contorls stick to the top when scrolling
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-12-20 13:48:09 +01:00
Marin Treselj 228ca16bea Dynamic control bar width
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-12-20 13:48:09 +01:00
John Molakvoæ (skjnldsv) 7a9e65ceed Fixed breadcrumbs calculation and actions flow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-20 13:48:09 +01:00
Morris Jobke dc8809e754 Merge pull request #7498 from nextcloud/fix_7497
Better handle avatars
2017-12-20 12:38:05 +01:00
Morris Jobke f854831045 Fix box shadow of header elements
* unify shadow blur from 3px to 10px
* remove opacity of background of app labels
* for IE: use box-shadow as fallback (because the filter: drop-shadow is not supported)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-20 11:45:21 +01:00
Julius Härtl 0ff3c81fc1 Fix failing AvatarTest
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:27 +01:00
Roeland Jago Douma 325637f4f3 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:27 +01:00
Roeland Jago Douma 328047f638 Also do callback on the failing function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Julius Härtl 4c3eb80a91 Hide delete button if the avatar is a generated one
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:26 +01:00
Julius Härtl d497f79625 Fix fallback when image loading fails
With the new avatar endpoint there is no difference between unknown
users and errors when generating the placeholder avatar. Therefore the
avatar function will now show the old placeholder if both a user and
displayname was given as parameters.

In case there is no displayname provided we cannot build the proper
placeholder so the unknown user placeholder is shown.

The displayname is not required for the avatar anymore, so we can
get rid of the old code path for placeholders.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma 6b5e3a9365 Still call callback once avatar is loaded
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
John Molakvoæ (skjnldsv) a118817a69 Add loading icon on avatar
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma 0f235aec1f Update avatar on displayname change
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma a4ca92f29a Remove generated avatar on displayname change
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:26 +01:00
Roeland Jago Douma 6371b76598 Since we now always generate an avatar do not load the placeholder
The js and php code differ ever so slightly. So having the placeholder
for a second and then the image is just weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 18:49:25 +01:00
Daniel Calviño Sánchez 7760f16521 Trigger events before and after a file action is executed
In the same way that other elements can know when a FileAction is
registered or a default action is set this commit makes possible to be
notified before and after a FileAction is executed.

This is achieved by wrapping the registered action handler in a custom
function that notifies the listeners before and after executing the
handler itself. Due to this approach only FileActions registered through
"registerAction" trigger the events, although that is not a problem as
this is how the actions should be added to the FileActions anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-19 18:33:34 +01:00
blizzz b6fcf59881 Merge pull request #7576 from nextcloud/fix_7574
Use javascript to send the actual password reset
2017-12-19 18:05:14 +01:00
Roeland Jago Douma cfd116b5f9 Merge pull request #7566 from nextcloud/fix-opening-the-menu-in-a-share-page
Fix opening the menu in a share page
2017-12-19 14:41:42 +01:00
Roeland Jago Douma cdaf99cf58 Use javascript to send the actual password reset
Fixes #7574

During some refactoring the event linked to password reset got removed.
This ment that we just submitted a normal POST but without the CSRF
token. And none of the js magic to redirect afterwards.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-19 14:00:47 +01:00
Robin Appelman 34ced4dd97 add option to use legacy v2 auth with s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-19 11:54:55 +01:00
Roeland Jago Douma e550a3ddd8 Merge pull request #7562 from nextcloud/fix-wrongly-cached-result
Cache final result of update check
2017-12-19 10:12:33 +01:00
Daniel Calviño Sánchez 48b62a0eee Fix opening the menu in a Share page
".popovermenu" elements are visible or not depending on whether they
also have the "open" CSS class or not. "#header .menu" elements were
always hidden, so when both rules applied to the same element, like in
the menu of a Share page, the element was always hidden due to
"#header .menu" being more specific than ".popovermenu" and thus
overriding its rules. Now, "#header .menu" elements are hidden only if
they are not a ".popovermenu" too.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-19 06:58:58 +01:00
Daniel Calviño Sánchez 2ec181e084 Add acceptance test for opening the menu in a public shared link
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-19 06:55:47 +01:00
Morris Jobke b01d20c0d7 Merge pull request #7556 from nextcloud/smb-stat-exception
handle exceptions in SMB::stat
2017-12-18 22:31:05 +01:00
Roeland Jago Douma e294323df2 Merge pull request #7517 from nextcloud/add-index-to-share-table
Add index to share_with column in the share table
2017-12-18 22:23:53 +01:00
Roeland Jago Douma a84d11de7b Merge pull request #7531 from nextcloud/ldap/createdistributed
don't use deprecated method for requesting memcache
2017-12-18 22:08:32 +01:00
Morris Jobke 1beffa058a Cache final result of update check
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.

Fixes #7442

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 21:48:58 +01:00
Roeland Jago Douma 60297ed7e0 Merge pull request #7560 from nextcloud/fix_7309
Use injected AppManager
2017-12-18 21:26:22 +01:00
Bjoern Schiessle 21489d5f24 update autoloader
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:16:08 +01:00
Bjoern Schiessle 41ee23a054 make occ command more generic
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
Bjoern Schiessle de98581421 add index for share_with table for newly created tables
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
Bjoern Schiessle fda98ee917 add occ command to add a index to share_with at the share table
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-18 21:14:45 +01:00
Roeland Jago Douma 4ed12ff9c8 Merge pull request #7561 from nextcloud/fix_7548
Let DI handle the background job
2017-12-18 21:12:33 +01:00
Roeland Jago Douma 094d41937a Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:06:52 +01:00
Morris Jobke d2d73f1ce8 Also replace all other occurences
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 20:57:11 +01:00
Arthur Schiwon 5ce943aa85 don't use deprecated method for requesting memcache
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-18 20:57:11 +01:00
Roeland Jago Douma 0b7136940e Let DI handle the background job
Fixes #7548

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:42:06 +01:00
Roeland Jago Douma d6e74fe375 Use injected AppManager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 20:26:44 +01:00
Roeland Jago Douma cb5433062f Merge pull request #7553 from nextcloud/scssphp-0.7.2
Upgrade leafo/scssphp to 0.7.2
2017-12-18 19:37:26 +01:00
Robin Appelman 3fa13b48fc handle exceptions in SMB::stat
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 15:55:46 +01:00
Morris Jobke 913cb2b9c6 Merge pull request #7554 from nextcloud/fix-7546
Fix default parameter of OC_DB::executeAudited()
2017-12-18 15:24:11 +01:00
Robin Appelman bdf4111013 Merge pull request #7555 from nextcloud/smb-copy-rename-log
additional debug logging on smb copy/rename failures
2017-12-18 15:02:18 +01:00
Morris Jobke 3da92a9a78 Merge pull request #7490 from nextcloud/fix_7428
Respect sharing options when searching using MailPlugin #7428
2017-12-18 14:08:52 +01:00
Robin Appelman 4f0d03e172 additional debug logging on smb copy/rename failures
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-18 13:59:58 +01:00
Morris Jobke d19dcfd0eb Fix default parameter of OC_DB::executeAudited()
* fixes #7546

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:58:54 +01:00
Morris Jobke 97f80f5581 Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git
Do not update apps if it comes from git
2017-12-18 13:43:58 +01:00
Morris Jobke 8df6ad4631 Upgrade leafo/scssphp to 0.7.2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 13:41:28 +01:00
Tobia De Koninck e8a4f83000 Fix and tests for MailPlugin
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-16 08:46:03 +01:00
Tobia De Koninck 9d60f7fc64 Don't show users which e-mail address match if they belong to a group we may share with
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-15 19:09:46 +01:00
Vincent Petry ec8bf53356 Only set X-OC-Mtime when browser provided lastModified on upload
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-15 14:46:53 +01:00
Thomas Müller f39de4ab37 Transmit OC-Total-Length in browser as well
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-15 14:46:48 +01:00
Thomas Müller 74df27b7a7 Add integration tests for length header on new chunking
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-15 14:46:44 +01:00
Thomas Müller 8c5d656f3b Handle OC-Total-Length in new chunking
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-15 14:46:36 +01:00
Morris Jobke 19ffdecb4f Merge pull request #7527 from nextcloud/fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen
Fix drag shadow not visible when dragging a file on a narrow screen
2017-12-15 13:52:09 +01:00
Morris Jobke cfb3f44459 Merge pull request #7523 from nextcloud/check_empty_content_length
Also check for empty content length
2017-12-15 10:30:15 +01:00
Roeland Jago Douma ca70694502 Also check for empty content lenth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 21:48:59 +01:00
Daniel Calviño Sánchez de4028336a Force the drag to end when the navigation bar Snap is disabled by an app
When a Snap was disabled it stopped listening to the events, but if a
drag gesture was being performed it was kept as active. Thus, when the
Snap was enabled again move events were handled as if the Snap had never
been disabled, causing the gesture handling to continue where it was
left.

When the Snap for the navigation bar is disabled by an app it could be
as a result of a different gesture being recognized by the app (for
example, a vertical swipe) once both gestures have started. In that case
when the other gesture ends and the Snap is enabled again any pointer
movement will cause the navigation bar to slide until an "up" event is
triggered again (obviously not the desired behaviour).

Due to all this now when the Snap for the navigation bar is disabled by
an app the current drag gesture for the navigation bar is ended.

Note that this was added as a parameter to "Snap.disable()" instead of
done unconditionally to keep back-compatibility with the previous
behaviour (probably not really needed as it is unlikely that any app is
using the Snap library relying on that behaviour... but just in case).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-14 21:42:39 +01:00
Daniel Calviño Sánchez a5db0d2825 Make possible for apps to disallow the navigation bar slide gesture
On narrow screens a slide gesture can be used to open or close the
navigation bar. However that gesture could conflict at times with the
gestures used by certain apps (for example, if the right sidebar is open
the user may expect to close it by dragging it to the right, but that
could open the navigation bar instead depending on how the events are
handled). This commit makes possible for apps to disallow and allow
again that slide gesture.

In any case, note that applications can only disallow the gesture,
but they can not enable it. That is, they can prevent the gesture from
being used on narrow screens, but they can not make the gesture work on
wide screens; they are always limited by the base rules set by the core.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-14 21:41:22 +01:00
Daniel Calviño Sánchez 173f28a09d Add unit tests for the navigation bar slide gesture
The slide gesture is enabled or disabled depending on the width of the
browser window. In order to easily control that width the karma-viewport
plugin is now used in the unit tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-14 19:17:40 +01:00
Morris Jobke b19b137969 Merge pull request #7504 from nextcloud/shorter-css-prefixes
Reduce length of md5 in scss caching
2017-12-14 12:12:15 +01:00
John Molakvoæ (skjnldsv) 0c38c1b2db Fixed pinned state of quota if no apps registered an app nav item
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 12:06:28 +01:00
John Molakvoæ (skjnldsv) b8778b0d85 Test fixes 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:32:53 +01:00
John Molakvoæ (skjnldsv) 158f442f4f Test fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:28:59 +01:00
John Molakvoæ (skjnldsv) f2d5927ea3 Reduce length of md5 in scss caching
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:11:54 +01:00
Morris Jobke 1f108970c4 Merge pull request #7506 from nextcloud/fix-app-cache
Use cached app list
2017-12-14 10:45:09 +01:00
Roeland Jago Douma b5d9c3b972 Merge pull request #7502 from nextcloud/authorative_classmaps_for_apps
Use proper authorative-autoloader for app autoloaders
2017-12-14 10:01:20 +01:00
John Molakvoæ (skjnldsv) 2dbd5052ff Up check
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 10:00:34 +01:00
Morris Jobke 54c227b6c4 Use cached app list
Followup to #7264

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-14 09:56:53 +01:00
John Molakvoæ (skjnldsv) cca8744350 Do not update apps if it comes from git
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 09:50:31 +01:00
Roeland Jago Douma 49b095b78e Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 08:31:31 +01:00
Roeland Jago Douma ce12763ab7 Merge pull request #7485 from nextcloud/fix_7001
Also cache invalid DiscoveryService response
2017-12-14 07:47:13 +01:00
Daniel Calviño Sánchez 39c549fa27 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>
2017-12-14 04:05:49 +01:00
Morris Jobke 784d256103 Merge pull request #7480 from nextcloud/fix_7454
Check for FreeType functions required for avatars
2017-12-13 18:25:05 +01:00
Roeland Jago Douma ee20741526 Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-13 17:22:58 +01:00
Roeland Jago Douma 7618473a44 Add warning regarding freetype support
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-13 17:20:48 +01:00
Roeland Jago Douma 3b343e287f Also cache invalid DiscoveryService response
* Cache it for a day so we will retry eventually
* Cache the status.php response as well so we will try it once a day as
well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-13 15:50:53 +01:00
Morris Jobke 66391d65a6 Merge pull request #7475 from nextcloud/13beta3
13.0.0 beta3
2017-12-13 14:35:51 +01:00
Morris Jobke bc125add05 13.0.0 beta3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-13 13:41:05 +01:00
Morris Jobke a3120d428b Merge pull request #7479 from nextcloud/fix-7400
Fixes bin2hex() in LDAP
2017-12-13 13:37:08 +01:00
Morris Jobke defac0ff0d Fixes hex2bin() in LDAP
Untangles the two if-else clauses into a more readable format.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-13 11:57:49 +01:00
John Molakvoæ fc30e7a6c6 Merge pull request #7476 from nextcloud/fix-copy-share-link-design
Show tha copy share link button properly inline
2017-12-13 11:18:55 +01:00
Morris Jobke 5a95260bf3 Show tha copy share link button properly inline
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-13 10:32:13 +01:00
Roeland Jago Douma f55dd96c08 Merge pull request #7470 from nextcloud/guest-flex-fix
Fixed firefox guest header height
2017-12-12 21:49:29 +01:00
Roeland Jago Douma e17315954f Merge pull request #7472 from nextcloud/move-comment-user-displaynameresolver-to-server
The user displayNameResolver is specific to users, not the comments app
2017-12-12 21:48:12 +01:00
Arthur Schiwon 099a340bf5 The user displayNameResolver is specific to users, not the comments app
Other apps like spreed rely on it, and only can resolver per type can
be registered anyhow.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-12 17:36:31 +01:00
John Molakvoæ (skjnldsv) 21fbcba68d Removed unwanted and unused spacer
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-12 16:45:56 +01:00
John Molakvoæ (skjnldsv) 133cbd16e4 Fixed firefox guest header height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-12 16:10:32 +01:00
Morris Jobke 2943b54f98 Merge pull request #7466 from nextcloud/fix-php7.2-session-init
Fix error log on PHP 7.2
2017-12-12 15:45:25 +01:00
Morris Jobke 175e1a5442 Merge pull request #7465 from nextcloud/filename-typo
Fix filename typo
2017-12-12 15:12:20 +01:00
Björn Schießle acb395cade Merge pull request #7462 from nextcloud/update-user-agent-regex
allow 'Nextcloud' in the user agent string of Android
2017-12-12 14:37:46 +01:00
Morris Jobke b19fae2629 Fix error log on PHP 7.2
Fixes following error in the logs: "ini_set(): A session is active. You cannot change the session module's ini settings at this time"

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-12 14:33:30 +01:00
Robin Appelman 1066faa8ba Fix filename typo
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:18:49 +01:00
Bjoern Schiessle caff52decd fix dav unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 13:59:52 +01:00
Morris Jobke 14c83e415c Merge pull request #7425 from nextcloud/13.0.0beta2-prep
13.0.0 beta 2
2017-12-12 12:35:55 +01:00
Morris Jobke 7ad746ad70 Merge pull request #7461 from nextcloud/fix_6821
Set autocomplete on share password input
2017-12-12 12:32:16 +01:00
Bjoern Schiessle f0202245ee allow 'Nextcloud' in the user agent string of Android
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 12:16:01 +01:00
Roeland Jago Douma 45772473a9 Set autocomplete on share password input
Fixes #6821

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-12 11:33:12 +01:00
Morris Jobke c1517f4ac1 13.0.0 beta 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-12 11:27:38 +01:00
Morris Jobke 134bd51fe6 Merge pull request #6830 from nextcloud/nc13_no_later_72
Nextcloud 13 is not compatible with newer than php 7.2
2017-12-12 11:27:10 +01:00
Roeland Jago Douma b8af7ee9bc Nextcloud 13 is not compatible with newer than php 7.2
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>
2017-12-12 10:55:09 +01:00
blizzz 115e7e29cf Merge pull request #7458 from nextcloud/fix-calendar-manager-unit-tests
Fix unit tests for CalendarManager
2017-12-12 10:00:26 +01:00
Morris Jobke 1ceeab9229 Fix unit tests for CalendarManager
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-12 09:33:52 +01:00
Morris Jobke d98dea1eb1 Merge pull request #6884 from nextcloud/feature/3003/opt_out_of_birthday_calendar
Opt out of birthday calendar
2017-12-12 08:29:26 +01:00
Roeland Jago Douma e1740c9242 Merge pull request #7453 from nextcloud/txt_fopen_error
Properly detect if fopen fails for txt previews
2017-12-11 21:30:19 +01:00
Roeland Jago Douma 53400a1972 Properly detect if fopen fails for txt previews
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 20:37:18 +01:00
Roeland Jago Douma 179be8d95c Merge pull request #6637 from nextcloud/contactsstore_public_api
Make ContactsStore a public API
2017-12-11 20:04:28 +01:00
Roeland Jago Douma bd80795d59 Merge pull request #7431 from nextcloud/app-content-list-fixes
App content list fixes
2017-12-11 20:02:36 +01:00
Roeland Jago Douma f18ac08c20 Merge pull request #7450 from nextcloud/log_correct_self_signed
Catch the errors related to untrusted self signed certificates for federation
2017-12-11 19:15:31 +01:00
John Molakvoæ (skjnldsv) bb04e10651 Fixed width on app details
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 18:22:21 +01:00
Tobia De Koninck cecfc28ebd Register ContactsStore using alias + run autoloaderchecker.sh
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:19:24 +01:00
Tobia De Koninck 78049af02c Add @since annotation and add missing new line
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
Tobia De Koninck f6ef779f97 Make ContactsStore a public API
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-11 18:18:58 +01:00
Morris Jobke 45971879f5 Merge pull request #6668 from nextcloud/fix_6621
Remove avatar on user deletion
2017-12-11 18:16:14 +01:00
Roeland Jago Douma 2c2e1c4c7a Catch the errors related to untrusted self signed certificates for federation
* Added tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 18:14:01 +01:00
John Molakvoæ (skjnldsv) a1b4869774 Fixed scrolling in app list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 17:26:43 +01:00
John Molakvoæ (skjnldsv) d3c324cc9b Fixed popover menu in entry
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 17:26:43 +01:00
Morris Jobke ba3c608a00 Merge pull request #6590 from nextcloud/dav-create-activities-for-publishing
Create activities for (un)publishing calendar events
2017-12-11 17:13:11 +01:00
blizzz 4fc8984d89 Merge pull request #6079 from nextcloud/fix-antivirus
Parse Sabre Exception in OC.Files.Client and file-upload
2017-12-11 17:12:02 +01:00
Robin Appelman 05d2f61a59 handle not found mounts when cleaning avatars
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-11 16:56:10 +01:00
Morris Jobke d0ec0ce71c Merge pull request #6715 from go2sh/fix-freebusy
Fix the FreeBusy request handling for proper scheduling support
2017-12-11 16:51:15 +01:00
Roeland Jago Douma effde616eb Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:34:28 +01:00
Morris Jobke c76c7a96fc Update wording
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 16:28:40 +01:00
Thomas Citharel 4c32de22bb Create activities for (un)publishing calendar events
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-12-11 16:28:40 +01:00
Roeland Jago Douma 10aa287463 Remove avatar on user deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:07:06 +01:00
Roeland Jago Douma 949fc50cc5 Dispatch event on User predelete
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 16:05:38 +01:00
Georg Ehrke 728248bd8d updated autoloaders for dav
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Georg Ehrke 6802e2b59a Principal search: Take sharing settings into account
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Georg Ehrke f543039858 exclude shared calendars from freeBusy
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-12-11 16:04:55 +01:00
Christoph Seitz 787e3d51b4 Fix functions to search for principals in the backend.
Add a "searchPrincipals" function to the NC principal backend.
Fix the "findByUri" function to respect the prefixPath.

Signed-off-by: Christoph Seitz <christoph.seitz@posteo.de>
2017-12-11 16:04:55 +01:00
blizzz 80b27fdb93 Merge pull request #7342 from nextcloud/fix_carddav_converter
CardDAV convertor check should not be to wide
2017-12-11 16:03:07 +01:00
Morris Jobke 07e6387b31 Merge pull request #7449 from nextcloud/fix-setup
Fix 500 on setup page
2017-12-11 16:00:11 +01:00
Morris Jobke 5bc8c94a11 Merge pull request #7249 from nextcloud/guest-flex
Guest flex instead of absolute
2017-12-11 15:41:53 +01:00
Morris Jobke 7fdc4b5262 Merge pull request #7418 from nextcloud/ldap-fix-cache-retrieved-user
ensure that users are cached when they are retrieved
2017-12-11 15:39:24 +01:00
Roeland Jago Douma e8acf448eb Merge pull request #6651 from nextcloud/remote-cloud-client
Add api clients for talking to remote clouds
2017-12-11 15:28:39 +01:00
Roeland Jago Douma e47137c7d4 Merge pull request #6682 from nextcloud/dav-mimetype-fallback
Fallback to filename based detection if the remote dav server doesn't…
2017-12-11 15:28:05 +01:00
Roeland Jago Douma c1fcd6fc98 Merge pull request #7324 from nextcloud/no-sorters-no-instances
don't create sorter instances when none was requested
2017-12-11 15:27:44 +01:00
Morris Jobke 7c39711798 Merge pull request #7427 from nextcloud/fix-white-color-in-emails
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
Morris Jobke 5b20600da9 Merge pull request #7313 from nextcloud/ensure-that-x-oc-mtime-header-is-an-integer-with-chunked-uploads
Ensure that X-OC-MTime header is an integer with chunked uploads
2017-12-11 15:07:05 +01:00
Morris Jobke ce69d9ec71 Fix 500 on setup page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 15:03:55 +01:00
Morris Jobke f4d7afc950 Merge pull request #7244 from nextcloud/css-file-suffix-with-apps-versions
Use apps versions to generate suffix when possible
2017-12-11 14:51:21 +01:00
Morris Jobke cce4c285db Fix email buttons for white theme
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
Morris Jobke 52e7d05163 Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 1ac31260ac Fixed phpdoc and function type
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) f018bfc7de Fixed md5 generation and added fallback for scss requests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv) 820e7b5aba Use apps versions to generate suffix when possible
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-11 14:24:23 +01:00
Roeland Jago Douma 40633c5e54 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 11:58:02 +01:00
Nextcloud bot 8ed728c1a2 [tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot a684f033bd [tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Nextcloud bot 855acc727b [tx-robot] updated from transifex 2017-12-09 01:10:24 +00:00
Morris Jobke ed7beb929e Merge pull request #6876 from nextcloud/always_img_avatar
Always generate avatar
2017-12-08 23:58:17 +01:00
Morris Jobke 79ed0d105d Merge pull request #7426 from nextcloud/Abijeet-master
Allows adding of hex color to the theme-color
2017-12-08 23:49:52 +01:00
Morris Jobke 3f34861d58 Merge pull request #7433 from nextcloud/fix-constructor-spy-in-unit-test-with-sinon-4.1.3
Fix constructor spy in unit test with Sinon 4.1.3
2017-12-08 23:49:11 +01:00
Daniel Calviño Sánchez b70b38ce31 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-08 21:26:45 +01:00
blizzz 83509b0fd3 Merge pull request #7334 from nextcloud/feature/noid/language-depending-skeleton-directory
Allow `{lang}` as a placeholder in the skeleton directory
2017-12-08 18:19:01 +01:00
Robin Appelman 5ce69e7c42 Add some more tests for ocs remote api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman f1eb55fad7 refuse to use http if we know a remote has https
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 78a24e3b81 validate user response
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 8b01176f60 add more typehints
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 5133a31d3c Add public api for remote api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
Robin Appelman 74b5ce8fd4 Some tests for the remote cloud api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:34:33 +01:00
Robin Appelman ac2c26ffcb Add api clients for talking to remote clouds
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:34:33 +01:00
Morris Jobke 66f523e13f Better center the letter and use semibold font type
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 16:24:31 +01:00
Morris Jobke 6aac1ffa33 Merge pull request #7115 from nextcloud/fix-flow
Fix flow
2017-12-08 16:01:57 +01:00
Morris Jobke 4c19e75f5d Merge pull request #7390 from nextcloud/update-php-info
Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
2017-12-08 15:33:27 +01:00
Morris Jobke 5724e75827 Merge pull request #7252 from nextcloud/send-comment-on-enter
Submit comments with Enter and use Shift+Enter for new lines
2017-12-08 15:31:10 +01:00
Lukas Reschke bb8acc5824 Merge pull request #7321 from nextcloud/ldap-update-loginfilter
Update login filter when user filter was newly generated
2017-12-08 15:24:57 +01:00
Bjoern Schiessle 555fe7047f fix tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-08 13:29:33 +01:00
Morris Jobke 8ffd4428bb Fallback to "default" and check if directory exists
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 12:28:41 +01:00
Abijeet 81f34e224c Allows adding of hex color to the theme-color
Fixes #7158. Adds a # on the color if missing.

Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.

Since the input element now allows a hex code, changed values to hexcode.

In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.

Also changed the way we were determining whether the jscolor component had loaded.

Changed the control to use data-jscolor rather than defining opts in the class.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-08 10:42:41 +01:00
Morris Jobke ace96a406a Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-08 10:02:41 +01:00
Nextcloud bot ef2b0969dd [tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Arthur Schiwon 27f14eee26 don't cache user, if no internal user id was retrieved/assigned
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 22:47:32 +01:00
Arthur Schiwon 991190b994 ensure that users are cached when they are retrieved
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-07 17:49:33 +01:00
Daniel Calviño Sánchez 9b1f3b969e Fix Enter sending comment instead of adding autocomplete item to message
When the autocomplete popover is shown the At.js plugin listens on the
message input field for key down events, and when Enter is pressed it
adds the selected item to the message. However, as "_onTypeComment" also
handles key down events for the message input field, when Enter was
pressed the comment was submitted and At.js had no chance to add the
item before that happened. Now when Enter is pressed and the
autocomplete popover is shown the comment is not submitted, and thus
At.js adds the selected item to the message as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-07 15:38:46 +01:00
Nextcloud bot 7d529c081a [tx-robot] updated from transifex 2017-12-07 01:10:37 +00:00
Tobias Kaminsky 430f60db21 Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface
Handle encryption state in web interface
2017-12-06 16:19:17 +01:00
Morris Jobke c32cb6b4b7 Merge pull request #7385 from nextcloud/shared-delay-root
delay calculating the shared cache root until it's used
2017-12-06 15:14:48 +01:00
Lukas Reschke de8fefeb18 Merge pull request #7395 from nextcloud/remove-unused
Remove unused variables
2017-12-06 13:09:01 +01:00
Roeland Jago Douma 1287da8a38 Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_users
Check if the owner of a share exists
2017-12-06 09:13:53 +01:00
Roeland Jago Douma 6e45034745 Merge pull request #7351 from nextcloud/change-default-german-language
use formal version of German by default
2017-12-06 08:30:14 +01:00
Roeland Jago Douma cde58610b4 Merge pull request #7387 from nextcloud/swift-retry
add retry wrapper when reading files from swift
2017-12-06 08:28:20 +01:00
Nextcloud bot 9505c56447 [tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Morris Jobke a73f86912f Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-05 09:58:15 +01:00
John Molakvoæ cb951b42b2 Merge pull request #7391 from nextcloud/config-sample
Fix typos in config.sample.php
2017-12-05 07:29:30 +01:00
Nextcloud bot f25d55c972 [tx-robot] updated from transifex 2017-12-05 01:10:20 +00:00
Morris Jobke 041dc6b3e8 Fix typos in config.sample.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 23:13:23 +01:00
Morris Jobke 41c1f862f1 Merge pull request #7319 from nextcloud/remove-svg-shadows
Remove svg shadows
2017-12-04 22:40:07 +01:00
Morris Jobke a62cc27058 Fix syntax error
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 22:39:06 +01:00
Robin Appelman 046eb0c635 add retry wrapper when reading files from swift
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 16:34:53 +01:00
Roeland Jago Douma d2fe30d464 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:20 +01:00
Roeland Jago Douma c8a29ec942 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-04 15:23:11 +01:00
Robin Appelman c87d689253 delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:16:39 +01:00
Nextcloud bot 567757c793 [tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Roeland Jago Douma ca8d149e29 Merge pull request #7370 from nextcloud/fix-php-doc
Fix PHP doc for API docs
2017-12-03 20:18:01 +01:00
Morris Jobke 72bb7c3074 Fix PHP doc for API docs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-03 12:02:29 +01:00
Nextcloud bot bd1e357eef [tx-robot] updated from transifex 2017-12-03 01:10:22 +00:00
Nextcloud bot cec236f0af [tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Bjoern Schiessle 3578acb144 update documentation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-01 16:15:44 +01:00
Bjoern Schiessle 2c3d97cc8f check if $defaultLanguage is a valid string before we move on
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-01 16:14:51 +01:00
Morris Jobke dc10a31a4a Merge pull request #7361 from nextcloud/cheap-check-first
check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-01 12:28:56 +01:00
Morris Jobke 007fba6fd9 Merge pull request #7347 from nextcloud/fix-3245
Allow to skip data dir permission checks by config
2017-12-01 11:53:12 +01:00
Arthur Schiwon 65d7468bf3 check userExists later, saves lookups for appData_INSTANCEID userids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:47:56 +01:00
Nextcloud bot ffc627e18e [tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Daniel Calviño Sánchez c43f64d56b Add unit tests for posting comments with enter key
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:30:27 +01:00
Daniel Calviño Sánchez d03fcbca77 Set text only in the message div of the new comment form
When finding ".message" elements on "view.$el" the message area for the
new comment form and all the comments were matched. Now the selector was
restricted to match only the message area for the new comment form.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:29:19 +01:00
Marin Treselj 314bfeb6b8 Define icon-shadow only in context of icon-white
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-30 18:26:26 +01:00
Bjoern Schiessle 8b734347b1 use formal version of German if default_language is set to 'de_DE'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-30 17:29:08 +01:00
Joas Schilling 288f50bdc7 Merge pull request #7346 from nextcloud/fix-federation-scope-menu-l10n
Fix translation of federation scope menu
2017-11-30 12:29:16 +01:00
Arthur Schiwon 1b7dfd73af 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-11-30 11:16:00 +01:00
Morris Jobke 3b390ef430 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 11:13:16 +01:00
Nextcloud bot 49ec86a81f [tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Morris Jobke 87aa0723f8 Merge pull request #7343 from nextcloud/fix_exception_on_unreachable_server_take2
Actually set the status so we don't cause another exception
2017-11-29 21:13:55 +01:00
Roeland Jago Douma d24b6866b1 Actually set the status so we don't cause another exception
* And add tests so I don't mess up again

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 16:37:54 +01:00
Roeland Jago Douma a9eb0d4a40 Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server
Do not log Exception if a connection error occured
2017-11-29 16:03:23 +01:00
Roeland Jago Douma f03aa0480a Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
Fix silent conflicts due to merging #7256 after #7251
2017-11-29 15:38:24 +01:00
Roeland Jago Douma 8e8fe6b8eb Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma d5496dc435 Since we update the avatar in the sync service remove the generated file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma 03d9e7e963 Sinc we use AppData the regex is not needed anymore
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma ba648eecdf Move avatar code to Avatar Class
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma 604596ec16 Always generate avatar
Even if no avatar is set we should just generate the image. This to not
duplicate the code on all the clients. And only server images from the
avtar endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
Roeland Jago Douma 6097b74970 Merge pull request #7333 from nextcloud/mario-readme-patch
Update README.md
2017-11-29 14:19:09 +01:00
Roeland Jago Douma 79554a29e0 Do not log Exception if a connection error occured
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 13:06:32 +01:00
Joas Schilling 8e684f76e5 Allow {lang} as a placeholder in the skeleton directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-29 10:04:53 +01:00
Mario Đanić 3c0d6ccbed Update README.md
authentification is not a real word :)
2017-11-29 09:09:11 +01:00
Nextcloud bot 095eba0aa3 [tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00
blizzz 0597cca596 Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss
Only in case of $currentAccess the array uses the user id as index
2017-11-28 17:57:44 +01:00
Joas Schilling 80b34f5f7d 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:17:51 +01:00
Joas Schilling 2a01c0f3f6 Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:34 +01:00
Marin Treselj 54878d753a Revert removing of deprecated icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 14:30:02 +01:00
Arthur Schiwon 96bc03a03a don't create sorter instances when none was requested
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-28 13:30:51 +01:00
Arthur Schiwon cfd1e04588 Update login filter when user filter was newly generated
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-28 12:41:36 +01:00
Marin Treselj dd8bfe5d36 Remove deprecated white, shaded icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 10:59:22 +01:00
Marin Treselj 70953fa788 Add new .icon-white and .icon-shadow classes, add toggle-background icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 10:56:28 +01:00
Daniel Calviño Sánchez 0c45778219 Fix silent conflicts due to merging #7256 after #7251
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 02:35:39 +01:00
Nextcloud bot a0ce2c1204 [tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
Daniel Calviño Sánchez 2a7b1bae10 Reject X-OC-MTime header if given as a string with hexadecimal notation
In PHP 7.X hexadecimal notation support was removed from "is_numeric",
so "sanitizeMtime" directly rejected those values; in PHP 5.X, on the
other hand, "sanitizeMtime" returned 0 when a string with hexadecimal
notation was given (as it was the behaviour of "intval"). To provide a
consistent behaviour between PHP versions, and given that it does not
make much sense to send X-OC-MTime in hexadecimal notation, now
X-OC-MTime is always rejected if given as a string with hexadecimal
notation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 01:08:52 +01:00
Thomas Müller ffe034abb0 Don't use runInSeparateProcess
Directly calling "header" in the PHPUnit process causes the "Cannot
modify header information - headers already sent by" error to be thrown.
Instead of running the test in a separate process, which is slower, this
commit wraps the call to "header" in a method that can be mocked in the
tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:45 +01:00
Daniel Calviño Sánchez a5e4c2ea11 Add tests for X-OC-MTime header handling
This commit is based on the commits from pull request 28066 (included in
018d45cad97e0) from ownCloud by Artur Neumann and Phil Davis.

Unit tests are currently run only on systems that support negative
mtimes, so no special handling of negative values was included in the
tests to keep the test code more manageable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:45 +01:00
Daniel Calviño Sánchez 2af3d8a9b2 Make possible to provide a specific HTTP request object to File
This will be used in a following commit to test how the X-OC-MTime
header is handled.

This commit is based on the "make File::put() more testable" commit
(included in 018d45cad97e0) from ownCloud by Artur Neumann.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:39:41 +01:00
Daniel Calviño Sánchez 01e346b2ae Ensure that X-OC-MTime header is an integer also with chunked uploads
This commit extends the changes introduced in pull request #3793 also to
chunked uploads.

The "sanitizeMTime" method name is the same used in the equivalent pull
request to this one from ownCloud (28066).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 20:37:51 +01:00
Morris Jobke 7d9e475434 Merge pull request #7303 from nextcloud/fix-contact-menu
Fix contacts menu height for Safari
2017-11-27 18:30:06 +01:00
Morris Jobke 3f7267e0e9 Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error
catch errors when parsing calendar data for calendar query requests
2017-11-27 17:50:37 +01:00
Morris Jobke 3e1860e3d6 Merge pull request #7305 from nextcloud/log-level-for-log-extending
Pass log level to log reporters
2017-11-27 17:49:46 +01:00
Lukas Reschke 4d200851f9 Merge pull request #7292 from Neraste/fix/4789_disabled_users
Fix #4789: Group admins cannot see disabled users
2017-11-27 17:29:59 +01:00
Morris Jobke 573551253e Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken
Log InvalidSyncToken on DAV in debug level
2017-11-27 17:27:41 +01:00
Lukas Reschke 5cc8ea8feb Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav
Log NotImplementedException on DAV in debug level
2017-11-27 17:25:56 +01:00
Georg Ehrke ea117bac31 catch errors when parsing calendar data for calendar query requests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-27 17:14:18 +01:00
Morris Jobke 132764bff5 Pass log level to log reporters
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:46:47 +01:00
blizzz f700cd14fa Merge pull request #7222 from nextcloud/fix-filerow-avatars
Fix filerow avatars
2017-11-27 16:46:11 +01:00
Morris Jobke 4a63727ed9 Merge pull request #7210 from nextcloud/pg10
add postgresql 10 compatibility to dbal
2017-11-27 16:40:58 +01:00
Morris Jobke 88905c6293 Log InvalidSyncToken on DAV in debug level
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:37:11 +01:00
Morris Jobke 26a5fff423 Log NotImplementedException on DAV in debug level
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:17:01 +01:00
Lukas Reschke b331c67859 Bump thirdparty ref
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 15:20:42 +01:00
blizzz e428ef9d75 Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments
Fix cursor for avatar and user names in comments
2017-11-27 15:14:40 +01:00
Morris Jobke cfae590ac9 Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
Fix input field not disabled while a comment is being sent
2017-11-27 13:40:03 +01:00
Morris Jobke 152b2824dc Fix contacts menu height for Safari
* fixes #5119
* in Safari the input field was 38px in height and not 34px like in all other browsers

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 13:32:05 +01:00
Lukas Reschke e02229e412 Merge pull request #7246 from william-p/Add_html5_audioplayer_public
Add HTML5 audio player in public view
2017-11-27 12:32:21 +01:00
Morris Jobke 7bb42438fa Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment
Fix working icon position when sending or deleting a comment
2017-11-27 12:19:21 +01:00
Morris Jobke c5446ebd9a Merge pull request #7251 from nextcloud/contact-menu-position-fix
Fixed contact menu position on comments
2017-11-27 12:14:30 +01:00
Lukas Reschke fb1a92b07d Merge pull request #7295 from nextcloud/remove-unused-method
Remove unused mimetype detection method in OC_Image
2017-11-27 11:55:20 +01:00
Lukas Reschke d15ca9ffaf Replace with non-deprecated JS call
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
Lukas Reschke 8ccb486876 Merge pull request #7264 from nextcloud/cache-fetched-apps
Cache fetched apps in update check
2017-11-27 11:48:59 +01:00
Morris Jobke f0d809fdde Merge pull request #7298 from nextcloud/fix-wording
Fix a sentence in the README
2017-11-27 11:32:03 +01:00
Morris Jobke 4b73ddc9ce Merge pull request #6437 from nextcloud/support-mail-send-in-share
Add support for `\OCP\Share\IShare::getMailSend` back
2017-11-27 11:29:38 +01:00
Morris Jobke 7a88c34c2c Fix a sentence in the README
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 11:23:56 +01:00
Joas Schilling 3d7489cfd6 Merge pull request #7297 from nextcloud/fgsl-master
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12+ LDAP
2017-11-27 11:11:00 +01:00
Morris Jobke a51a8fbcaf Federation actually sends an email via Share 2.0
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 10:54:40 +01:00
Morris Jobke 1063b99406 Merge pull request #6356 from nextcloud/rename-ldap
Rename "LDAP" to "LDAP/AD-integration"
2017-11-27 10:31:11 +01:00
Roeland Jago Douma be1006b607 Merge pull request #7296 from nextcloud/increase-phan-checks
Harden phan checks to catch more errors
2017-11-27 10:14:06 +01:00
Marius Blüm 05039f1f71 Rename "LDAP" to "LDAP/AD-integration"
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-11-27 09:49:28 +01:00
Lukas Reschke 1c25919cf1 Proper handle null cases and default to true
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:38:39 +01:00
Lukas Reschke 56a2512581 Add support for \OCP\Share\IShare::getMailSend back
This adds back the support for `\OCP\Share\IShare::getMailSend`, one example is creating bulk shares via API which where previously blocking due to the share notification emails.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:38:39 +01:00
Lukas Reschke 9ac878b6cb Adjust tests for added lastCheck time
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:25:03 +01:00
Flávio Gomes da Silva Lisboa 5ca9a7d6bc Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:22:44 +01:00
Morris Jobke 655c0cb40d Merge pull request #7178 from nextcloud/comradekingu-patch-1
No "to equal to" "We" or "Our", properly
2017-11-27 09:19:29 +01:00
Morris Jobke 4af12dcab1 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:44 +01:00
Allan Nordhøy 011e05574f that has since been deleted, ID to node
You were mentioned in a group chat by a user that has since been deleted

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:39 +01:00
Allan Nordhøy 55cad46a21 No "to equal to" "We" or "Our", properly
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:37 +01:00
Morris Jobke c930f70b52 Harden phan checks to catch more errors
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 07:53:56 +01:00
Morris Jobke dbb034f903 Remove unused mimetype detection method in OC_Image
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 07:46:32 +01:00
Nextcloud bot 645fc993c2 [tx-robot] updated from transifex 2017-11-27 01:09:51 +00:00
Neraste 2622dda8c2 Fix #4789: Group admins cannot see disabled users 2017-11-27 00:16:54 +01:00
Daniel Calviño Sánchez ea4414f9bc Disable contacts menu for mentions to current user in comment messages
The contacts menu is not shown for avatars and user names in the author
row if they represent the current user. For consistency, and because the
contacts menu provides no value when shown for the current user, this
commit also disables the contacts menu for mentions to the current user.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:10:53 +01:00
Daniel Calviño Sánchez 8eb19a278c Disable contacts menu for mentioned users in comments being composed
The contacts menu does not provide too much value for users mentioned in
a message being composed, so it is now disabled in this case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:05:54 +01:00
Daniel Calviño Sánchez 107952ff00 Fix cursor for author row and avatars in comments
When it was on an author row the cursor was shown as a pointer, even if
clicking on the author row itself does nothing. On the other hand,
avatars used the default cursor, even if clicking on them either shows
the contacts menu (in the case of the author row, only when the avatar
is for a different user than the current one) or inserts a mention (for
avatars shown in the list of suggested mentions), depending on the case.

Now, the author row uses the default cursor, and avatars (and their
associated user name) use a pointer cursor if clicking on them will
trigger an action (either showing the contacts menu or inserting a
mention).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-26 23:56:03 +01:00
Morris Jobke df61d43529 Make isUpdateAvailable non-static
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:01:02 +01:00
Morris Jobke 0e2f00ec59 Get the Installer via DI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:00:57 +01:00
Morris Jobke a97a290fd5 Cache fetched apps in update check
The code tried to find the apps with updates and thus was called for every available app. This caused to get the full appstore content as often as apps are available. The appstore request itself was cached nevertheless in an appdata dir, but with an object storage this is still a lot of round trips to read this cached result. Thus the instantiated list is now cached in a static variable (because it's a static method call).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:00:56 +01:00
Nextcloud bot 63d98574e9 [tx-robot] updated from transifex 2017-11-25 01:09:56 +00:00
Daniel Calviño Sánchez 9bb2bb7870 Show delete working icon at the same position as the delete icon
When a comment was being deleted the submit working icon was shown. Now
the submit working icon is kept hidden in that case and a specific
delete working icon, which is shown at the same position as the delete
icon, is used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:31:37 +01:00
Daniel Calviño Sánchez 6e9c0b9085 Show submit working icon at the same position as the submit confirm icon
The submit confirm icon is shown as the background image of an
absolutely positioned input element, so the CSS rules for the submit
working icon were modified to match those of the submit confirm icon.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:30:58 +01:00
Morris Jobke 892d2630fe Merge pull request #7275 from nextcloud/disable-elements-while-a-comment-is-being-deleted
Disable elements while a comment is being deleted
2017-11-24 16:14:53 +01:00
Lukas Reschke 14a6fbe809 Merge pull request #7271 from nextcloud/fix-menu-loading-position
Fix loading icon position in the app menu
2017-11-24 16:03:23 +01:00
Lukas Reschke ee4262f567 Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-success
Reset bruteforce attempt table on successful login
2017-11-24 15:53:08 +01:00
Arthur Schiwon 134192d76c fix sorting test on phantomjs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-24 15:33:26 +01:00
Morris Jobke 44adcad757 Merge pull request #7273 from nextcloud/remove-unused-code
Remove unused checkCode method
2017-11-24 15:08:29 +01:00
Morris Jobke 5a270c2715 Reset bruteforce attempt table on successful login
* only clear the entries that come from the same subnet, same action and same metadata

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:58:57 +01:00
Daniel Calviño Sánchez 5e6d4ad27c Disable elements while a comment is being deleted
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 13:17:55 +01:00
Morris Jobke 05abb9ea66 Remove unused checkCode method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 10:50:50 +01:00
Lukas Reschke 3a6d16e6d4 Merge pull request #7268 from nextcloud/update-crl
Update CRL due to files_frommail
2017-11-24 10:01:21 +01:00
Nextcloud bot dc1d13a18d [tx-robot] updated from transifex 2017-11-24 01:09:53 +00:00
Julius Härtl cd7aba3171 Fix loading icon position in the app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-23 21:15:05 +01:00
Morris Jobke 7a49270c64 Update CRL due to aboutconfig
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 18:37:23 +01:00
Morris Jobke eaafa72ae0 Update CRL due to files_frommail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 17:56:58 +01:00
Arthur Schiwon 5a9c99e6ac recycle SharedFileInfo values in fileInfo
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 17:51:56 +01:00
Daniel Calviño Sánchez b248c53c6a Make "contenteditable=false" divs look like disabled input fields
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 16:37:43 +01:00
Daniel Calviño Sánchez bbe00079cc Fix input field not disabled while a comment is being sent
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 14:34:09 +01:00
Arthur Schiwon b3b34c08d1 fix tooltips for good
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon f8b9ddc0ea apply tooltip to all avatars
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon 077381c7b3 rip out obsolete recipientsDisplayName
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon 9d95391ff1 adjust tests and apply sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon 3a1d8fa45f adjust, fix and extend tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon 4247936dd6 Fix avatars in file rows of incoming shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon dcfd7bf7ff fix avatars in file rows of outgoing shares
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:09 +01:00
Morris Jobke 2f3484ba88 Merge pull request #7260 from nextcloud/cleanup-unused-code
Use basename() instead of self implementation
2017-11-23 13:07:47 +01:00
Morris Jobke be4e921306 Use basename() instead of self implementation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
John Molakvoæ (skjnldsv) 5591ea6e8b Fixed alignment of items in comments
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
blizzz 98cdd9885f Merge pull request #7168 from nextcloud/fix-user-list
Fix accesslist when a user has an ID only containting 0-9
2017-11-23 12:17:11 +01:00
Morris Jobke 106d932e8f Merge pull request #7137 from nextcloud/shared-jailed-source-root
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
John Molakvoæ (skjnldsv) a936aea8a4 Fixed top
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 09:23:24 +01:00
Daniel Calviño Sánchez 60a73bab1c Submit comments with Enter and use Shift+Enter for new lines
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 03:27:16 +01:00
Daniel Calviño Sánchez 4eb9c0142d Fix contacts menu vertical position for comment authors
The contacts menu was being shown as "inline-block", which caused the
top of the menu to be aligned to the top of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 02:12:09 +01:00
John Molakvoæ (skjnldsv) c4e2fc2aa6 Fixed contact menu horizontal position
The arrow tip was 1px off from the avatar centre.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 02:10:05 +01:00
Nextcloud bot b6a39b7927 [tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
Jan-Christoph Borchardt 90c1d3e129 Merge pull request #7247 from nextcloud/give-audio-icons-shadow
Give audio-white and audio-off-white shadow via CSS
2017-11-22 18:07:06 +01:00
Robin Appelman 95d0b3d490 run postgresql 10 tests in drone
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
Robin Appelman da3004b8f5 add postgresql10 compatibility to dbal
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
William Pain beac223fa6 Add HTML5 audio player in public view
Signed-off-by: William Pain <pain.william@gmail.com>
2017-11-22 16:07:17 +01:00
John Molakvoæ (skjnldsv) 1c5a1906d6 Fixed heigh resize
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-22 15:40:25 +01:00
John Molakvoæ (skjnldsv) ec8c7d612d Use flex for guest full screen alignment
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-22 15:34:40 +01:00
Marin Treselj c5e51b34be Give audio-white and audio-off-white shadow via CSS
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-22 14:16:39 +01:00
Jan-Christoph Borchardt 968da5ef23 Merge pull request #7239 from nextcloud/larger-close-button
Make close icon fill more space
2017-11-22 14:00:57 +01:00
Nextcloud bot 3aaccc9a23 [tx-robot] updated from transifex 2017-11-22 01:10:09 +00:00
Marin Treselj bf68d6374b Less exaggerated size increase for close icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 16:07:43 +01:00
Marin Treselj 7f36c2090a Make close icon fill more space
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 15:33:23 +01:00
John Molakvoæ 399a965240 Merge pull request #7236 from nextcloud/remove-deprecated-icons
Remove unused, deprecated icons
2017-11-21 14:52:08 +01:00
Marin Treselj 2f4e036a15 Remove unused, deprecated icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 14:06:46 +01:00
Nextcloud bot a8ec62dcc2 [tx-robot] updated from transifex 2017-11-21 01:10:07 +00:00
Morris Jobke fe3f094127 Merge pull request #7230 from nextcloud/fix-autoload-section-failure
Remove wrong entry in admin_settings that causes 500
2017-11-20 22:14:20 +01:00
Bjoern Schiessle 7bc28f14de show e2e folder icon on encrypted folders
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 21:00:26 +01:00
Daniel Calviño Sánchez 37d8d3d858 Add data attribute to file list rows telling if the file is encrypted
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-20 21:00:04 +01:00
Morris Jobke 6fd51426bf Remove wrong entry in admin_settings that causes 500
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 20:49:03 +01:00
Bjoern Schiessle 670ac48eb7 adjust permissions in web view for encrypted folders
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 18:24:50 +01:00
Bjoern Schiessle fc456bec39 check for encryption state on propfind
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 18:24:46 +01:00
Morris Jobke c277800ba4 Merge pull request #7231 from nextcloud/fix-broken-svg-5
Re-optimize and clean up settings, social and logo icons #7209
2017-11-20 18:09:50 +01:00
Marin Treselj 0709f38ed8 Make user-related icons bigger.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-20 17:28:25 +01:00
Marin Treselj 8615ca8bd2 Re-optimize and clean up settings, social and logo icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-20 17:27:30 +01:00
Björn Schießle f347e2e4a6 Merge pull request #7047 from nextcloud/add-support-for-files-with-no-permissions
Add support for files with no permissions
2017-11-20 16:15:52 +01:00
Morris Jobke bca165805e Merge pull request #7195 from nextcloud/app-content-list
Add app content list
2017-11-20 14:41:11 +01:00
Jan-Christoph Borchardt a61015d647 Increase clickable area of actions to 44*44px
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-20 14:10:04 +01:00
Jan-Christoph Borchardt 5ea14192ee Move star to top right instead of top left, fix checkbox overlay
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-20 14:00:00 +01:00
Jan-Christoph Borchardt 1dd8746395 Reduce size of date in list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-20 13:57:49 +01:00
Morris Jobke 93e34fb61b Merge pull request #7211 from nextcloud/fix-5916
only replace permission popupmenu
2017-11-20 11:36:12 +01:00
Nextcloud bot 96b15cec83 [tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot dd5373795f [tx-robot] updated from transifex 2017-11-19 01:09:52 +00:00
Nextcloud bot 39ec541b23 [tx-robot] updated from transifex 2017-11-18 01:10:43 +00:00
Roeland Jago Douma 07af58df5f Merge pull request #7121 from nextcloud/fix_7119
If there is no internet connection don't try to contact appstore
2017-11-17 21:07:10 +01:00
Roeland Jago Douma 6bbda28881 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-17 20:41:58 +01:00
Roeland Jago Douma 2eb2b6e437 If there is no internet connection don't try to contact appstore
Fixes #7119

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-17 20:35:04 +01:00
Jan-Christoph Borchardt 059be95d6c Merge pull request #7163 from nextcloud/force-breaks-on-extremely-long-words-in-comments
Force breaks on extremely long words in comments
2017-11-17 19:02:36 +01:00
Arthur Schiwon a1d4ac6d43 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-17 17:08:29 +01:00
Daniel Calviño Sánchez 5d85af79b6 Force breaks on extremely long words
If not broken extremely long words overflow their container.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-17 15:10:50 +01:00
Björn Schießle 19e4a3373b Merge pull request #7206 from nextcloud/fix-object-storage-touch
touch opertation on object storage, don't create the file cache entry to early
2017-11-17 14:49:06 +01:00
Bjoern Schiessle 1ade6b0817 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:45:46 +01:00
John Molakvoæ (skjnldsv) 3d063e4dd0 Checkboxes and favourite fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-17 09:05:28 +01:00
Morris Jobke eeb0cfdaf5 Merge pull request #7152 from nextcloud/bugfix/noid/adjust_calendarobject_size_after_applying_class
remove cached size from shared calendar objects
2017-11-17 08:28:34 +01:00
Nextcloud bot 6c2c129fce [tx-robot] updated from transifex 2017-11-17 01:09:51 +00:00
Morris Jobke ba150e5721 Merge pull request #7199 from nextcloud/fix-style-of-reset-password-form
Adjust style of new password form to default
2017-11-16 22:04:51 +01:00
Morris Jobke d8296dcc8a Merge pull request #7167 from nextcloud/password-button-overflow
Fix reset password button overflow
2017-11-16 22:03:15 +01:00
Morris Jobke 369069687f Adjust style of new password form to default
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-16 21:18:15 +01:00
Morris Jobke 20868e17e8 Merge pull request #7193 from nextcloud/bugfix/noid/invitation-email-refinements
refine invitation email
2017-11-16 21:11:44 +01:00
Morris Jobke f32fbbca2e Merge pull request #6840 from nextcloud/feature/5282/calendar_api
Calendar API for apps
2017-11-16 21:10:35 +01:00
John Molakvoæ (skjnldsv) 627293adc2 Checkboxes and various design fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-16 19:18:57 +01:00
Morris Jobke 44b423be35 Merge pull request #7194 from nextcloud/fix-broken-svg-3
Re-optimize filetype and category icons
2017-11-16 16:37:05 +01:00
John Molakvoæ (skjnldsv) 67db42e99d Add app content list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-16 16:28:25 +01:00
Marin Treselj f37f265991 Re-optimize filetype and category icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-16 15:45:39 +01:00
Georg Ehrke b073b13d9f refine invitation email
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-16 13:54:19 +01:00
Morris Jobke dd83055198 Merge pull request #7188 from nextcloud/fix-broken-svg-2
Re-optimize places and files icons
2017-11-16 09:34:27 +01:00
Morris Jobke 3bc1646592 Merge pull request #7189 from nextcloud/security-games-icons
Added security and games icons
2017-11-16 09:04:55 +01:00
Marin Treselj f2a500a16f Clean up and re-optimize games icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-16 08:46:57 +01:00
Nextcloud bot b2e9cb6a00 [tx-robot] updated from transifex 2017-11-16 01:09:50 +00:00
John Molakvoæ (skjnldsv) 82d4169ea4 Added security and games icons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-15 16:47:23 +01:00
Marin Treselj 2d069339cc Re-optimize places and files icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-15 14:27:16 +01:00
Morris Jobke 7310c698de Merge pull request #7173 from nextcloud/bugfix/noid/show_username_in_invitationsemails
Show organizer's name in From field of invitation email
2017-11-15 14:25:45 +01:00
Jan-Christoph Borchardt 7a56189e6b Merge pull request #7177 from nextcloud/fix-black-transparent-dialogs
Fix linear gradient from black to white in dialogs in Safari
2017-11-15 12:08:01 +01:00
Nextcloud bot c5afb25714 [tx-robot] updated from transifex 2017-11-15 01:09:47 +00:00
Morris Jobke 6db51b1bfd Fix linear gradient from black to white in dialogs in Safari
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 23:56:18 +01:00
Morris Jobke 82502b10db Merge pull request #7169 from nextcloud/fix-user-search
Fix search in user managent when no group is selected
2017-11-14 23:30:02 +01:00
Morris Jobke 80e527d21e Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cleanup
check if the user still exists before we try to cleanup the previews
2017-11-14 23:29:28 +01:00
Lukas Reschke d906e16617 Merge pull request #7171 from nextcloud/bump-version
v13.0.0 Beta 1
2017-11-14 22:35:42 +01:00
Georg Ehrke 072652b2af show name of organizer in from name of invitation email
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-14 21:23:27 +01:00
Björn Schießle c225bbd021 Merge pull request #7113 from nextcloud/s3-download-stream-fix
Fix s3 download and touch
2017-11-14 20:38:50 +01:00
Bjoern Schiessle a923e755e6 check if the user still exists before we try to cleanup the previews
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-14 20:26:18 +01:00
Lukas Reschke 69e165dce4 v13.0.0 Beta 1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-14 19:34:37 +01:00
Morris Jobke a3f86b99e9 Merge pull request #7165 from nextcloud/smb-2.0.3
update icewind/smb to 2.0.3
2017-11-14 17:46:04 +01:00
Morris Jobke eb0f3ebf75 Fix search in user managent when no group is selected
* also allows to search by displayname

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 17:32:03 +01:00
Joas Schilling 3820d6883d Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-14 17:21:16 +01:00
Jan-Christoph Borchardt a3c13a13ba Fix reset password button overflow
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-14 16:04:14 +01:00
Jan-Christoph Borchardt 346dbfa1ee Merge pull request #7130 from nextcloud/fix-broken-svg
Optimize SVG icons
2017-11-14 15:51:09 +01:00
Jan-Christoph Borchardt 381967f35e Merge pull request #7013 from nextcloud/forgot-password
Directly show "Forgot password?" link, fix #6808
2017-11-14 15:32:27 +01:00
Morris Jobke 16549ae5fb Merge pull request #7166 from nextcloud/enhancement/crash-report-context
Pass the exception context to the crash reporter
2017-11-14 15:07:33 +01:00
Morris Jobke f6ef3b6464 add proper type hinting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-14 14:49:24 +01:00
Lukas Reschke 6d1d2dde0b Merge pull request #4856 from coderkun/issue-3808-xframe-deny
Improve warning for X-Frame-Options header DENY (#3808)
2017-11-14 14:30:14 +01:00
Christoph Wurst ad757805ca Pass the exception context to the crash reporter
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 14:28:04 +01:00
Robin Appelman 418e49d816 update icewind/smb to 2.0.3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-14 14:14:30 +01:00
blizzz a6d8948937 Merge pull request #5749 from nextcloud/ldap-primary-buttons
LDAP Wizard: primary-style buttons
2017-11-14 14:03:27 +01:00
Morris Jobke ab0a3fbbbc Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath
{J,CS}SResourceLocator: account for symlinks in app path
2017-11-14 13:58:02 +01:00
Morris Jobke 2a39ac043e Merge pull request #7164 from nextcloud/tooltip-placement
Fix tooltip placement in Shared files list
2017-11-14 13:46:01 +01:00
Lukas Reschke 48710a6e5a Merge pull request #7151 from nextcloud/feature/crash-reporter-registry
Add a mechanism to register crash reporters
2017-11-14 13:28:42 +01:00
Christoph Wurst 4c5593998a Add a mechanism to register crach reporters
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 12:20:05 +01:00
Jan-Christoph Borchardt 1c5586adab Fix tooltip placement in Shared files list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-14 11:55:44 +01:00
Marin Treselj a6197a2899 Fix settings-white icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-14 10:53:44 +01:00
Nextcloud bot 28e8a1c4b0 [tx-robot] updated from transifex 2017-11-14 01:09:46 +00:00
Arthur Schiwon f575060b93 add newline at the end of the ~~universe~~ file
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-13 16:39:09 +01:00
Julius Härtl 57eb046836 Use primary class also for ui-button elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 16:33:21 +01:00
Arthur Schiwon 5603d9a5ea hackishly add primary css class adaption for jquery ui
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-13 16:33:17 +01:00
Morris Jobke e23921c7b1 Merge pull request #7123 from nextcloud/external-storage-user-mount-checkbox
Fix "allow user mount" checkbox for external storage
2017-11-13 14:52:21 +01:00
Vincent Petry dfc91a253c Parse Sabre Exception in OC.Files.Client and file-upload
In case of error, instead of a generic error message, an upload will
display whichever message is returned in the Sabre Exception, if
applicable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-13 12:19:14 +01:00
Morris Jobke ff2d4432d8 Merge pull request #7051 from nextcloud/breadcrumbs-refactor
Breadcrumbs refactor
2017-11-13 12:19:05 +01:00
Morris Jobke 26bcf40e9e Merge pull request #6460 from nextcloud/theming-favicon-generated-sizes
Theming: Generate different favicon sizes
2017-11-13 12:15:34 +01:00
Joas Schilling ed37dc43bd Merge pull request #7154 from nextcloud/fix-typo
Fix typo in sample config
2017-11-13 11:48:31 +01:00
John Molakvoæ (skjnldsv) 8c2dbeb13a Added more tests and only test jsunit on drone (for testing only)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-13 10:51:31 +01:00
Marin Treselj 1bad132266 Actions icons fixed and re-optimized
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-13 10:27:13 +01:00
Julius Härtl 7a812aa0e1 Theming: bump version to retrigger icon generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl d70e9059a5 Theming: Fix tests for favicon containing multiple sizes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-13 10:18:48 +01:00
Julius Härtl 31b9fc9eac Theming: Generate favicon sizes to avoid resizing issues done by the browser
fixes #5193

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-11-13 10:18:47 +01:00
John Molakvoæ 8e61ad8847 Merge pull request #6678 from nextcloud/downstream-ldap-configurable-user-update
LDAP: configurable user update  interval
2017-11-13 08:14:52 +01:00
Morris Jobke 289d6801f4 Fix typo in sample config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-13 07:41:48 +01:00
Nextcloud bot f376659933 [tx-robot] updated from transifex 2017-11-13 01:10:11 +00:00
Georg Ehrke 19b77039d7 remove cached size from shared calendar objects
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-12 17:30:22 +01:00
Kyle Fazzari d2a2793073 JSResourceLocator: re-use $app_path
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-12 08:08:38 -08:00
John Molakvoæ (skjnldsv) b4f5b38713 Add menu tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-12 05:20:06 +01:00
Nextcloud bot 8e3861563b [tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Georg Ehrke 2b51d84b98 generate birthday calendars in a background job after admin enabled them
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 16:17:18 +01:00
Georg Ehrke a87d986041 create a user's birthday calendar right after they requested it
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 11:28:34 +01:00
Georg Ehrke 4d5ed1372a update autoloaders
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
Georg Ehrke ef6f41a16c respect admin / user choice about birthday calendars in corresponding hooks
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:57 +01:00
Georg Ehrke d59b3392ab disallow users to create calendars with reserved names
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
Georg Ehrke 1c106a66b1 adapt occ 'dav:sync-birthday-calendar command
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:56 +01:00
Georg Ehrke 5068d56fb0 add CalDAV interface that allows users to re-enable their birthday calendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-11 02:15:50 +01:00
Nextcloud bot 6ca4abfc0b [tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Georg Ehrke dc34622008 remember when a user deleted their contact birthdays calendar
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-10 23:05:04 +01:00
sidey79 d536e4e3b8 Fixed indentation
Fixed indentation of this pr

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 fbd8c5db4f Fixed typo from last commit
Fixed typo in getAppValue mocket method from last commit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:29 +01:00
sidey79 ea0ad82e56 Update testUpdateNoRefresh
Mocked getAppValue to deliver a value of 1800 when updateAttributesInterval  is requested by needsRefresh.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:08:15 +01:00
sidey79 45dfc11137 tryfix needsRefresh unit tests
Forced updateAttributesInterval from getAppValue to int

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 039f6c9636 Fixed Typo in user.php
Fixed a typo for the app config prameter updateAttributesInterval

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:41 +01:00
sidey79 0b290c0904 Update User.php
Makes the time between needsRefresh configurable via app config option updateAttribuesInterval.
Default is still 86400 secons which is one day.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-10 17:07:36 +01:00
Robin Appelman 56fd462718 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-10 17:03:27 +01:00
Marin Treselj 7914d8cf86 third batch of fixed and re-optimized icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-10 16:13:24 +01:00
blizzz 1a2f9fe678 Merge pull request #7056 from nextcloud/oc-28415-enable-chunking-in-authenticated-web-upload
[oc] Enable chunking for bigger files in authenticated web upload
2017-11-10 15:35:58 +01:00
Marin Treselj 4d5490c339 second batch of fixed and re-optimized icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-10 15:21:44 +01:00
Lukas Reschke d3e7dd1992 Merge pull request #7057 from nextcloud/ldap-sync-split
Bring LDAP user attribute updates ("sync") to the background
2017-11-10 15:02:26 +01:00
John Molakvoæ (skjnldsv) f40e56f0e6 Fix menu declaration and width calculation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-10 08:23:24 +01:00
Nextcloud bot ede6499de4 [tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
John Molakvoæ (skjnldsv) ebf131be84 Fixed firefox scrollbar
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 18:46:08 +01:00
Georg Ehrke 8b22bfea4f Add admin checkbox to disable birthday calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 17:12:06 +01:00
Georg Ehrke 7784672cc0 add option to filter CalendarAPI by componenttype
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke dd13aecc88 update dav autoloaders after adding calendar api
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke f06fc67e8e update autoloader to included added classes and interface
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke fa416e031b integrate Dav app with Calendar API
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:58 +01:00
Georg Ehrke 556b2a2b6f implement CalendarManager
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
Robin Appelman 0baa7ce911 Fix "allow user mount" checkbox for external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-09 14:49:21 +01:00
Georg Ehrke 5d206eec69 Public interfaces for calendar API
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 13:00:26 +01:00
Morris Jobke c7e5bc0f9a Merge pull request #7112 from nextcloud/theming-imagemagick-hint
Theming: add hint about favicon generation
2017-11-09 12:16:55 +01:00
Arthur Schiwon 419759e68b resolve DI
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 3ba8b337a4 fix unit tests after rebase
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:59 +01:00
Arthur Schiwon 8113f26eed add Sync test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon fc6b3902af adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:58 +01:00
Arthur Schiwon 59c05d5447 move LDAP user attributes "sync" to background (except for ajax jobs)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:56 +01:00
Julius Härtl 7dc9f6f40c Merge pull request #6736 from nextcloud/Dennis1993-patch-1
Move login page more to the top
2017-11-09 11:10:46 +01:00
Arthur Schiwon ef3cd32916 don't skip updating when ajax is set as background job mode
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:10:04 +01:00
Arthur Schiwon c6f1af9896 move ldap user sync to background (WIP)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-09 11:09:59 +01:00
John Molakvoæ (skjnldsv) 2a1e9ad046 Removed console log
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 11:04:30 +01:00
John Molakvoæ (skjnldsv) 521b8e813d Fixed header menus
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-09 10:58:51 +01:00
Nextcloud bot 723a25a315 [tx-robot] updated from transifex 2017-11-09 09:12:41 +00:00
Morris Jobke e6ad00b33d Merge pull request #7117 from nextcloud/fix-welcome-string
Fix welcome text for better grammar in themed instances
2017-11-09 10:03:59 +01:00
Morris Jobke 479966dce8 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:03:31 +01:00
Morris Jobke 5d8421135e Merge pull request #7014 from nextcloud/rename-locks
Unlock files even if an exception occurs while renaming
2017-11-09 09:47:36 +01:00
Morris Jobke e0aaca1726 Merge pull request #7046 from nextcloud/hide-summary-file-actions-when-selected-file-does-not-match
Hide summary file actions when a selected file does not match
2017-11-09 09:45:55 +01:00
Morris Jobke eab2b3b7ae Merge pull request #7027 from nextcloud/Rello-patch-1
Rello patch 1
2017-11-09 09:41:01 +01:00
Morris Jobke 6b3975c23a Merge pull request #6846 from nextcloud/filelist-confict-path
still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:33:59 +01:00
Morris Jobke a0aef6ab1b Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:27:38 +01:00
Lukas Reschke 2bfa1ce5c3 Merge pull request #5568 from nextcloud/ldap-agent-credentials-safe
Ldap agent credentials save
2017-11-09 09:26:51 +01:00
Nextcloud bot aa525d89e8 [tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Mario Danic c2cd5fc5d3 Fix flow
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-11-09 00:29:34 +01:00
Lukas Reschke 989a8a3668 Merge pull request #6220 from nextcloud/cached-mount-info-filepath
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
Lukas Reschke f9d8eb2a2e Merge pull request #7111 from nextcloud/login-button-ios-f
Fix login appearance for ios webkit engine
2017-11-09 00:00:07 +01:00
Morris Jobke e0784c66ed Merge pull request #7109 from nextcloud/fix_6898
If for some reason the json can't be decoded it is not cached
2017-11-08 23:33:02 +01:00
Julius Härtl b1b8c99193 Theming: add hint about favicon generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 23:31:18 +01:00
Kyle Fazzari 9c24b7be2d tests: change helper scope
This seems to be the only way to have the same helpers used between
tests in a manner that works for both standalone phpunit and
autotest.sh.

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-08 12:44:54 -08:00
John Molakvoæ (skjnldsv) 85355e98e6 Fixed tests and width calculation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 20:12:38 +01:00
John Molakvoæ (skjnldsv) aea30e0004 Scrutinizer fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:12:56 +01:00
John Molakvoæ (skjnldsv) 584272962a Improve drag & drop and fix some background issue if d&d on narrow windows
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 19:03:32 +01:00
Lukas Reschke 8c915baa34 Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
John Molakvoæ (skjnldsv) b001060556 Fixed remaining tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:11:33 +01:00
John Molakvoæ (skjnldsv) f25cb7d156 Menu hidden by default
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 18:05:01 +01:00
John Molakvoæ (skjnldsv) 694a96d938 Fixed some more test and loop fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 17:54:38 +01:00
Robin Appelman c566b2854b Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:51:02 +01:00
Robin Appelman 70a4860ccb Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-08 17:50:46 +01:00
Lukas Reschke d948626736 Merge pull request #7110 from nextcloud/fix-flow-redirect
Theming: theme flow redirection page
2017-11-08 17:45:38 +01:00
Morris Jobke 5651fdf10c Merge pull request #7107 from nextcloud/revert-6645
Revert "Only allow colons in db host for IPv6 addresses"
2017-11-08 17:06:01 +01:00
John Molakvoæ (skjnldsv) 41210c8cf1 Add droppable ability to menu and icon switch. Fix colour
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:56:58 +01:00
John Molakvoæ (skjnldsv) 267b673ccb Updated tests according to new system
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 16:04:10 +01:00
Julius Härtl cd1bfea8c4 Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 14:56:32 +01:00
John Molakvoæ (skjnldsv) 176ad7670f Fix to-be-shown algorithm
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 14:04:34 +01:00
John Molakvoæ (skjnldsv) ce391eeccb Scroll in popover: max 10 items shown and no flex shrink
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:39:39 +01:00
John Molakvoæ d44cbe3793 Fix login appearance for ios webkit engine 2017-11-08 13:27:07 +01:00
John Molakvoæ (skjnldsv) c6103dc9b7 Popover icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:10:30 +01:00
John Molakvoæ (skjnldsv) 2348d14e48 Moved too wide header menu selector to #header
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:40 +01:00
John Molakvoæ (skjnldsv) b9fbb67438 Design fix for icons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:40 +01:00
John Molakvoæ (skjnldsv) 77f6456dc7 Fix click error on oc-dialog breadcrumb
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:40 +01:00
John Molakvoæ (skjnldsv) 397e6af890 Fix filepicker
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 4fe7ec3870 fix multiple span next to last crumb link
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) e4b190d80d small bg colour fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 396154d7e4 Fixed click in menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 9d3af829f2 Fixed breadcrumb action feedback and optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 33bac270db Do not hide root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:39 +01:00
John Molakvoæ (skjnldsv) 03d074ebe8 Popover filling system updated
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 1786784d12 Popover init
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 6ee75e16af Fixed computation and removed unwanted scripts
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) 9616074f58 Fix controls width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ (skjnldsv) c80b824a46 Fix style and flex width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9bb28bab30 Flex to controls
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:38 +01:00
John Molakvoæ 9422e98151 Breadcrumbs hiding calculation
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2017-11-08 13:04:37 +01:00
Roeland Jago Douma 497cd7fa4e Merge pull request #7064 from nextcloud/popover-fix
Fix popover layout
2017-11-08 12:47:58 +01:00
Roeland Jago Douma 448fa4f59e 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-08 12:37:35 +01:00
Morris Jobke 732c951ae1 Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb3.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-08 10:47:35 +01:00
John Molakvoæ (skjnldsv) 15762c103b Fix acceptance test
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-08 09:19:33 +01:00
Nextcloud bot 79c9439c50 [tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Kyle Fazzari 06ba1a8a02 JSResourceLocator: account for symlinks in app path
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
Lukas Reschke b754a2e385 Merge pull request #7042 from nextcloud/bugfix/noid/ensure_unique_uid_for_calendar_objects
ensure uid for calendar objects is unique
2017-11-07 21:55:09 +01:00
Morris Jobke 0913bc2157 Merge pull request #6552 from nextcloud/notifications-add-highlight-definition
Notifications: Add highlight type definition
2017-11-07 20:34:05 +01:00
John Molakvoæ (skjnldsv) b44581e15d Fixed sharing popover and removed unused old code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 18:20:59 +01:00
Morris Jobke 19069f2b9c Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
Improve performance of UserMountCache with external storage folders
2017-11-07 17:32:06 +01:00
John Molakvoæ (skjnldsv) bce00d8b3d Reduce spread of css selector for a.action
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-07 16:32:20 +01:00
Roeland Jago Douma 469db9fbb9 Merge pull request #7073 from nextcloud/no-whitepage-of-death
Show proper error page even if the config.php has syntax errors
2017-11-07 16:28:06 +01:00
Roeland Jago Douma f55732a18f Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
2017-11-07 16:18:40 +01:00
Roeland Jago Douma 8566f8b8ee Merge pull request #7094 from nextcloud/theming-capabilities-element
Theming: expose element color though capabilities API
2017-11-07 16:12:51 +01:00
Robin Appelman 8eaf1956bb never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:01:56 +01:00
Robin Appelman 7ea06dacb1 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 14:46:29 +01:00
Morris Jobke aa789989bf Merge pull request #6926 from nextcloud/license-remove-invalid-mail
Remove invalid mail addresses when updating the license header
2017-11-07 13:49:00 +01:00
Morris Jobke 4866314ce0 Run updated license header updater
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
Paulo moura 37c60c20cc Properly center login page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:21:25 +01:00
Julius Härtl 00956c00b2 Theming: expose element color though capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 12:31:23 +01:00
Julius Härtl 7006b739b0 Remove brackets for invalid mail addresses when updating the license header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-07 10:50:42 +01:00
Morris Jobke 44f9779f9f Merge pull request #7059 from kyrofa/bugfix/5532/loading_indicator
core: hide spinner for initial install
2017-11-07 10:47:56 +01:00
Morris Jobke f9e70c2ab6 Merge pull request #7020 from Fiech/master
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
Nextcloud bot f9b7109de3 [tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke ebe75fb4ba Merge pull request #7087 from nextcloud/change-email-of-georg
Change georgehrke's email
2017-11-06 21:04:40 +01:00
Morris Jobke 271a2692bd Merge pull request #7066 from nextcloud/appmenu-fix
Fix header app menu
2017-11-06 21:03:46 +01:00
Morris Jobke 31c5c2a592 Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke da6c2c9da1 Merge pull request #7083 from nextcloud/update-license-headers
Update license headers
2017-11-06 18:48:04 +01:00
Morris Jobke 0eebff152a Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Morris Jobke 5ed05219d7 Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
2017-11-06 16:16:28 +01:00
Morris Jobke 5411d60b24 Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01:00
Marin Treselj f6769e2940 Fixes #4076 - first batch of fixed and re-optimized icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-06 15:51:14 +01:00
Roeland Jago Douma 0256f68c49 Merge pull request #7078 from nextcloud/jenkins-cleanup
Remove Jenkins variables from autotest.sh
2017-11-06 15:25:08 +01:00
Morris Jobke 6c29ce4e02 Merge pull request #6402 from nextcloud/dav-email-customization
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
Georg Ehrke 4df08f296b ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-06 14:25:08 +01:00
Jan-Christoph Borchardt 0abb9755b2 Merge pull request #7054 from nextcloud/timepicker-design
Improve timepicker design, align to datepicker
2017-11-06 12:45:06 +01:00
Jan-Christoph Borchardt 3e538443c5 Fix opacity of minutes in timepicker
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-06 12:44:17 +01:00
Morris Jobke a6666e397d Merge pull request #7077 from nextcloud/jshint-improvements
Reduce JSHint errors/warnings
2017-11-06 11:37:12 +01:00
Christoph Wurst d4f83d505a Merge pull request #7074 from nextcloud/use-proper-whitespace
Use proper whitespace
2017-11-06 10:27:09 +01:00
Morris Jobke 37c4534adb Remove Jenkins varibales from autotest.sh
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 10:08:58 +01:00
Morris Jobke d790c27a19 Reduce JSHint errors/warnings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:57:59 +01:00
Morris Jobke 8b763ea0f7 Better error message for invalid bucket names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:48:41 +01:00
Morris Jobke 5445b1ff17 Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
Morris Jobke c9f3b5a311 Use proper whitespace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:41:25 +01:00
Morris Jobke 68dbf94470 Show proper error page even if the config.php has syntax errors
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:36:19 +01:00
John Molakvoæ (skjnldsv) 4e6d828ae7 Bg variable for menu arrow
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-06 05:41:26 +01:00
Nextcloud bot 81ac1ec977 [tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
John Molakvoæ (skjnldsv) 8fea22314c Fix template order and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 18:14:52 +01:00
John Molakvoæ (skjnldsv) 91195b7cf2 Not disabled by default
Fixed transition bug of grouptop
Fix password submit and error handling
Fixed multiple form send
Fix submit loading state
fix login form sending state
Replace loader type

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 17:38:29 +01:00
John Molakvoæ (skjnldsv) 6347fe86c9 Fix loading state and error message display
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-05 05:47:34 +01:00
Nextcloud bot 2730a57580 [tx-robot] updated from transifex 2017-11-05 01:08:56 +00:00
John Molakvoæ (skjnldsv) baee457b8f Radio support too
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:47:54 +01:00
John Molakvoæ (skjnldsv) 22458465da Fix popover icon size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:36:45 +01:00
John Molakvoæ (skjnldsv) 66ef79178a Fix header app menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 15:20:03 +01:00
John Molakvoæ (skjnldsv) c152f80b93 Fix popover layout
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-04 13:12:18 +01:00
Kyle Fazzari b0d296639c CSSResourceLocator: 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-03 23:52:09 -07:00
Nextcloud bot 6fd99b4e47 [tx-robot] updated from transifex 2017-11-04 01:09:00 +00:00
Kyle Fazzari affdce72cc 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-03 13:54:56 -07:00
korelstar c7482402b8 Unlock files even if an exception occurs
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-03 18:29:04 +01:00
Vincent Petry cd8d13b9e6 Enable chunking for bigger files in authenticated web upload
This commit adds chunked uploads in the Web UI (for authenticated users,
but not for public uploads). To do that the server endpoint used by the
uploader is changed from WebDAV v1 to WebDAV v2. The chunking itself is
done automatically by the jQuery-File-Upload plugin when the
"maxChunkSize" parameter is set; in "fileuploadchunksend" the request is
adjusted to adapt the behaviour of the plugin to the one expected by
"uploads/" in WebDAV v2.

The chunk size to be used by the Web UI can be set in the
"max_chunk_size" parameter of the Files app configuration. By default it
is set to 10MiB.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-03 17:19:23 +01:00
Jan-Christoph Borchardt 153415c54b Add vertical separator between hours and minutes
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 16:26:13 +01:00
Jan-Christoph Borchardt 494dea2c60 Fix variable name
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 15:17:24 +01:00
Jan-Christoph Borchardt 9a8ecb2607 Merge pull request #6688 from nextcloud/more-variables
Add variable for border-radius and box-shadow
2017-11-03 15:10:19 +01:00
Jan-Christoph Borchardt b01e979d77 Improve timepicker design, align to datepicker
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 15:00:36 +01:00
Vinicius Cubas Brand fa565750d1 User_LDAP plugins: smaller fixes
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:42:59 -02:00
Vinicius Cubas Brand 10ca793452 Plugins infrastructure in User_LDAP
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:41:40 -02:00
Jan-Christoph Borchardt bd7d0de86f Add variable for border-radius
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 14:08:21 +01:00
Georg Ehrke e111da777a Make L10N->l provide weekdayName
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:04 +01:00
Georg Ehrke 43147aeada fancify invitation emails
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:03 +01:00
Joas Schilling 1bb048d11f Correctly use the email templating
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Joas Schilling b14b933062 Language depending dates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Joas Schilling cf04093fa6 Fix phpStorm complaints
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-03 11:20:03 +01:00
Leon Klingele c899f35261 DAV: Initial email customization support
Signed-Off-By: Leon Klingele <leon@struktur.de>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:19:39 +01:00
Jan-Christoph Borchardt 576d31d48d Merge pull request #7049 from nextcloud/fix-actions-menu
Fix opening the file actions menu in mobile
2017-11-03 11:11:01 +01:00
Jan-Christoph Borchardt 4ee2d2a1c2 Merge pull request #7048 from nextcloud/flexbox-css
Vendor prefix for flexbox not needed anymore
2017-11-03 11:10:25 +01:00
Morris Jobke 5e02cedef3 Fix opening the file actions menu in mobile
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-03 10:41:32 +01:00
Morris Jobke 9e9e5c2d16 Vendor prefix for flexbox not needed anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-03 10:30:42 +01:00
Nextcloud bot 7e1e9430b6 [tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Daniel Calviño Sánchez 3e844d3a59 Set read permission for files based on the data returned by the server
Now that the permissions returned by the server specify whether a file
is readable or not the frontend no longer needs to assume that every
file is readable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:01 +01:00
Daniel Calviño Sánchez ec375b3d86 Fix tests for parsing of permissions
Now that these tests are executed they are revealed to be partially
obsolete; they were fixed to match the current parsing behaviour.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:01 +01:00
Daniel Calviño Sánchez e2c755a4b5 Fix asserts silently not executed
The first parameter of "apply" must be the object to act as "this", and
the Promise callback gets the parameters provided in the "resolve".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:01 +01:00
Daniel Calviño Sánchez c047f32f25 Remove requeriment for read permission on some actions
The Details and the Favorite actions do not require any permission on
the files to be performed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:01 +01:00
Daniel Calviño Sánchez e6b74fac40 Add proper handling of files without permissions
Now a file gets its directory permissions only if it contained no
permissions (they were undefined or null), but not if its permissions
were set to "NONE".

Besides that, now file actions that do not require any permission on the
file to be performed can be used on files that have no permissions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:00 +01:00
Daniel Calviño Sánchez 555d582f35 Return whether the file is readable or not in the DAV permissions
Until now it was safe to assume that every file was readable by its
owner, so there was no need to return whether the file was readable or
not. However, with the introduction of end to end encryption that is no
longer the case, and it is now necessary to explicitly provide that
information.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 19:37:00 +01:00
John Molakvoæ 3091ddb043 Merge pull request #6652 from nextcloud/sharing-link-menu
Move sharing page options to menu in top right
2017-11-02 17:41:01 +01:00
Jan-Christoph Borchardt eebf19e2e6 Fix Scrutinizer issue
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 15:26:37 +01:00
Roeland Jago Douma 687c92bfd3 Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage
Fix seeking on object storage
2017-11-02 14:56:51 +01:00
Jan-Christoph Borchardt 4a3893b105 Merge pull request #6094 from nextcloud/sharedby-avatar
Show avatar instead of username for shared files
2017-11-02 14:51:17 +01:00
Roeland Jago Douma 2d901c2ed5 Merge pull request #7044 from nextcloud/settings-section-whitespace
Fix settings section whitespace
2017-11-02 14:50:15 +01:00
Arthur Schiwon 222d99fe96 adjust more js unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-02 13:51:08 +01:00
Arthur Schiwon 580d0956f6 use single quotes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-02 13:11:11 +01:00
Daniel Calviño Sánchez a9540fe990 Hide summary file actions when a selected file does not match
When several files are selected and one of them can not be deleted the
"Delete" file action is not shown in the summary. This commit extends
that behaviour too to the other file actions in the summary ("Move or
copy" and "Download"), so now an action is shown in the summary only if
it can be executed on all the currently selected files.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-02 12:47:57 +01:00
Jan-Christoph Borchardt 585e9f9fcd Add some JS to hide and show elements for password reset
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 12:04:35 +01:00
Jan-Christoph Borchardt aca29b0c88 Directly show Forgot password link, fix #6808
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 12:03:31 +01:00
Roeland Jago Douma 8ee765a617 Merge pull request #7041 from nextcloud/fix_6967
Add 204 endpoint
2017-11-02 11:25:58 +01:00
Jan-Christoph Borchardt 76a3c4dc92 Fix settings section whitespace
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-02 11:03:15 +01:00
Roeland Jago Douma a4ba4544de Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 10:30:41 +01:00
Roeland Jago Douma 6ce095b166 Add 204 endpoint
Fixes #6967

This allows clients to check for Walled Garden connections.
The endpoint just responds with a 204 (which is very unlikely with such
a connection)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 10:30:16 +01:00
Nextcloud bot 52a1760d4e [tx-robot] updated from transifex 2017-11-02 01:10:52 +00:00
Dariusz Olszewski 07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Roeland Jago Douma c2e82148e5 Merge pull request #7030 from nextcloud/proper_og_image
Use the new direct endpoint for the OpenGraph image
2017-11-01 21:00:05 +01:00
Roeland Jago Douma 9808dbd7e6 Merge pull request #7039 from nextcloud/fix_7038
Translate Grant Access
2017-11-01 20:47:54 +01:00
blizzz db48575d32 Merge pull request #6982 from nextcloud/autocomplete-gui
Comments AutoCompletion
2017-11-01 17:00:32 +01:00
Arthur Schiwon f1570c2c04 update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 16:30:20 +01:00
Roeland Jago Douma f2d4c64c9a Translate Grant Access
Fixes #7038

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-01 15:50:34 +01:00
Arthur Schiwon e2805f02aa Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Arthur Schiwon 3b2c9da7cc Adjust js tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 15:14:45 +01:00
Jan-Christoph Borchardt 52b679a2d6 Merge pull request #6667 from nextcloud/settings-heading
Adjust settings navigation headings to style used in Mail & Calendar
2017-11-01 14:53:49 +01:00
Jan-Christoph Borchardt 84b8cb12be Clicking publicly shared image opens direct preview url
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 14:49:52 +01:00
Jan-Christoph Borchardt 18dff925be Directly show link
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 14:17:34 +01:00
Jan-Christoph Borchardt bc47668206 Use standard way of showing and hiding popover menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 12:06:04 +01:00
Jan-Christoph Borchardt b3ccaf815d Fix scrollbar showing up on public page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 12:05:31 +01:00
Jan-Christoph Borchardt 116cb58c3c Show and hide menu via Javascript, thanks @skjnldsv
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt f2fadf677c Adjust prominence of shared-by info to not overpower file name
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 9f4cd52a97 Add label to download action
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 40a3b01838 Fix display of Download entry text
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 93d14dd315 Fix header text hiding completely or wrapping wrongly
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt 3d05540d36 Move shared page controls to menu in top right
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:52:58 +01:00
Arthur Schiwon 2b4b3b1986 adjust jsunit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 11:44:01 +01:00
Jan-Christoph Borchardt 9407f6c1d0 Fix test for tooltip and local share owner
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-01 11:41:22 +01:00
Joas Schilling ce12cd91db Merge pull request #6875 from nextcloud/app_autoloaders
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
Joas Schilling 3e0789aa94 Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage
Improve mimetype detection for object storages
2017-11-01 11:04:15 +01:00
Joas Schilling defc4bf6a8 Merge pull request #6975 from nextcloud/s3-read-object-fopen
use fopen directly when reading objects from s3
2017-11-01 10:57:56 +01:00
Joas Schilling 3d0eebf936 Merge pull request #7032 from nextcloud/address-icon
Add address icon
2017-11-01 10:37:02 +01:00
Nextcloud bot cc83052ca7 [tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Jan-Christoph Borchardt dcf1b17c4d Add address icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-31 21:37:13 +01:00
Roeland Jago Douma 2e443c97af Use the new direct endpoint for the og:image
Some providers had issues when using the preview link (since it was
double encoded).

Now we actually serve the max size preview so it looks better

The image isn't cropped anymore so supporting platforms can just embed
the whole image.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-31 21:00:36 +01:00
blizzz 22ef95ca69 Merge pull request #7022 from nextcloud/acceptance-tests-7.1
bump acceptance test suite to use php 7.1 image
2017-10-31 16:35:38 +01:00
blizzz b3ff9a2248 Merge pull request #6849 from nextcloud/fix-missing-translation-of-personal-calendar-in-activity
Fix missing translation of "Personal" calendar in activities
2017-10-31 15:05:26 +01:00
Arthur Schiwon 25aad121e6 meanwhile we can have exact matches. also show those.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:58:48 +01:00
Joas Schilling 6ddda3d7d4 Merge pull request #6952 from nextcloud/correctly-search-for-results
Correctly search for existing collaboration results
2017-10-31 14:49:01 +01:00
Arthur Schiwon 582d2d36ee fix avatar loading for generic placeholders
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:42:21 +01:00
Joas Schilling ba6e5bcc05 Add the return which is being used
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-31 14:06:21 +01:00
Arthur Schiwon d0f2f5f1de remove more vendor-imported files that aren't necessary
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:06:16 +01:00
Rello c5f76785ba Mapping of m3u, m3u8, pls to audio streams
Signed-Off-By: Rello <Rello@users.noreply.github.com>
2017-10-31 14:05:24 +01:00
Roeland Jago Douma bdf7f57890 Merge pull request #7026 from nextcloud/login-readability
Better readability for text on log in page which is directly on backgrounds
2017-10-31 14:02:24 +01:00
Joas Schilling a0dab90fd5 Merge pull request #7021 from nextcloud/fix-oracle-indexes
Fix oracle indexes
2017-10-31 13:55:14 +01:00
Arthur Schiwon bcfac75b06 simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 13:55:03 +01:00
Arthur Schiwon 4b24dea6c7 only ship minimized js files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 12:28:22 +01:00
Jan-Christoph Borchardt c432e16719 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 11:36:55 +01:00
Marin Treselj a57161f1e7 Restore 'Shared' text field for owner, since 'recipients' is still empty.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-10-31 11:35:21 +01:00
Marin Treselj f1d90adb09 Fix CSS, better handling of recipients
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-10-31 11:35:21 +01:00
Marin Treselj 2ff2d4f104 Fixed a11y; span instead of a div
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-10-31 11:35:21 +01:00
Jan-Christoph Borchardt 9998700e7c Show avatar instead of username for shared files
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-31 11:35:19 +01:00
Arthur Schiwon 5a7ed332de ignore local dependencies of acceptance tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 11:08:38 +01:00
Arthur Schiwon 5b4df0f320 bump acceptance test suite to use php 7.1 image
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 10:38:54 +01:00
Joas Schilling 8ce5adcf70 Merge pull request #6903 from nextcloud/feature/679/remove_valarms_from_read_only_shared_calendars
remove reminders from read-only shared calendars
2017-10-31 09:50:46 +01:00
Nextcloud bot 299ef9aa78 [tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Johannes S 936486413d Merge branch 'master' into master 2017-10-31 01:34:46 +01:00
Johannes Schlichenmaier 84cc13f57b Extended list of sensitive configuration values
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-31 01:30:50 +01:00
Roeland Jago Douma c258cb5557 Merge pull request #7016 from nextcloud/fix_6820
Do not error when downloading from a numeric public subfolder
2017-10-30 21:29:04 +01:00
Roeland Jago Douma 638be96232 Do not error when downloading from a numeric public subfolder
Fixes #6820

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-30 21:06:35 +01:00
Roeland Jago Douma 5672f14fd1 Merge pull request #7004 from Fiech/master
Extended list of sensitive configuration values
2017-10-30 20:01:42 +01:00
Jan-Christoph Borchardt fcb9c034fa Merge pull request #7012 from nextcloud/show-favourite-action-as-the-first-one
Show favourite action as the first one in the file actions menu
2017-10-30 19:01:22 +01:00
Joas Schilling 218e2357c8 Rebuild autoloader
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-30 18:59:52 +01:00
Victor Dubiniuk 9f16468789 Die NoCheckMigrator 2017-10-30 18:59:24 +01:00
Piotr Mrowczynski 6a51c1bc4f Add foreign key support to OC 2017-10-30 18:57:19 +01:00
Jörn Friedrich Dreyer d081a1a5ad quote index columns on oracle, handle all index changes, minor phpdoc cleanup 2017-10-30 18:54:31 +01:00
Georg Ehrke c8323f822d Merge pull request #6867 from nextcloud/imessage-attachments
Add attachment support to emails
2017-10-30 18:33:50 +01:00
Jan-Christoph Borchardt 446a3d2f21 Reverse favorite icon coloring in files action menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-30 18:17:59 +01:00
Roeland Jago Douma 73aef992c6 Merge pull request #6932 from nextcloud/constants-for-talk-useragents
Define constants for the talk user agents
2017-10-30 17:57:28 +01:00
Roeland Jago Douma 062aadba06 Merge pull request #6981 from nextcloud/unit-tests-for-6977
Unit tests for #6977
2017-10-30 17:53:02 +01:00
Daniel Calviño Sánchez 9df618131b Show favourite action as the first one in the file actions menu
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-30 17:09:15 +01:00
Morris Jobke d18a60de39 Merge pull request #6992 from nextcloud/2-lines-for-better-code
Use ::class and fix missing doc
2017-10-30 16:18:28 +01:00
Arthur Schiwon d5f1cef642 fix comment sorter
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 15:59:43 +01:00
Arthur Schiwon 61db8615f4 preserve line breaks
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 11:10:04 +01:00
Morris Jobke 42a14ad4cd Merge pull request #6976 from nextcloud/fix-checkbox-in-popover
Fix checkboxes on popover
2017-10-30 09:45:03 +01:00
Nextcloud bot 5521937dc4 [tx-robot] updated from transifex 2017-10-30 01:08:34 +00:00
Johannes Schlichenmaier bde78decc2 Extended list of sensitive configuration values
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-29 23:46:59 +01:00
Nextcloud bot 267991b154 [tx-robot] updated from transifex 2017-10-29 00:08:31 +00:00
Arthur Schiwon 76c803f0af add acceptance tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-28 23:57:35 +02:00
Joas Schilling 94f3fc63bc Use ::class and fix missing doc
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-28 11:49:36 +02:00
Nextcloud bot 84f3d247f2 [tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Daniel Calviño Sánchez 1f19a45a88 Merge pull request #6869 from burned42/6307-fix_page_title_not_changed
#6307 fix page title not changed
2017-10-27 17:12:47 +02:00
Arthur Schiwon 20e7a0c07b fix sharerecipientssorter tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 16:03:37 +02:00
Bernd Stellwag 844db3c891 bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 15:23:39 +02:00
Bernd Stellwag 3e3e4899fa bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 15:23:39 +02:00
Robin Appelman 3f0cb13042 Allow getting the filepath when getting cached mounts by fileid
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-27 14:35:34 +02:00
Arthur Schiwon 7b0868ddac fix saving changes…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 158e161a27 add some whitespace around credential elements
(…in a stupid way)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 9a1f706ae4 fix creating an empty configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 5c05a9327c add save button for setting LDAP Agent DN and Password
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 52b1b97c58 Fix regression: undesired writes to the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 4eab39f133 LDAP: only write actually changes values to the DB
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon 4c1a5d6a88 first, remove the hack
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 14:25:19 +02:00
Arthur Schiwon ca72c0150b configurable amount of autocomplete results in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 13:50:38 +02:00
Robin Appelman f9a7294807 use fopen directly when reading objects from s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-27 12:58:19 +02:00
Arthur Schiwon bd951e926f avatar css fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 12:34:24 +02:00
Morris Jobke de912385e0 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-10-27 12:16:28 +02:00
Joas Schilling 8660b9f0af Unit tests for #6977
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-27 11:46:56 +02:00
Joas Schilling 7a4c0c668b Merge pull request #6977 from Fiech/master
Added additional methods for removal of sensitive info
2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier 4ae7275aeb Added additional methods for removal of sensitive info
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-27 10:36:58 +02:00
Nextcloud bot 65621141fd [tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Arthur Schiwon eace507043 apply our theming
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 00:32:47 +02:00
John Molakvoæ (skjnldsv) 97638e76ad Share views fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-26 18:12:29 +02:00
John Molakvoæ (skjnldsv) 419ddeacee Fix checkboxes on popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-26 17:54:44 +02:00
Morris Jobke 405bbc1c61 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-10-26 16:31:59 +02:00
Arthur Schiwon 7f58c41015 fix sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 16:23:41 +02:00
Morris Jobke 13087da3c6 Merge pull request #6973 from nextcloud/menu-highlight
Add blue bar as highlight to active menu entry
2017-10-26 16:09:02 +02:00
Morris Jobke c25b694fca Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-app
Use ::class in test mocks of encryption app
2017-10-26 16:02:01 +02:00
Arthur Schiwon aa2fd30775 autocomplete on demand
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 15:25:24 +02:00
Morris Jobke c733cdaa65 Use ::class in test mocks of encryption app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 13:56:56 +02:00
Morris Jobke 06f46bd256 Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-app
Use ::class in test mocks of dav app
2017-10-26 13:26:00 +02:00
Roeland Jago Douma a9f78856b5 Merge pull request #6949 from nextcloud/cachingrouter_local
Use local cache for the CachingRouter
2017-10-26 11:42:30 +02:00
Morris Jobke 3f107e59dd Fix another warning
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:36:17 +02:00
Morris Jobke ab36980d20 Use ::class in test mocks of dav app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:16:12 +02:00
Nextcloud bot 37bedbc10d [tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Roeland Jago Douma 88cba6d882 Use local cache for the CachingRouter
There is no need to cache routes distributed. It even has the downside
that the router might return different routes then the ones in the local
routes.php files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-25 19:23:46 +02:00
Morris Jobke 4cb4d03184 Merge branch 'mastix-master' 2017-10-25 18:34:23 +02:00
Sascha Sambale 30460b52df Updated OpenGraph title to display folder name instead of a nextcloud standard text
When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title.

Signed-off-by: Sascha Sambale <mastixmc@gmail.com>

Fixing whitespaces and empty line.
2017-10-25 18:33:27 +02:00
Arthur Schiwon dcc4e7d9f6 add config parameter sample
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-25 17:27:31 +02:00
Arthur Schiwon fa2f03979b add search parameter to autocomplete controller
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-25 17:26:50 +02:00
Arthur Schiwon 3628d4d65d avoid unnecessary recursion
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-25 17:23:42 +02:00
Morris Jobke 9f5e1648c1 Merge pull request #6947 from nextcloud/fix_6821
Use new-password as autocomplete on share auth page
2017-10-25 15:02:14 +02:00
Joas Schilling 43b92b8e06 Add unit tests for SearchResult
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 11:21:05 +02:00
Joas Schilling 42c84b6309 Correctly search for existing collaboration results
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 10:38:26 +02:00
Joas Schilling 6a035bd0a0 Move attachment creators to mailer class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 09:26:57 +02:00
Joas Schilling e0c09076de Merge pull request #6940 from nextcloud/master-6935-ellipsis
Add space between ellipsis and word
2017-10-25 09:14:17 +02:00
Roeland Jago Douma b9e8c8943e Use new-password as autocomplete on share auth page
Fixes #6821

This makes sure that (supported) browsers will not prefill the password
field if a user has a password saved for that nextcloud.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-25 08:23:42 +02:00
Nextcloud bot c85deacddb [tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Morris Jobke 1978867a11 Merge pull request #6709 from nextcloud/show-checkbox-where-the-favourite-icon-is-now
Show checkbox where the favourite icon is now
2017-10-25 01:07:51 +02:00
Morris Jobke 7d71b54715 Add space between ellipsis and word
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 00:12:41 +02:00
Morris Jobke 5d84daa167 Merge pull request #6936 from nextcloud/master-6935
Fix typo
2017-10-25 00:07:17 +02:00
Jan-Christoph Borchardt 0aac62096c Add blue highlight to active menu entry
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-24 22:58:18 +02:00
Roeland Jago Douma 2f36744aff Update phan config
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:14 +02:00
Roeland Jago Douma 134bb2fd78 User_LDAP Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 53e0b7c1a8 UpdateNotification Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma c20b3d3634 TwoFactorBackupCodes Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 71eb826cf4 Testing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma f71588838a SystemTags Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma dd9d2bcb19 ShareByMail Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma d92e4bbece Provisioning_API Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 21f129dd46 OAuth2 autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:13 +02:00
Roeland Jago Douma 9e296748dd LookupServerConnector Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 58287f71c5 Files_Versions Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 3722ee73f5 Files_Trashbin Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 436966372e Files_Sharing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 89802ba016 Files Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma b906be4d6b Federation Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma 38d9d394b0 FederatedFileSharing Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma fc1032f4bc Encryption Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:12 +02:00
Roeland Jago Douma ab20a64ed4 DAV Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
Roeland Jago Douma 112b0d57a8 Comments Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
Roeland Jago Douma ce7c9dfe8a Admin Audit autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:09 +02:00
Roeland Jago Douma a82b56b1c7 Merge pull request #6918 from nextcloud/rotate_job_by_default
Add logrote as a default background job
2017-10-24 20:38:40 +02:00
Roeland Jago Douma b88db3a389 Merge pull request #6921 from nextcloud/appmanager-securitymiddleware
Use proper DI for security middleware for app enabled check
2017-10-24 19:58:24 +02:00
Roeland Jago Douma 93d5500f9a Merge pull request #6934 from nextcloud/class-usage-in-mocks
Use ::class in test mocks
2017-10-24 19:52:23 +02:00
Morris Jobke f368481c23 Merge pull request #6928 from nextcloud/remove-unneeded-method
Remove unused method of OC_App
2017-10-24 17:50:43 +02:00
Morris Jobke 77697288de Merge pull request #6930 from nextcloud/use-proper-di-for-repair-step
Use proper DI for repair command
2017-10-24 17:50:03 +02:00
Morris Jobke 43e498844e Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Morris Jobke dc823043e0 Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:38:30 +02:00
Morris Jobke b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +02:00
Björn Schießle 306d4e1d40 Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
2017-10-24 15:59:13 +02:00
Björn Schießle f8e4d0d564 Merge pull request #6929 from nextcloud/deprecate-private-method
Deprecate OC_App:isEnabled
2017-10-24 15:56:54 +02:00
Morris Jobke 99934134dc Use DI for IAppManager to encryption migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +02:00
Morris Jobke ce0c45a4ea Use proper DI for security middleware for app enabled check
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:36:28 +02:00
Joas Schilling 2b425960b8 Define constants for the talk user agents
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-24 15:10:35 +02:00
Morris Jobke dd192e5df9 Use proper DI for repair command
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:13:45 +02:00
Morris Jobke 7b7bf73670 Deprecate OC_App:isEnabled
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:05:46 +02:00
Morris Jobke df85b13296 Remove unused method of OC_App
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 14:04:09 +02:00
Morris Jobke 3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage
Use appmanager instead of OC_App for check for enabled app
2017-10-24 13:53:17 +02:00
Roeland Jago Douma 80e4d48db9 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 08:28:07 +02:00
Roeland Jago Douma e2139d4b56 Add logrote as a default background job
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 08:28:06 +02:00
Nextcloud bot 1860190305 [tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke 3aa3e92281 Merge pull request #6864 from nextcloud/phpdoc-fix-issues
Fix some issues in phpDoc comments
2017-10-23 14:52:07 -07:00
Morris Jobke 5987099d2a Remove unneeded check if app is enabled
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:47:06 +02:00
Morris Jobke f884e762bc Use appmanager instead of OC_App for check for enabled app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:31:17 +02:00
Julius Härtl b3c025fd08 Revert copyright changes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Julius Härtl 4cfa1c66b8 Doc: Fix phpDoc issues
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-23 23:23:56 +02:00
Joas Schilling 8062547e66 Merge pull request #6915 from nextcloud/css-border-radius
Border-radius does not need the vendor prefixes anymore
2017-10-23 21:47:20 +02:00
John Molakvoæ 59598b8a27 Merge pull request #6916 from nextcloud/css-box-sizing
Box-sizing does not need vendor prefix anymore
2017-10-23 21:13:17 +02:00
John Molakvoæ c68a44d5f0 Merge pull request #6917 from nextcloud/css-box-shadow
Box-shadow does not need vendor prefix anymore
2017-10-23 21:12:29 +02:00
Morris Jobke 28016a2a70 Box-shadow does not need vendor prefix anymore
https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
http://caniuse.com/#search=box-shadow

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:14:31 +02:00
Morris Jobke c2004afb4f Box-sizing does not need vendor prefix anymore
http://caniuse.com/#search=box-sizing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:10:39 +02:00
Morris Jobke b29fa32939 Border-radius does not need the vendor prefixes anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:04:36 +02:00
Morris Jobke 2f8c7f0de2 Merge pull request #6780 from nextcloud/rakekniven-patch-1
Update file-upload.js
2017-10-23 09:15:57 -07:00
Arthur Schiwon fb40afc4d4 enable autocomplete when editing comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 18:00:39 +02:00
John Molakvoæ e5b619d0a6 Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelines
User settings app-navigation to css guidelines
2017-10-23 17:51:03 +02:00
Lukas Reschke 14a37d3512 Merge pull request #6892 from nextcloud/rakekniven-patch-2
Update settings-admin-caldav.php
2017-10-23 16:17:18 +02:00
Arthur Schiwon eb8f1247fe fix unstable comment order
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 15:37:36 +02:00
Lukas Reschke 886bb31ec3 Merge pull request #6913 from nextcloud/tests-for-6837
Provide tests for future timestamp formatting
2017-10-23 14:46:10 +02:00
Morris Jobke ca4278a4d7 Provide tests for future timestamp formatting
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 14:20:21 +02:00
Joas Schilling 143ff6a622 Add a doc why this should not be removed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:35:55 +02:00
Nextcloud bot db1096bcfd [tx-robot] updated from transifex 2017-10-23 00:08:39 +00:00
Georg Ehrke 1855204ad9 remove reminders from read-only shared calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-22 14:19:29 +02:00
Arthur Schiwon de8a475b0b fix contactsmenu-popup
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon ccbcce978f convert mentions after save to the plain format we use
also ensures proper rendering, even of edited comments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon 8d9f485b35 when writing a comment, render mentions as they'd appear anywhere
i.e. avatar with displaymenu and contactsmenu-popover

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon ec5607544c turn textarea to contenteditable div
we will need it for nice formatting of the mentioned user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon df0e72d8d9 contenteditable divs should look like textareas
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon d1afbedc5f setup atwho autocomplete
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 8e60a2bd28 add At.js and dependencies
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 04fafdd505 fix class name in info.xml
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8722458d2a ensure that sorting is stable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8f0a9ae51f split walking the tree from operating on it
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon fd6daf8d19 AutoCompletion backend
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
blizzz cd80e5dc7c Merge pull request #6758 from nextcloud/allow-0-quota-again
Allow quota of 0 again
2017-10-22 14:10:55 +02:00
Nextcloud bot 2b31b82891 [tx-robot] updated from transifex 2017-10-22 00:08:36 +00:00
John Molakvoæ (skjnldsv) 2e38d0173d Fix deletion feedback
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv) f3d9961150 Fix editing form visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv) 69f0f17f32 Edit form to guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-21 21:10:48 +02:00
John Molakvoæ (skjnldsv) f4004d3ab8 User settings app-navigation to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-21 21:10:45 +02:00
rakekniven 2c93b297f0 Update settings-admin-caldav.php 2017-10-21 14:05:20 +02:00
Nextcloud bot 3709d3eeae [tx-robot] updated from transifex 2017-10-21 00:08:26 +00:00
Nextcloud bot a94976bfc8 [tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Markus Staab db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Lukas Reschke 9932b7498d Merge pull request #6873 from nextcloud/ldap_proxy_redix_fix
Ldap proxy Redis fix
2017-10-19 12:03:04 +02:00
Joas Schilling bb1af9b284 Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitations
Opt out of IMip CalDAV Plugin
2017-10-19 11:57:52 +02:00
Lukas Reschke 7de6f7cd07 Merge pull request #6677 from nextcloud/downstream-dont-reset-quota
don't reset quota
2017-10-19 11:42:37 +02:00
Joas Schilling 6efa0b86d0 Allow quota of 0 again
Regression from f1fccaca06

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:37:29 +02:00
Lukas Reschke 3f352d5f3b Merge pull request #6825 from nextcloud/no-filecache-update
No automatic filecache update
2017-10-19 11:30:56 +02:00
Joas Schilling 65e938c4fd Fix docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:18:21 +02:00
Lukas Reschke 3a3e6c34d0 Merge pull request #6835 from nextcloud/dav-plugins-from-apps-only
Let apps register Sabre plugins or collections (v2)
2017-10-19 11:09:12 +02:00
Joas Schilling dcb322a6b3 Extend the API with teh parameters from Swift
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-19 11:05:47 +02:00
Roeland Jago Douma 4388ec2231 Little bit of code cleanup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-19 11:05:24 +02:00
Lukas Reschke f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader
Allow apps to have their own autoloader
2017-10-19 11:05:23 +02:00
Roeland Jago Douma a6760560c6 Do not check existance before fetch
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-19 11:03:31 +02:00
Nextcloud bot 07b6e234bd [tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Daniel Calviño Sánchez 065ab6bfff Solve acceptance test failure due to clicks on covered elements
Firefox and Chrome drivers for Selenium refuse to click on an element if
the point to be clicked is covered by a different element, throwing an
UnknownError exception with message "Element is not clickable at point
({x}, {y}). Other element would receive the click: {element}". Although
in general that would be a legit error (as the user would not be able to
click on the element) due to a bad layout, sometimes this can be just a
temporal issue caused by an animation, in which case there would be no
problem once the animation finished and the elements are all in their
final location.

Unfortunately, automatically handling those situations in which the
problem is caused by an animation by just retrying a few times if the
element to be clicked is covered before giving up would probably cause
confusion instead of easing test writing.

The reason is that if the center of the element is covered by another
one the Firefox driver for Selenium tries to click on the corners of the
element instead. The problem is that the coordinates used for the click
are integer values, but Firefox has sub-pixel accuracy, so sometimes
(depending on which corner is not covered and whether the left, top,
width or height properties of the element to be clicked have a decimal
component or not) the clicks silently land on a different HTML element
(and that is with squared borders; with round borders they always land
on a different HTML element. That was partially addressed for Selenium
3.0 by clicking first on the edges, but it would still fail if the
middle point of the edges is covered but not the corners).

It is not possible to fix or even detect all that from the tests (except
maybe with some extreme hacks involving accessing private PHP members
from Mink and bypassing or replacing the standard JavaScript executed by
the Firefox driver with a custom implementation...), so it is not
possible to ensure that clicks during an animation will land on the
right element (in fact it is not possible even on static elements,
although except when the layout is wrong there should be no problem);
sometimes retrying a click when the element is covered would solve the
problem, sometimes it would cause a different element to be clicked (and
sometimes there would be even no retry, as the first click would have
silently landed on a different element than the expected one).

Therefore, a different approach must be used. Instead of trying to
automatically handle clicks during animations the tests must be written
being aware of the problem and thus waiting somehow for the animations
that can cause a problem to end before performing the clicks.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 22da869fb8 Extend the clickable area of the file name to include the thumbnail
Now that the checkbox was moved to its own column clicking on the
thumbnail should behave like clicking on the file name. To achieve this
the left position was replaced with a padding, so the element is kept at
the same place while extending its clickable area to cover the
thumbnail.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez f392e78d5b Move checkboxes to their own column
The selection column is not only a visual column, but also a real column
of the file list table. Unlike other columns whose width is reduced in
space constrained screens the selection column must stay the same so the
tapping area is large enough to be easily usable

The selection column does not appear in the search results table, so its
contents have to be explicitly aligned with those of the main table
based on whether the main table has a selection column or not (using the
"has-selection" CSS class in the same way as the "has-favorite" CSS
class was being used when there was a column for favorite actions).

In the tests the ":visible" selector can no longer be used. That
selector matches elements with a width or height that is greater than
zero, but the dimensions calculated in the unit tests are not reliable;
the width of the link was zero before these changes, and now moving the
checkbox to its own column causes the height of the link to become zero
too, so it no longer matches the ":visible" selector even if it is not
hidden. As hidding and showing the link is based on its "display" CSS
property its value is the one checked now.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 6b8713e8b6 Remove "has-favorites" class from file list table
The "has-favorites" CSS class is no longer used after moving the
favorite mark to the top right corner of the thumbnail, so there is no
need to add it to the table.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 415ac9b3ac Move favorite mark to the top right corner of the thumbnail
The favorite icon was shown on its own "column" (not a real column in
the table, but a visual column achieved through margins and left
positions). Now the icon was moved to the top right corner of the file
thumbnail, and the thumbnail and file name were moved to the left to
fill the space left by the "column".

To keep the markup in line with its visual representation (and to ease
the placing through CSS), the favorite mark is no longer prepended to
the row, but appended to the thumbnail instead. In the same way, the
thumbnail is no longer appended to the checkbox label, but to the link
with the name of the file instead (although the checkbox is still shown
at the bottom right corner of the thumbnail, and clicking on the
thumbnail still selects the file). In order to show the "busy" state on
a file the "icon-loading-small" CSS class is set to the parent element
of the thumbnail, so the thumbnail is also wrapped now by another div
with the same size and position as the label.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 2d709d5222 Set background size for thumbnail in CSS instead of JavaScript
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez e29bd3b743 Show always the checkbox
The checkbox is not shown always with full opacity, though, in order to
reduce the visual noise (specially later, once the checkbox is moved to
its own column).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 9ff0941c07 Replace inline favorite action with just a favorite icon
This is a preparatory step for a following commit in which the position
of the favorite icon and the checkbox will be swapped; in that new
design the favorite icon is no longer expected to be an action but just
a simple mark on whether the file is favorited or not (the action is
expected to be triggered then only from the file actions menu).

The favorite icon is now fully shown or completely hidden depending on
whether the file is favorited or not. As the icon is just informative
but no longer an action now it does not change when hovered or focus. In
the same way, the alternative text when the file is not favorited now it
is not "Favorite" (an action) but "Not favorited" instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 0e933ee6b9 Update acceptance tests to favorite files through the file actions menu
Currently a file can be favorited either through the inline action or
through the file actions menu. However, the inline action will be
removed in a following commit and then it will be possible to do it only
through the file actions menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez 420d1b91ab Add "Favorite" action to the file actions menu
The new FileAction for the menu is essentially the same as the old
inline FileAction, except for the rendering; in this case the FileAction
is shown in the menu in a standard way, so there is no need to provide a
custom renderer (although the menu entry text and icon change depending
on whether the file is currently a favorite or not, but that can be done
just with displayName and iconClass functions).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Daniel Calviño Sánchez a8f1902b02 Add support to FileActionsMenu for icon class functions
Icon class function properties make possible to render a different icon
class depending on the context of the file action.

Inline file actions had support for them already and called them passing
the file name and context of the file action as parameters. Due to this
the FileActionsMenu passes those parameters too to icon class functions
instead of just the context like done for display name functions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-10-19 01:46:13 +02:00
Joas Schilling ce27e8cf34 Add attachment support to emails
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:44:19 +02:00
Joas Schilling bea04d12d5 Merge pull request #6515 from nextcloud/templating-of-email-subjects
Allow templating of email subjects
2017-10-18 15:41:18 +02:00
Joas Schilling cc798fd65f Fix autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:16 +02:00
Joas Schilling 3119fd41ce Set the data from the template
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling c9af36a9ab Introduce a public interface for Message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling 8b37fe7f65 Set the subject with the email template to allow theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:03 +02:00
Joas Schilling f109c1a10c Allow templating of email subjects
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-18 15:12:00 +02:00
Nextcloud bot 8e884ba52f [tx-robot] updated from transifex 2017-10-18 00:08:23 +00:00
Roeland Jago Douma ff9f325677 Ignore composer stuff in phan
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 22:22:36 +02:00
Roeland Jago Douma 5d7d96dc45 Update autoload checker
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 21:55:06 +02:00
Roeland Jago Douma f51eccf34a Move files_sharing to a proper classmap
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 21:35:51 +02:00
Roeland Jago Douma 3a9c24c04f Allow apps to have their own autoloader
This will allow apps to also have a proper classmap and authorative
autoloader.

Currently if a file: <appdir>/composer/autoload.php exists we will use
it. Else we keep the current behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-17 21:35:49 +02:00
Roeland Jago Douma cd0d27e46d Merge pull request #6854 from nextcloud/s3-multipart-propagate-exception
propagate multipart upload exception when aborting upload
2017-10-17 20:42:51 +02:00
Robin Appelman 91b3536f45 propagate multipart upload exception when aborting upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-17 15:10:58 +02:00
Bjoern Schiessle e964f83f28 fix url
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-10-17 11:24:01 +02:00
Julius Härtl be71ce32dc Merge pull request #5673 from tbille/gui-bug-authentication
Destroy modal when closed
2017-10-17 10:55:12 +02:00
Thomas Bille 75bc40f7a0 Destroy modal when closed
Signed-off-by: Thomas Bille <contact@tbille.fr>
2017-10-17 09:09:45 +01:00
Nextcloud bot 59c3ea91fd [tx-robot] updated from transifex 2017-10-17 00:08:23 +00:00
Roeland Jago Douma d34c7e89a0 Merge pull request #6844 from nextcloud/phan-repo
Phan is moved to a new repo
2017-10-16 19:23:03 +02:00
Joas Schilling bdb0265644 Fix missing translation of "Personal" calendar in activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-16 18:41:33 +02:00
Roeland Jago Douma 17bd2fb268 Phan is moved to a new repo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-16 16:23:55 +02:00
Georg Ehrke b958725f78 Make it possible to opt out of IMip Plugin for CalDAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-16 13:49:46 +02:00
Georg Ehrke 7828cf454e add admin settings panel for dav app
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-10-16 13:49:08 +02:00
blizzz c25be8d83c Merge pull request #6837 from nextcloud/timespan-check-3
Fix future time spans
2017-10-16 13:35:53 +02:00
Joas Schilling 3b3ba8d0a1 Update autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-16 13:23:05 +02:00
Nextcloud bot 84a7285f08 [tx-robot] updated from transifex 2017-10-16 00:08:26 +00:00
Roeland Jago Douma 1b2568e637 Merge pull request #6585 from nextcloud/theming-fileupload-errorhandling
Theming: Handle errors on uploaded files properly
2017-10-15 21:44:48 +02:00
Roeland Jago Douma a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path
also use configured 'cache_path' for new chunking
2017-10-15 21:42:41 +02:00
Roeland Jago Douma a0823540b0 Merge pull request #6791 from nextcloud/fix-test-warnings
Fix test warnings
2017-10-15 21:40:43 +02:00
Roeland Jago Douma 3438020d66 Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookie
Exclude avatar from Same-Site Cookie requirement
2017-10-15 21:38:40 +02:00
dartcafe ac2a6e0f2f Fix future time spans
Signed-off-by: dartcafe <github@dartcafe.de>
2017-10-15 08:31:11 +02:00
Julius Härtl 79c4538511 Dav: codestyle fixes in PluginManager
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-14 20:51:59 +02:00
Vincent Petry a829ac787a Let apps register Sabre plugins or collections
upstream #26761

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-14 20:50:53 +02:00
John Molakvoæ 7a05cf300c Merge pull request #6761 from nextcloud/fix-avatar-loading-state
Fix popover position and avatar loading
2017-10-14 10:53:54 +02:00
John Molakvoæ (skjnldsv) f33ed5fb13 Ellipsis
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-14 10:37:17 +02:00
John Molakvoæ (skjnldsv) 4ca88471b0 Fix popover position and avatar loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-14 10:37:17 +02:00
John Molakvoæ 0ce3636fba Merge pull request #6829 from nextcloud/fix-app-nav-edit-inputs
Fix app-navigation editable entry input colors
2017-10-14 07:07:02 +02:00
Nextcloud bot d251623b01 [tx-robot] updated from transifex 2017-10-14 02:29:04 +00:00
Joas Schilling 4e0c078f48 Merge pull request #6826 from nextcloud/fix-class-name-in-exception-logger-plugin
Fix class name in exception logger plugin
2017-10-13 18:04:23 +02:00
John Molakvoæ (skjnldsv) c68c538a86 Fix app-navigation editable entry input colors
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-13 16:21:38 +02:00
Joas Schilling 7c53f921a9 Use ::class to avoid errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:36:20 +02:00
Joas Schilling fd5465d509 Fix class name, regression from 44cf67accd
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 12:35:52 +02:00
Joas Schilling 6acf1d9524 Also update the activity table with this
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 11:46:50 +02:00
Joas Schilling e2ec6b33ea Add a command to manually migrate to big ints
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 11:42:15 +02:00
Joas Schilling 697d4c8847 Install new instances with bigint filecache
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 11:25:24 +02:00
Joas Schilling ab8ca3b5c2 Don't change the filecache schema on update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-13 11:24:51 +02:00
Joas Schilling 547f5afa5b Merge pull request #6816 from nextcloud/external-storage-confirm-delete-fix
Fix confirmation dialog when deleting external storage
2017-10-13 11:13:20 +02:00
Nextcloud bot 7c1ba6c00b [tx-robot] updated from transifex 2017-10-13 00:08:27 +00:00
John Molakvoæ fadd33040c Merge pull request #6818 from nextcloud/allow-div-on-nav-edit-entry-instead-of-form
Allow div instead of forms on editable nav entries
2017-10-12 20:01:51 +02:00
John Molakvoæ (skjnldsv) cd4629b2ae Allow div instead of forms on editable nav entries
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 19:16:47 +02:00
blizzz af4810d5e5 Merge pull request #6795 from nextcloud/fix/contactsmenu-ie11
Fix contacts menu for IE11
2017-10-12 15:38:23 +02:00
Robin Appelman a92596db78 Fix confirmation dialog when deleting external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-12 13:55:25 +02:00
John Molakvoæ 423be3df52 Merge pull request #6763 from nextcloud/fix-user-quota
Fix quota overflow and error color
2017-10-12 11:54:14 +02:00
John Molakvoæ (skjnldsv) 7f07ff48f2 Correct class to quota
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 11:07:07 +02:00
John Molakvoæ (skjnldsv) ca00e24504 Fix quota overflow and error color
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-12 11:07:07 +02:00
Nextcloud bot adb847de41 [tx-robot] updated from transifex 2017-10-12 00:08:28 +00:00
Robin Appelman 1a99e0dab4 Merge pull request #6602 from nextcloud/s3-multipart-upload
Add multipart upload for s3
2017-10-11 16:10:58 +02:00
Robin Appelman e393b3553e set s3 part size to 500mb
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 15:59:53 +02:00
Lukas Reschke 8ad17a66d6 Exclude avatar from Same-Site Cookie requirement
Required to work with the upcoming Collabora avatar integration.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-10-11 14:41:34 +02:00
Robin Appelman d27b0b07bc also use configured 'cache_path' for new chunking
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-11 14:18:45 +02:00
Nextcloud bot 647b185c2b [tx-robot] updated from transifex 2017-10-11 00:08:29 +00:00
Julius Härtl 0def38b50e Merge pull request #6739 from nextcloud/apps-management-updates
Add Updates section to app management
2017-10-10 14:57:35 +02:00
Julius Härtl bee9ef83c6 App management: Do not show udpdate category if no updates are available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl a3502c5c67 App management: Show proper message when no updates are available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl 6f7fb2e87b App management: do not reset update counter to 0 on category change
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl ec0091d499 Do not return app names multiple times
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:38 +02:00
Julius Härtl 8d1b32e597 App management: add update section
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-10 12:34:37 +02:00
Roeland Jago Douma 968d4f6396 Merge pull request #6692 from nextcloud/inputs-border-to-main-bg
Inputs border to main bg and fix white inputs
2017-10-10 10:01:14 +02:00
Nextcloud bot 564d1b1789 [tx-robot] updated from transifex 2017-10-10 00:08:31 +00:00
Christoph Wurst f0d96ed7e1 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-09 15:09:11 +02:00
Roeland Jago Douma 5304598296 Merge pull request #6790 from nextcloud/fix-pgsql-tests
fix postgresql tests
2017-10-09 13:13:52 +02:00
Joas Schilling 281f042093 Don't use deprecated $this->getMock() method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-09 13:00:24 +02:00
Joas Schilling dbaad22472 Fix tests with group manager
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-09 12:57:41 +02:00
blizzz 9bbb6ffb23 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 12:45:00 +02:00
Joas Schilling fd681fe257 Merge pull request #6770 from nextcloud/check-user-group-exists-dav-shares
Check if the user/group exists for dav shares
2017-10-09 10:13:33 +02:00
Nextcloud bot 8e25df9690 [tx-robot] updated from transifex 2017-10-09 00:08:31 +00:00
Nextcloud bot 61077df79a [tx-robot] updated from transifex 2017-10-08 00:08:22 +00:00
rakekniven 830310ad1d Update file-upload.js
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-07 10:38:03 +02:00
Nextcloud bot 436daf92e5 [tx-robot] updated from transifex 2017-10-07 00:08:31 +00:00
Joas Schilling 8e9505e7b1 Merge pull request #6759 from nextcloud/allow-multiple-settings-and-sections-per-app
Allow multiple settings and sections per app
2017-10-06 11:29:01 +02:00
Nextcloud bot 4c54ca571d [tx-robot] updated from transifex 2017-10-06 00:08:30 +00:00
Joas Schilling 3b4ab6560b Check if the user/group exists for dav shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 12:48:10 +02:00
Joas Schilling 6292f665d7 Allow multiple settings and sections per app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 11:34:03 +02:00
Roeland Jago Douma 9ba51247f0 Merge pull request #6766 from nextcloud/php7.2-rc3
Update php7.2 container to rc3
2017-10-05 08:16:42 +02:00
Nextcloud bot 457ac66eb9 [tx-robot] updated from transifex 2017-10-05 00:08:23 +00:00
Roeland Jago Douma 2458095692 Update php7.2 container to rc3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-04 21:00:29 +02:00
John Molakvoæ (skjnldsv) c2abc5810c Variable for checkboxes and name fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-04 16:11:04 +02:00
Julius Härtl 060eac40d8 Merge pull request #6700 from nextcloud/accessibility-fixes
Accessibility fixes
2017-10-04 16:09:29 +02:00
Joas Schilling 66b4efe4c6 Merge pull request #6750 from nextcloud/fix-language-when-setting-password
Fix language when trying to change password
2017-10-04 15:51:23 +02:00
blizzz 2d62f97f1b Merge pull request #6328 from nextcloud/split-sharees-api-logic
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
2017-10-04 15:43:44 +02:00
John Molakvoæ (skjnldsv) 27a6bbcd8a White checkboxes variable
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-04 15:42:30 +02:00
John Molakvoæ (skjnldsv) a0d268d7a1 Fix white inputs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-04 15:42:30 +02:00
John Molakvoæ (skjnldsv) 345b9d151f Initial commit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-04 15:42:29 +02:00
Jan-Christoph Borchardt 5412c239f2 Merge pull request #6740 from nextcloud/apps-management-sorting-updates
Show apps with available updates first
2017-10-04 15:23:03 +02:00
Robin Appelman 73554a3228 Merge pull request #6742 from nextcloud/invalid-path-repair-from11
dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:49 +02:00
Joas Schilling e95e7dca27 Merge pull request #6733 from nextcloud/jquery-dialogs-to-scss
Jquery ocdialogs to scss and variables implementation
2017-10-04 11:28:43 +02:00
Joas Schilling e9fd39f3dd Fix language when trying to change password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-04 09:47:52 +02:00
Nextcloud bot 3d981c0d40 [tx-robot] updated from transifex 2017-10-04 00:08:27 +00:00
Jan-Christoph Borchardt 70f80e3aa2 Merge pull request #6625 from nextcloud/improved-fallback-for-collapsible-button
Hide but leave the collapse button above link
2017-10-03 18:53:43 +02:00
John Molakvoæ (skjnldsv) 600b0e7ef8 Hide but leave the collapse button above link
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-03 17:26:40 +02:00
Robin Appelman 7525c387ce 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:27:26 +02:00
Julius Härtl d517d63a4d Notifications: Add highlight type definition
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:38:15 +02:00
Julius Härtl f15e85c4f5 Theming: Add tests for mimetype and upload error checks
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:34:44 +02:00
Julius Härtl 9651c1abff Theming: Fix message/loading display on errors
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Julius Härtl c0d104087b Theming: Check valid image format also for logo
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Julius Härtl c337c8fa45 Theming: Handle errors on uploaded files properly
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:32:50 +02:00
Julius Härtl 5c34b2d4bb App management: add update availability to sorting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-10-03 15:11:11 +02:00
Roeland Jago Douma 42bd942619 Merge pull request #6729 from mvl22/patch-1
Update enable javascript link to https
2017-10-03 14:58:26 +02:00
John Molakvoæ (skjnldsv) 305a06b1e7 Jquery ocdialogs to scss and variables implementation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-10-03 05:48:23 +02:00
Nextcloud bot 7bac8a32b4 [tx-robot] updated from transifex 2017-10-03 00:08:20 +00:00
Martin 4e484fc217 Update enable javascript link to https 2017-10-02 15:37:58 +01:00
Nextcloud bot 9236733a83 [tx-robot] updated from transifex 2017-10-02 00:08:24 +00:00
Nextcloud bot edf44ac9d9 [tx-robot] updated from transifex 2017-10-01 00:08:24 +00:00
Nextcloud bot 8be053516b [tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
Jan-Christoph Borchardt f7e6da9a8e Add empty alt text to avatars as they are decorative next to usernames
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 20:28:27 +02:00
Jan-Christoph Borchardt 61f10b27bc Improve accessibility of Contacts menu
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 20:27:49 +02:00
Jan-Christoph Borchardt 2cd467f3f0 Remove unneeded tabindex, add keyboard focus feedback for app list
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 20:01:15 +02:00
Jan-Christoph Borchardt 21e484533c Remove redundant alternative text
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 19:34:23 +02:00
Jan-Christoph Borchardt d3ae77590a Merge legacy app title h1 into Nextcloud h1, ref #5822
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 19:31:05 +02:00
Jan-Christoph Borchardt 9fb37a2990 Add proper labels to various form elements and buttons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 19:25:32 +02:00
Jan-Christoph Borchardt 753c6fd07b Add alt text to app icons in header
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-29 18:14:39 +02:00
Morris Jobke 2840eb0e1d Merge pull request #6522 from nextcloud/fix-3365
fix LDAP User deletion (cleanup), fixes #3365
2017-09-29 14:05:34 +02:00
Arthur Schiwon e62ae5b2df fix test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-29 12:49:04 +02:00
Morris Jobke 870d71689a Merge pull request #6563 from nextcloud/bigint-ids
Migrate ID columns to bigint
2017-09-29 12:23:41 +02:00
Arthur Schiwon c9622ccb62 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>
2017-09-29 11:44:04 +02:00
Joas Schilling f205412371 Update autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:11:15 +02:00
Joas Schilling a3bdb318e9 Fix bigint handling on postgres
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling 155d451cf8 Fix copy paste errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling c65e591e88 Restore the sequencial order
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling 740d820194 Migrate ids to bigint in the dav app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling c58ff2990e Migrate the twofactor_backupcodes app to bigint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
Joas Schilling ce3bcf7e28 Migrate all core id columns to bigint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:56 +02:00
Joas Schilling 124b4374d6 Add a base migration for easy updating to bigints
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:56 +02:00
Roeland Jago Douma 993dc77d9e Merge pull request #6693 from nextcloud/apps-inputs-scss-to-correct-scss-file
Move app-settings-content css to correct scss file and fix input cursor
2017-09-29 11:07:50 +02:00
Nextcloud bot 95ec247d10 [tx-robot] updated from transifex 2017-09-29 00:08:21 +00:00
Joas Schilling 7a5762f494 Merge pull request #6691 from nextcloud/rounding
Use full percentages in quota bar percentages
2017-09-28 21:38:15 +02:00
John Molakvoæ (skjnldsv) 8fb788570c Specific rules needs to go to specific css files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 19:15:04 +02:00
Morris Jobke e9aa11a1b0 Use full percentages in quota bar percentages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-28 17:58:49 +02:00
John Molakvoæ d58c0e6834 Merge pull request #6669 from nextcloud/various-css-fixes
Various css fixes
2017-09-28 17:48:40 +02:00
John Molakvoæ (skjnldsv) b9a8ba7a23 Fix upload progress color to primary
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 17:13:01 +02:00
John Molakvoæ (skjnldsv) 13aed0b58d Fix settings button state and opacity
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 17:13:00 +02:00
John Molakvoæ (skjnldsv) 9ff07bd280 Fix progress input overflow
removed border-radius on big quota from the main settings page

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 17:12:12 +02:00
Morris Jobke b17ca81df0 Merge pull request #6683 from nextcloud/filelist-show-navigate
navigate to the root directory when showing the main filelist
2017-09-28 16:22:13 +02:00
Robin Appelman a448d34d34 navigate to the root directory when showing the main filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 15:15:49 +02:00
Robin Appelman b36dd8b71f Fallback to filename based detection if the remote dav server doesn't know the mimetype
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-28 14:22:42 +02:00
Jan-Christoph Borchardt d92310ac2b Adjust settings navigation heading style
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-28 13:29:37 +02:00
Roeland Jago Douma 1c2da7d7d3 Merge pull request #6676 from nextcloud/confirm-storage-delete
ask for confirmation when deleting an external storage
2017-09-28 12:49:31 +02:00
John Molakvoæ (skjnldsv) 7fb3292949 Popover to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 11:55:25 +02:00
John Molakvoæ (skjnldsv) c1795b0611 Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-28 11:12:52 +02:00
Nextcloud bot e5d39e63d1 [tx-robot] updated from transifex 2017-09-28 00:08:36 +00:00
Arthur Schiwon 3e2015a24c and add missing whitespaces to log outout
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:16:57 +02:00
Juan Pablo Villafáñez eac542a3cc Adjust unittest
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:13:53 +02:00
Juan Pablo Villafáñez d6d895dd74 Keep the current quota if no suitable quota is found
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-28 01:13:48 +02:00
Morris Jobke 5f25dd7095 Merge pull request #6599 from nextcloud/fix_2523
Add direct preview link
2017-09-27 23:27:54 +02:00
Morris Jobke 72889e57ca Merge pull request #6653 from nextcloud/fix-cursor-on-user-settings-table
Fix cursor on user settings table
2017-09-27 23:27:30 +02:00
John Molakvoæ (skjnldsv) 08c718da64 Fix drop shadow with filter
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv) f038ecbfe3 Fixed quota on homepage (files)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv) f09a70e9b5 Quota bar fix on user list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv) d54253d4e4 Implement progress theming into core and better visual on quota display
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 22:13:19 +02:00
John Molakvoæ (skjnldsv) 46da059b8f Drop shadow fix on popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 22:13:18 +02:00
Robin Appelman 2b7c489d75 ask for confirmation when deleting an external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-27 17:59:56 +02:00
John Molakvoæ a90b046a17 Merge pull request #6666 from nextcloud/federation-menu-triangle
Fix style of federation scope menu triangles, simplify CSS
2017-09-27 15:19:34 +02:00
John Molakvoæ (skjnldsv) 291e3d331f No js for popover positionning
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-27 13:34:29 +02:00
Arthur Schiwon a579f8aa37 adapt attribute name (changed letter case style)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 13:22:59 +02:00
Jan-Christoph Borchardt d4f1518533 Fix style of federation scope menu triangles, simplify CSS
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-27 12:20:26 +02:00
Roeland Jago Douma 90d7e8f6f4 Merge pull request #6586 from nextcloud/fix/app-install-extract-check
Check whether an app archive can be extracted
2017-09-27 10:41:21 +02:00
Morris Jobke b87914be9c Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6
Only allow colons in db host for IPv6 addresses
2017-09-27 10:17:36 +02:00
Morris Jobke b30b4cddd9 Merge pull request #6660 from nextcloud/remove_saml_hack
Remove SAML hack from base.php
2017-09-27 10:13:36 +02:00
Morris Jobke 1fc8ac6db2 Merge pull request #6658 from nextcloud/fix_6618
Don't show placeholder when we have loaded the avatar image
2017-09-27 10:11:19 +02:00
Roeland Jago Douma 95cc831ed7 Remove SAML hack from base.php
This is no longer required now that
https://github.com/nextcloud/user_saml/pull/159 is in

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-27 08:28:09 +02:00
Nextcloud bot de2dc3c919 [tx-robot] updated from transifex 2017-09-27 00:08:23 +00:00
Arthur Schiwon 937a80c941 reduce nesting of the required app XML
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-27 01:22:17 +02:00
Arthur Schiwon 3db3e65121 add tests for Lookup Plugin
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon c43685e6fc shareeAPIController unit test clean up and last fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon f2c8e1ed2f remove unused method
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon a7a651f4a4 move splitUserRemote unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
Arthur Schiwon 3888b3a285 adapt unit test for ensuring exception
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon a28b1d91f9 split off former searchSharee unit test
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon 4a315ede81 adjust ShareeAPIController invalid-input search unit test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon 38ff7eaece adjust ShareeAPIController search test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon 3d1d03a511 split off getEmail tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon c92f7ee767 split off getRemote unit tests
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon b35760de27 split off getGroups unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
Arthur Schiwon dd9e191d37 split off getUsers unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon f446ec83dd minor fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 2eff174deb add missing PHP doc
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 7122739dd6 updated autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 9db3b04f1b finetune the appinfo parser
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon c55583d1b4 allow more than one plugin per share type
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon f7713e5f3f make it possible to register plugins and kick out the circle one
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 4a96e22258 don't keep result types hard coded
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
Arthur Schiwon 579c1476a3 missing PHP doc for public interfaces
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:22 +02:00
Arthur Schiwon 88db314f0c update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:22 +02:00
Arthur Schiwon ea3ac4e656 Splits off the logic from sharees endpoint thus making it available from
within Nc/via PHP.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:17 +02:00
Roeland Jago Douma b0c9380114 Don't show placeholder when we have loaded the avatar image
Fixes #6618
Else it shows up as background to transparent avatars

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-26 22:50:16 +02:00
Roeland Jago Douma 271959b1d9 Merge pull request #6646 from nextcloud/federation-active
Highlight active federation scope menu entry with bold heading
2017-09-26 21:13:53 +02:00
Jan-Christoph Borchardt 2450b67cb7 Merge pull request #6650 from nextcloud/tooltip-shadow-use-variable
Fit the tooltip shadow to the default variable
2017-09-26 17:46:17 +02:00
Daniel Calviño Sánchez de3138104c Remove unneeded CSS rules
There are currently no "img" or "span" descendants of "td.quota"
elements, so those rules can be removed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-26 17:43:54 +02:00
Daniel Calviño Sánchez 401322bf61 Remove "cursor: pointer" from quota cell
The quota is set through a dropdown, and this dropdown is only shown
when clicking on the select element itself. Therefore, the cell should
not show a pointer when hovering on it but outside the select element.

Note that although the removed "&.quota" selector also set a "width"
declaration that declaration was later overriden by
"#userlist td.quota", so it was not needed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-26 17:43:25 +02:00
Daniel Calviño Sánchez 8363aceb74 Set "cursor: pointer" for email addresses
Clicking anywhere on the cell shows the input field to set the email
address, so the cursor is set as a pointer not only on the text and
icon, but on the whole cell as well (like done for the full name and the
password).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-26 16:59:57 +02:00
John Molakvoæ fc46e98fc6 Merge pull request #6647 from nextcloud/scss-no-take-only-throw
Do not stop on scss compilation failure
2017-09-26 16:26:43 +02:00
John Molakvoæ (skjnldsv) 4febc4811a Fit the tooltip shadow to the default variable
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-26 15:43:36 +02:00
John Molakvoæ (skjnldsv) dec713fc92 Do not stop on scss compilation failure
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-26 15:29:37 +02:00
Jan-Christoph Borchardt a5c1e5f952 Highlight active federation scope menu entry with bold heading
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-26 15:08:17 +02:00
Morris Jobke 3bde76302f Merge pull request #6643 from nextcloud/improved-redis-warning
Improve exception handling
2017-09-26 14:44:47 +02:00
Joas Schilling fe3b2385ab Code clean up
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:27:42 +02:00
Joas Schilling 1287d6ddb3 Only allow colons in db host for IPv6 addresses
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-26 14:20:04 +02:00
Morris Jobke 11c31e94fe Improve exception handling
If there is an exception in the template handling then a white page is shown.
This improves the handling of this and shows text only about the internal
error.

To test this just setup redis as cache and then disable the php-redis module.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-26 13:54:51 +02:00
Nextcloud bot ef3e8faea2 [tx-robot] updated from transifex 2017-09-26 00:08:26 +00:00
Roeland Jago Douma 4077f684e1 Only have direct preview urls for image files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 21:47:09 +02:00
Roeland Jago Douma 05c37526a7 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 21:44:42 +02:00
Morris Jobke 292a704648 Merge pull request #6544 from nextcloud/fix/duplicate-session-token
Fix duplicate session token after remembered login
2017-09-25 17:39:02 +02:00
John Molakvoæ 9080976975 Merge pull request #6372 from nextcloud/scss-normalization
Scss normalization
2017-09-25 16:50:30 +02:00
Roeland Jago Douma 3bd4e7e541 Merge pull request #6632 from nextcloud/do_not_show_hyphen
Do not show hyphen
2017-09-25 16:34:50 +02:00
Joas Schilling f2b7205a88 Merge pull request #6627 from nextcloud/icon-on-apps-settings
Icon on apps settings
2017-09-25 16:29:26 +02:00
Roeland Jago Douma c3491e3f14 Add annotation
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
Roeland Jago Douma 894958e3e2 For images we have a preview for use the preview link
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
Roeland Jago Douma 7d8c5f73f5 Add direct preview link to single shared image files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:50 +02:00
Roeland Jago Douma 29fb315ffc Allow requesting the max preview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 16:18:48 +02:00
John Molakvoæ (skjnldsv) ab1c34c5a5 Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-25 16:17:33 +02:00
Morris Jobke 1ad79e3039 Merge pull request #6630 from nextcloud/same_site_cookie_middleware
Handle SameSiteCookie check for index.php in AppFramework Middleware
2017-09-25 16:17:12 +02:00
John Molakvoæ (skjnldsv) 9ff6dab07c Fix typo
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-25 13:07:18 +02:00
Joas Schilling e0a4c61350 Merge pull request #6633 from nextcloud/dav-remove-like-when-not-needed
Don't add a LIKE condition when it's not needed
2017-09-25 12:12:50 +02:00
Morris Jobke 4677af1a91 Merge pull request #6631 from nextcloud/fix_6170
Add indexes to cards and cards_properties tables
2017-09-25 12:01:25 +02:00
Roeland Jago Douma 4ac32223da Add indexes to cards and cards_properties tables
Fixes #6170

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 10:27:46 +02:00
Stephan Müller f7790c2960 expect call of getSlogan() exactly twice
Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Stephan Müller 86265320b8 do not show hyphen after instance name in emails if slogan does not exist
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-25 09:20:46 +02:00
Thomas Citharel f1bfd4433e Don't add a LIKE condition when it's not needed
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-25 09:10:44 +02:00
Nextcloud bot 199c4b2ff9 [tx-robot] updated from transifex 2017-09-25 00:08:01 +00:00
Roeland Jago Douma c257cd57d4 Handle SameSiteCookie check for index.php in AppFramework Middleware
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-24 21:07:16 +02:00
Roeland Jago Douma 4ee731c1ab Merge pull request #6591 from nextcloud/unify-appearance-of-avatars-for-undefined-and-unknown-users
Unify appearance of avatars for undefined and unknown users
2017-09-24 13:12:58 +02:00
Roeland Jago Douma 24a881f75e Merge pull request #6623 from nextcloud/fix-app-nav-img
Fix app nav img margin
2017-09-24 13:07:21 +02:00
John Molakvoæ (skjnldsv) 308e1c0ed2 Icons & default classes
Changed categories order same as app store

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-24 08:59:09 +02:00
John Molakvoæ (skjnldsv) 7cee919f57 Fix busy state loading animation in files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv) d169e3fd59 Removed unused filter for opacity, fix #6408
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv) f41f4f1932 Settings button as nav entry
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:18:14 +02:00
John Molakvoæ (skjnldsv) 65353af374 Replaced colours by variables
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:17:44 +02:00
John Molakvoæ (skjnldsv) a07299476b Settings scss
Scss conversion
Cleanup settings scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:17:26 +02:00
John Molakvoæ (skjnldsv) 9fafe737bc Removed unneeded bgs and borders. Replaced hard coded colours by
variables.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 18:15:56 +02:00
John Molakvoæ (skjnldsv) 2fe6e3d4df fix width of editing & deleted form
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 15:12:22 +02:00
John Molakvoæ (skjnldsv) c7f75f5620 Img margin left
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 12:06:18 +02:00
John Molakvoæ (skjnldsv) ee58c7fcf2 Fix settings navigation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-23 11:58:25 +02:00
Nextcloud bot d4bf301a78 [tx-robot] updated from transifex 2017-09-23 00:07:56 +00:00
Roeland Jago Douma d1a430dbd8 Merge pull request #6611 from nextcloud/fix-webroot-detection
Fixed webroot detection
2017-09-22 12:14:25 +02:00
John Molakvoæ (skjnldsv) 4a5eeb2ce7 Fixed webroot detection
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-22 07:20:31 +02:00
Nextcloud bot 887229b7b8 [tx-robot] updated from transifex 2017-09-22 00:08:22 +00:00
Morris Jobke 38568c362b Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep
OC_OCS_Response is deprecated
2017-09-21 20:38:18 +02:00
Morris Jobke 7eba0a2720 Fix comment
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-21 20:10:36 +02:00
John Molakvoæ e336283a48 Merge pull request #6399 from nextcloud/app-navigation-flex
App navigation flex
2017-09-21 18:50:28 +02:00
Roeland Jago Douma eb00dbb593 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 18:30:20 +02:00
Roeland Jago Douma 2207fdcd8c Remove private legacy OC_OCS_Response
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:56 +02:00
Roeland Jago Douma 87e10f9e6a OC_OCS_Response is deprecated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:00 +02:00
Robin Appelman 385d6f098c Add tests for multipart upload
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:47:34 +02:00
Robin Appelman 4ae46d8876 only do multipart upload for large files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:06:59 +02:00
John Molakvoæ (skjnldsv) 0e17b65bcf Avoid error undefined index classes in log
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
John Molakvoæ (skjnldsv) 8ac8773233 damn you firefox default values
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
John Molakvoæ (skjnldsv) 3e6b93e68d Fix editing field animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
John Molakvoæ (skjnldsv) c66f16a201 Relative positionning to li
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:39 +02:00
John Molakvoæ (skjnldsv) 85300ab50a Quota icon by @jancborchardt
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
Morris Jobke 4b57f68b81 Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 3ff60c3af8 create special class forst first pinned class occurrence
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 231e475a7b Quota.svg
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 05c48daa40 hack first class occurence .pinned
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 11023aa0fe Fix quota order
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 2010c1339d Quota order
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:38 +02:00
John Molakvoæ (skjnldsv) 151c0cbee7 Unwanted css for trashbin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) 46dcf3e05b Unwanted css for trashbin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) 3cdfd21784 Removed unwanted css and add quota icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) 02db24de3a Add possibility to pin nav entries at the bottom
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) 3e25dcfb3e Add pinned class to trashbin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) edc9f176e5 Allow custom classes on nav entries
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) 9b472024a1 Flex to menu items
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) f721cc5685 Fix entry edit buttons borders
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:37 +02:00
John Molakvoæ (skjnldsv) f43b832d84 Align edit input with its corresponding link text and fix animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) 99598d3f40 Padding for deleted and editing entries
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) f2f0685bb2 Loader fix on main entry
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) ee051b55a8 Removed unused props
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) 085d963166 Icon shifting and unification of padding
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) 728e00b1b0 Fix github color highlighter
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:36 +02:00
John Molakvoæ (skjnldsv) e9d596011d Loading position fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) 04a0c3cfaf Hide bullet & icons if menu has loading icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) 63bcd47090 Finally removed old legacy code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) 97b6148290 Fix deletion/edit supperposition
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) bd520cbfa7 Added bullet class and fixed comments
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) ce36b13aaf Max height to 9999
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) e2c65cfee5 no need for overflow, let the opacity trick the user and the animation smoothly push other items
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:35 +02:00
John Molakvoæ (skjnldsv) 681a4ba8d2 Improve collapse animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) 9510d8838f Retro compatibility collapse button hide
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) 54bdec8128 Fixed comment
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) 6ff81cdd4b Animation fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) a8df5c2bed Removed collapsible button requirements, and animate submenu deletion
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) 43f3fad41b Icon fix for sub-items
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) c9719ca601 Syntax fix and collapse button padding if no icon on link
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:34 +02:00
John Molakvoæ (skjnldsv) c6ac46fe92 Fix menu submenu after eec58ae32b0adf35af3aa550c1b1fe21bc2e963a
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) ef41a55dc8 Cleanup 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) b0f7ad1508 Finally force the menu to be a first-child of app-navigation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) 4a3efdc6df Add inline style padding
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) 82986bab1b Cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) d0013b1480 merge animation into same prop
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:33 +02:00
John Molakvoæ (skjnldsv) 76f055d7d3 Delete and edit animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) da232d4ce7 Fix editable entry design and flex
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) 04929640ac Removed animation breaking things and open submenu which arent .collapsible by default
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) adffaff081 Fix typo
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) 6978420010 Organize app-navigation menu types
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) 4e245ae709 Animate hide/show collapsible menus
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) f5ae444330 Fixed collapsible and Folders
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) 37d331014b Fix app navigation positionning
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:32 +02:00
John Molakvoæ (skjnldsv) fb968a3ea2 Fix counter inside link and highlight submenu as well
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) a93bbae2b6 Second menu padding and ellipsis fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) 0a67e0e2a8 Navigation flex magic
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) d85781d5f4 Allow counter inside a to be clickable
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) 4d2a7fe32e Icon auto-padding fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) f11b36de93 Removed unused old vars and reorganize
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:31 +02:00
John Molakvoæ (skjnldsv) d9770a1f56 Simplification and reorganisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-21 14:00:30 +02:00
Nextcloud bot 4d556a3ade [tx-robot] updated from transifex 2017-09-21 00:08:26 +00:00
Joas Schilling f0f396b527 Merge pull request #6579 from nextcloud/settings-displayname-avatar
Set the displayname for the avatar in the personal info
2017-09-20 23:04:37 +02:00
Christoph Wurst 38bb6e1477 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-09-20 21:39:31 +02:00
Joas Schilling 72bf1df7f7 Set the displayname for the avatar in the personal info
Otherwise the color used is different

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-20 21:39:12 +02:00
Roeland Jago Douma 8358c63f53 Merge pull request #6573 from nextcloud/nonfound-webroot-empty-string
Fix "webroot not found" when installed to the root of the webserver
2017-09-20 20:04:27 +02:00
Daniel Calviño Sánchez 2131e95c61 Extract setting the avatar for the unknown user to its own function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 18:25:20 +02:00
Daniel Calviño Sánchez ea10a1292a Use "?" instead of user ID as seed for the image placeholder
The seed of the image placeholder is needed to generate the background
color of the image, but as the background color is later overriden any
seed could be used. When no text is explicitly given the seed is used as
text too, so there is no need to pass the user ID and simply using "?"
as seed is enough.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 18:20:58 +02:00
Robin Appelman e4e5e735db multipart upload for s3 object storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 17:51:58 +02:00
Daniel Calviño Sánchez ff71dd07a6 Unify appearance of avatars for undefined and unknown users
When calling the jQuery avatar plugin with a user that did not exist
(that is, users for which "/avatar/{user}/{size}" return a JSON response
with an empty "displayname" value) "?" on a grey background was shown.
However, if the jQuery avatar plugin was called with an undefined
JavaScript value then "?" was shown on a bluish background. This commit
unifies both cases to use the grey background.

The unit tests were also modified to ensure that the grey background is
used in both cases.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-09-20 17:19:35 +02:00
Morris Jobke e8d80ed071 Merge pull request #6571 from nextcloud/cachefactory-local-locking
expose local and locking memcaches trough public interfaces
2017-09-20 16:04:51 +02:00
Robin Appelman 5430d73a0e Fix "webroot not found" when installed to the root of the webserver
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 14:19:15 +02:00
Robin Appelman 388376c077 expose local and locking memcaches trough public interfaces
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-20 14:16:22 +02:00
Christoph Wurst 2e19c42bc5 Check whether an app archive can be extracted
If extraction fails we should not continue the installation/update
process as the info.xml cannot be loaded and an unrelated error
occurs.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 14:07:17 +02:00
Joas Schilling e43400eddb Merge pull request #5562 from nextcloud/link-password-style
Fix style of link share password input view
2017-09-20 11:30:31 +02:00
Morris Jobke f900ba8183 Merge pull request #6574 from nextcloud/external-storage-root-undefined-offset
Fix undefined offset warning when using '/' as external storage root
2017-09-20 11:26:19 +02:00
Morris Jobke b593d37d47 Merge pull request #6577 from nextcloud/3rdparty_swiftmailer
[3rdparty] Bump swiftmailer
2017-09-20 10:46:03 +02:00
Lukas Reschke df81853c41 Bump third-party ref
Required for https://github.com/nextcloud/3rdparty/pull/67

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-20 09:29:32 +02:00
Joas Schilling 8199ace435 Merge pull request #6566 from nextcloud/fix-tfbc-structure
Fix database structure of twofactor backupcodes app to match 12
2017-09-20 09:09:13 +02:00
Nextcloud bot efbd3bb518 [tx-robot] updated from transifex 2017-09-20 00:08:25 +00:00
Roeland Jago Douma 00e341925b Merge pull request #6564 from nextcloud/fix-missing-unsigned
Fix missing "unsigned" on integer columns
2017-09-19 20:52:49 +02:00
Roeland Jago Douma 543f19a979 Merge pull request #6565 from nextcloud/appinfo_localcache
Read appinfo from a local cache
2017-09-19 20:18:06 +02:00
Joas Schilling d4da2a6dab Fix autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 20:09:10 +02:00
Joas Schilling d5c2b98207 Fix missing "unsigned" on integer columns
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 20:09:10 +02:00
John Molakvoæ (skjnldsv) 4faa562403 Fix browser width compatibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-19 18:19:47 +02:00
Robin Appelman c83232adae Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-19 17:18:04 +02:00
Morris Jobke 11d2006b44 Merge pull request #6562 from nextcloud/fix-unsigned-typo
Fix unsigned typo
2017-09-19 16:34:39 +02:00
Lukas Reschke 916a1b5662 Merge pull request #6569 from nextcloud/fix-comments-activity-error
Use the wrapper to get the parameters which was added in #6369
2017-09-19 16:07:01 +02:00
Joas Schilling 10c7ecb5e9 Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:01:43 +02:00
Joas Schilling 55d9d24370 Fix database structure of twofactor backupcodes app to match 12
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 14:37:56 +02:00
Roeland Jago Douma 6d7ca1092d Read appinfo from a local cache
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-19 14:34:11 +02:00
Joas Schilling b72eaaab73 Increase version
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 14:25:10 +02:00
Joas Schilling d5b5fc7fca Fix unsigned state
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 12:49:42 +02:00
Joas Schilling 8768faacaa Fix migration naming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 12:44:46 +02:00
Roeland Jago Douma 66698b2d42 Merge pull request #6264 from nextcloud/dav-migrations
Move DAV app to migrations
2017-09-19 08:03:12 +02:00
Nextcloud bot d603d78630 [tx-robot] updated from transifex 2017-09-19 00:08:27 +00:00
Robin Appelman 1995c69928 Merge pull request #4410 from nextcloud/update-aws-sdk
Update aws sdk + s3 improvements
2017-09-18 17:47:22 +02:00
Robin Appelman f0c7b8f264 show diff in autoload checker
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 17:20:08 +02:00
Robin Appelman e7f3c12b20 update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 17:20:08 +02:00
Robin Appelman 91f44f5309 fix undefined constants
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman 3eaf6626f8 merge vendor js
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman d526969a68 fix path style
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:28 +02:00
Robin Appelman 9154b27943 disable part files for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman cc9dd4280f add stat cache for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d5678201b4 more efficient is_dir
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 4bbc1cdc79 more efficient permissions for s3 external storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman 9b5accf9f3 more efficient write only fopen
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman d70607104e reuse object read/write/delete logic in s3 implementations
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman dad18baec8 update aws sdk and move it to 3rdparty
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:27 +02:00
Robin Appelman cf1da57c1d remove non composer aws sdk
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-18 15:16:26 +02:00
Roeland Jago Douma 32234a23da Move DAV app to migrations
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-18 14:35:27 +02:00
Roeland Jago Douma ca5c3f839a Merge pull request #6490 from nextcloud/share_pagination_query
Improve sharing pagination
2017-09-18 14:34:15 +02:00
Morris Jobke a06ba68919 Merge pull request #6518 from nextcloud/allow-apps-to-control-versions
allow apps to disable versions for some files
2017-09-18 14:30:29 +02:00
Morris Jobke a0132a49a6 Merge pull request #6549 from nextcloud/fix-6534
don't pass User object when uid string is expected
2017-09-18 14:28:14 +02:00
Lukas Reschke 53057f2bd0 Merge pull request #5462 from nextcloud/add-frameancestor-support
Add CSP frame-ancestors support
2017-09-18 14:25:44 +02:00
Morris Jobke 8b1eaba417 Merge pull request #5585 from nextcloud/contacts_menu_privacy
Enhance privacy of contactsmenu fixes #5107
2017-09-18 14:25:16 +02:00
Morris Jobke f9dc6c456e Merge pull request #6014 from nextcloud/add-copy-action
Allows files/folders to be copied.
2017-09-18 14:19:30 +02:00
Morris Jobke bdba9871d0 Merge pull request #6537 from nextcloud/fix-2332-breadcrumb-refresh-current-dir
Force refresh file list when clicking on breadcrumb even if target directory equals current directory.
2017-09-18 13:43:42 +02:00
Arthur Schiwon 0837745477 don't pass User object when uid string is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 13:19:47 +02:00
blizzz 27ad83f541 Merge pull request #6545 from nextcloud/provapi-fix-empty-gid-exception
throw 101 when an empty group string is provided
2017-09-18 12:55:25 +02:00
Arthur Schiwon a62b4a68a0 throw 101 when an empty group string is provided
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 10:56:13 +02:00
Nextcloud bot 60e0de4a36 [tx-robot] updated from transifex 2017-09-18 00:08:32 +00:00
Jan-Christoph Borchardt 23a08c501a Move link share password box and button together
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-17 21:02:49 +02:00
Jan-Christoph Borchardt 3ea819e261 Add box around link share password box, fix #5560
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-17 21:02:48 +02:00
Chon Kou 6ec667bbc7 Force refresh file list when clicking on breadcrumb even if target directory equals current directory.
Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
2017-09-16 23:57:24 -07:00
Nextcloud bot cdb6b0295a [tx-robot] updated from transifex 2017-09-17 00:08:25 +00:00
Nextcloud bot 967b563113 [tx-robot] updated from transifex 2017-09-16 00:08:23 +00:00
Roeland Jago Douma ae1fdf73c2 Improve sharing pagination
Basically we did in almost all cases did a query to much.
This resulted in an extra query for each share type.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-15 19:44:19 +02:00
Thomas Citharel 8c576a8d63 Add tests for FileList
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 18:14:34 +02:00
Thomas Citharel 98ee32b91c Don't show success notifications for failed copy actions and update folder sizes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 18:13:45 +02:00
Morris Jobke 66a5a45c50 Merge pull request #6488 from nextcloud/vendor-davclient.js-0.1.2
vendor: Update davclient.js to 0.1.2
2017-09-15 17:03:32 +02:00
Morris Jobke 2372e2d849 Merge pull request #6453 from nextcloud/fix-5273
Fix initializing paged search under some circumstances
2017-09-15 17:03:19 +02:00
Thomas Citharel 5767659d22 Change move copy order and debug leftover
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 16:53:10 +02:00
Thomas Citharel 07c1137abf typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 16:53:10 +02:00
Thomas Citharel 33f0601862 [WIP] Added copy and move buttons
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 16:53:10 +02:00
Thomas Citharel 246a5a5750 Allow files to be copied through action menu & multiple files actions
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 16:53:10 +02:00
Morris Jobke 4eb2ce5b32 Merge pull request #6506 from nextcloud/sharename-overlap
Fix sharer name overlap with filename
2017-09-15 16:49:37 +02:00
Morris Jobke bb9493e9ad Merge pull request #6521 from nextcloud/fix-margin-settings
Fix margins of followup sections
2017-09-15 16:49:11 +02:00
Leon Klingele 6d2bff46c9 vendor: Update davclient.js to 0.1.2
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-15 16:32:15 +02:00
Morris Jobke 034011465d Fix margins of followup sections
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-15 15:58:06 +02:00
Lukas Reschke 705432ca6f 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-15 15:58:04 +02:00
Thomas Citharel eb51c46549 fix typo and set @since properly
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
Thomas Citharel ecf347bd1a Add CSP frame-ancestors support
Didn't set the @since annotation yet.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
Lukas Reschke 6d02fe06c6 Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
This reverts commit 56a9084dd2.
2017-09-15 14:32:27 +02:00
Tobia De Koninck 5896176d69 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-15 14:31:41 +02:00
Tobia De Koninck 7dfa527da2 Improve code style
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck f0370c0244 Some code improvements
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck fa402c74d2 Add tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
Tobia De Koninck 473a1ecad1 Fix tests
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
Tobia De Koninck 92c238e0f0 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-15 14:31:39 +02:00
Bjoern Schiessle 90d7693997 allow apps to disable versions for some files
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-15 12:14:31 +02:00
Björn Schießle 8500e11457 Merge pull request #6503 from nextcloud/allow-apps-to-control-trash-bin
allow apps to control the trash bin
2017-09-15 11:46:43 +02:00
Bjoern Schiessle 6e69881512 allow apps to control the trash bin
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-15 11:32:45 +02:00
Nextcloud bot 113fd47f30 [tx-robot] updated from transifex 2017-09-15 00:08:08 +00:00
Jan-Christoph Borchardt 42ac9cde08 Correctly ellipsize file names, fix #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-14 16:43:24 +02:00
Jan-Christoph Borchardt 06691611e3 Ellipsize sharer name, ref #6498
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-14 16:38:31 +02:00
Morris Jobke db3289bc94 Merge pull request #6066 from nextcloud/drone_php72_mysql
Add 7.2 jobs for mysql & mysqlmb4
2017-09-14 16:32:27 +02:00
Roeland Jago Douma be0ecce9bc Add 7.2 jobs for mysql & mysqlmb4
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-14 15:40:23 +02:00
John Molakvoæ fc5528fda3 Merge pull request #6497 from nextcloud/fix-loading-icon-size
Fix loading icon size
2017-09-14 15:29:10 +02:00
Morris Jobke ecd728c3b2 Merge pull request #6499 from nextcloud/fix-files-sidebar
Allow to close sidebar for text files
2017-09-14 14:18:36 +02:00
Morris Jobke 545e9bc26b Merge pull request #6495 from nextcloud/fix-webroot-throw-for-subdirectory-nc-installs
Fix webroot throw
2017-09-14 13:29:57 +02:00
Arthur Schiwon 0b625069e8 adapted integration tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
Arthur Schiwon 5e74affea4 fix counting found results in search op
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
Arthur Schiwon fc097a80f5 improve and extend paging integration test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
Arthur Schiwon 34f9590169 replace hard-coded attribute with the corresponding settings option
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
Arthur Schiwon 89f4e16cdb fix limit-flaw in search on paged results
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-14 13:20:51 +02:00
Morris Jobke 2d4026357f 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-14 11:30:54 +02:00
John Molakvoæ (skjnldsv) 4e909115be Fix loading icon size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-14 11:07:51 +02:00
John Molakvoæ (skjnldsv) 1a0ac912b2 Fix webroot throw
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-14 08:41:10 +02:00
Nextcloud bot 7698781a1e [tx-robot] updated from transifex 2017-09-14 00:08:12 +00:00
Morris Jobke c5dbe1c772 Merge pull request #6483 from nextcloud/fix_quota_new_endpoint
Fix quota calculation on new dav upload endpoint
2017-09-14 00:37:55 +02:00
Morris Jobke 883574974d Merge pull request #6458 from nextcloud/rethrow-correct-exception
Rethrow the correct exception when there was an error in an app conta…
2017-09-14 00:32:13 +02:00
Morris Jobke ba2e1c5db9 Merge pull request #5689 from nextcloud/fix-4117
LDAP: simplify returning the homePath and fixing #4117
2017-09-14 00:23:01 +02:00
Lukas Reschke 8ef4fcb4b7 Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable
Fix undefined variable $tmpRoot
2017-09-13 22:42:42 +02:00
Roeland Jago Douma ab63c89ab3 Fix quota calculation on new dav upload endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-13 19:28:38 +02:00
Morris Jobke d659199ff5 Merge pull request #5398 from nextcloud/theming-page-title
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
2017-09-13 13:08:37 +02:00
Joachim Bauch 91598cbfb5 Use theme methods "getTitle" and "getEntity" as fallback if name is not themed.
This fixes an issue with custom filesystem themes that can define title, name
and entity differently, but the theming app was only using the name as fallback
(see #5374).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
2017-09-13 11:02:45 +02:00
Morris Jobke 241579587a Merge pull request #6457 from nextcloud/theming-favicon-invert-apps
Invert themed favicons on bright colors
2017-09-13 10:48:33 +02:00
Nextcloud bot 5ce3c7003b [tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Lukas Reschke 7052aaf271 Merge pull request #6473 from nextcloud/2fa_apppasword_auth
Fix AppPassword 2FA auth
2017-09-12 23:02:14 +02:00
Roeland Jago Douma 9163cf9241 Fix AppPassword 2FA auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:28:43 +02:00
Morris Jobke 83508d7be3 Merge pull request #6451 from nextcloud/theming-manifest-json
Theming app support for chrome manifest.json file
2017-09-12 15:10:08 +02:00
Axel Helmert 01d4967130 Fix undefined variable $tmpRoot
Refactoring of webroot detection left an unused variable.

Fixes: #6415
Signed-off-by: Axel Helmert <info@luka.de>
2017-09-12 12:14:27 +02:00
Joas Schilling c4b3198ac2 Rethrow the correct exception when there was an error in an app container
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-12 11:54:13 +02:00
Julius Härtl 9a47b25f19 Theming: Invert app icon in favicon for bright backgrounds
fixes #5650

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 11:37:25 +02:00
Julius Härtl 1f8a3e05c1 Theming: Use png32 for generated icons
fixes #4796

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 11:34:21 +02:00
Julius Härtl 81ef116bfb Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:47:38 +02:00
Julius Härtl 8391ca8792 Use IAppManager instead of private API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:28:22 +02:00
Julius Härtl 699c64c750 Add manifest.json to the login page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-12 09:23:13 +02:00
Julius Härtl 770aae42f6 Add themed manifest.json to theming app
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:23:12 +02:00
Julius Härtl b49ab065b7 Move theming related imagePath logic to ThemingDefaults
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-09-12 09:22:57 +02:00
John Molakvoæ ff27308b88 Merge pull request #6448 from weizenspreu/master
print generated encryption key passwords directly after generating th…
2017-09-12 05:16:30 +02:00
Nextcloud bot c124a43d74 [tx-robot] updated from transifex 2017-09-12 00:08:25 +00:00
Lukas Reschke 038ae39f13 Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-level
Sort apps by enabled/disabled but not by official/in-appstore in App Management
2017-09-11 22:17:21 +02:00
Lukas Reschke 88731848c6 Merge pull request #6435 from nextcloud/add-exception-to-phpdoc
Add exceptions to PHPDoc of interface
2017-09-11 13:01:41 +02:00
Kenneth Newwood 7092c50e7c print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
2017-09-11 12:52:25 +02:00
Roeland Jago Douma 316c7e18bc Merge pull request #6430 from nextcloud/php72-rc1
Bump 7.2 container to RC1
2017-09-11 12:36:33 +02:00
Lukas Reschke 0186d8405c Merge pull request #6433 from william-p/Fix_uninitialized_params
Fix uninitialized variable $this->params
2017-09-11 11:54:15 +02:00
Joas Schilling f5617d78eb Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comment-activity-in-email
Allow translations of the comments activity in the emails too
2017-09-11 10:52:45 +02:00
William Pain 9a63ded43b Fix uninitialized variable $this->params
Signed-off-by: William Pain <pain.william@gmail.com>
2017-09-11 10:01:12 +02:00
Chon Kou d5cfb38449 Sort apps by enabled/disabled but not by official/in-appstore in App Management
Signed-off-by: Chon Kou <k.kou@alumni.ubc.ca>
2017-09-10 20:50:22 -07:00
Nextcloud bot 4b38dac1b8 [tx-robot] updated from transifex 2017-09-11 00:08:19 +00:00
Lukas Reschke b97f48f1af Add exceptions to PHPDoc of interface
Improves static code analysis here and also keeps expectations proper.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-10 20:01:36 +02:00
Nextcloud bot 3f6692ee24 [tx-robot] updated from transifex 2017-09-10 00:08:23 +00:00
Roeland Jago Douma e481971155 Bump 7.2 container to RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-09 20:45:11 +02:00
Nextcloud bot 25f2546a7b [tx-robot] updated from transifex 2017-09-09 00:08:19 +00:00
Morris Jobke 3536aff780 Merge pull request #6407 from nextcloud/fix-popover-hovering
Fix hovering on all popover types
2017-09-08 20:35:43 +02:00
Morris Jobke 8a79d0cc70 Merge pull request #6414 from nextcloud/share-notification-wrong-language
Use the language of the recipient for the share notification
2017-09-08 19:15:05 +02:00
Morris Jobke 75c38d5d98 Merge pull request #6416 from nextcloud/make-sure-sqlite-works-without-content
Ask the schema whether the table and column exist
2017-09-08 19:09:38 +02:00
Morris Jobke c27b2f8dcf Merge pull request #6413 from nextcloud/translate-settings-headers
Translate settings headers
2017-09-08 18:49:43 +02:00
Morris Jobke e9c713902e Merge pull request #6417 from nextcloud/proper-english-nowhave
Improve text: 'you have now' -> 'you now have'
2017-09-08 18:29:22 +02:00
John Molakvoæ (skjnldsv) d50934fa54 Fix hovering on all popover types
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-09-08 16:33:39 +02:00
Morris Jobke b6e759b028 Merge pull request #6419 from nextcloud/speed-up-mysql
Use tmpfs for mysql CI containers
2017-09-08 15:45:24 +02:00
Morris Jobke cea1511397 Use tmpfs for mysql CI containers
Should improve performance

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-08 15:23:37 +02:00
Leon Klingele 8e46e6b827 Improve text: 'you have now' -> 'you now have'
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-08 13:47:11 +02:00
Joas Schilling 29e1aa57e1 Ask the schema whether the table and column exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 11:45:16 +02:00
Joas Schilling 7e625a8d22 Use the language of the recipient for the share notification
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:48:16 +02:00
Joas Schilling 758b2baa43 Translate settings headers
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:22:14 +02:00
Nextcloud bot 194f880073 [tx-robot] updated from transifex 2017-09-08 00:08:16 +00:00
Lukas Reschke bab313da5d Merge pull request #6360 from nextcloud/fix/session-timeout-refresh-csrf-token
Fix failing csp/nonce check due to timed out session
2017-09-07 19:51:59 +02:00
Lukas Reschke 3bd6b2a0b3 Merge pull request #6379 from nextcloud/ensure-password-complexity
Make sure the password contains special characters
2017-09-07 14:12:35 +02:00
Lukas Reschke 11c7a98a2a Merge pull request #6380 from nextcloud/cleanup-oci-setup
cleanup oci setup code
2017-09-07 14:11:55 +02:00
Joas Schilling 5a257cec63 Make sure the password contains special characters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-07 12:47:55 +02:00
Morris Jobke c58853d223 Merge pull request #6398 from nextcloud/revert-6394-navigation-mail-fix
Revert "Fix active entry highlight in certain apps"
2017-09-07 09:35:53 +02:00
Morris Jobke 17d980cb9c Revert "Fix active entry highlight in certain apps" 2017-09-07 09:35:44 +02:00
Morris Jobke 5184f3a7b4 Merge pull request #6394 from nextcloud/navigation-mail-fix
Fix active entry highlight in certain apps
2017-09-07 09:30:15 +02:00
Morris Jobke 485e22acde Merge pull request #6329 from nextcloud/ldap-password
Don't log LDAP password when server is not available
2017-09-07 09:25:56 +02:00
Roeland Jago Douma daf3db8de6 Merge pull request #6381 from nextcloud/fix-error-message
Fix "Uninitialized string offset: 0 at \/media\/psf\/stable9\/lib\/pr…
2017-09-07 09:25:17 +02:00
Lukas Reschke 0bccd5a0d9 Fix "Uninitialized string offset: 0 at \/media\/psf\/stable9\/lib\/private\/URLGenerator.php#224"
The URLGenerator doesn't support `` as target for absolute URLs, we need to link to `/` thus.

Regression introduced with https://github.com/nextcloud/server/commit/46229a00f39e507249dbe3ceb7507277da3fa4f8

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-07 08:34:02 +02:00
Jan-Christoph Borchardt 55f67ff7e7 Fix active entry highlight in certain apps
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-09-07 02:45:12 +02:00
Nextcloud bot 9959560649 [tx-robot] updated from transifex 2017-09-07 00:08:23 +00:00
Morris Jobke d84a20e8fd Merge pull request #6332 from lukanetconsult/hotfix/6028-realpath-on-webroot
Refactor webroot detection in resource locator
2017-09-06 22:51:31 +02:00
Morris Jobke 8e6d86a862 Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events
don't send invitation emails for past events
2017-09-06 22:48:46 +02:00
tux-rampage 7a33b9273e Refactor webroot detection in resource locator
The current implementation breaks installations with symlinks to
directories inside the webroot (i.E. apps).

With this change both variants, directory and symlinks, will be detected
correctly.

Fixes: #6028
Signed-off-by: Axel Helmert <axel.helmert@luka.de>
2017-09-06 21:32:48 +02:00
Morris Jobke a10c4517cb Merge pull request #5571 from Luzifer/5570_backend_admin
Allow group backend to declare users as admins
2017-09-06 19:50:52 +02:00
Morris Jobke 6be8642c59 Merge pull request #6377 from nextcloud/fix-included-file
Properly include file
2017-09-06 19:50:01 +02:00
Morris Jobke 392e64395a Merge pull request #6247 from nextcloud/oauth-state-undefined
Fix undefined index oauthState
2017-09-06 19:47:24 +02:00
Morris Jobke d09bf0b9ff Merge pull request #6384 from nextcloud/failed-storage-tests
adjust tests to new failed storage handling
2017-09-06 19:12:45 +02:00
Robin Appelman ccc41aeddd adjust tests to new failed storage handling
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-06 17:12:19 +02:00
Morris Jobke 5d4540f179 Merge pull request #6364 from nextcloud/fix_login_loop
Fix login with basic auth
2017-09-06 17:04:00 +02:00
Joas Schilling b68609d0cf Don't log LDAP password when server is not available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-06 16:38:55 +02:00
Morris Jobke 444779ce96 Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 16:38:24 +02:00
Morris Jobke 504c1abee0 Fix undefined index oauthState
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 16:38:24 +02:00
Robin Appelman 2c0efae30f cleanup oci setup code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-06 15:55:05 +02:00
Lukas Reschke 033d2de002 Properly include file
Regression from https://github.com/nextcloud/server/commit/005ef115fbffecb22a7ac9e65425419aca90c1aa

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-06 15:35:38 +02:00
Morris Jobke 6f7d200838 Merge pull request #6370 from nextcloud/fix-alternative-logins
Fix layout of alternative login buttons
2017-09-06 10:22:04 +02:00
Morris Jobke f5aea79bd7 Fix layout of alternative login buttons
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-06 10:21:11 +02:00
Morris Jobke 1724fed8c5 Merge pull request #5415 from nextcloud/search-cache-node
cache nodes from search results
2017-09-06 10:16:01 +02:00
Nextcloud bot 9d930210ee [tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Joas Schilling 521ede8f5f 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-05 18:10:32 +02:00
Morris Jobke 15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name
Set the meta data before everything
2017-09-05 16:08:57 +02:00
Knut Ahlers 586cefc4f1 Add @since tag to constant
Signed-off-by: Knut Ahlers <knut@ahlers.me>
2017-09-05 15:49:13 +02:00
Morris Jobke 4e3c39c1d1 Fix tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 13:55:36 +02:00
Morris Jobke cebbb1633a Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard
recognize groupOfUniqueNames as valid LDAP group object
2017-09-05 13:33:15 +02:00
Georg Ehrke a1df91da9d Sabre/VObject returns DateTimeImmutable, not a simple DateTime
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-09-05 13:13:37 +02:00
Georg Ehrke 86f28669fc don't send invitation emails for past events
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-09-05 13:13:37 +02:00
Roeland Jago Douma b96485b6bd Fix login with basic auth
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-05 12:24:41 +02:00
Nextcloud bot 6be5dc91cb [tx-robot] updated from transifex 2017-09-05 00:08:24 +00:00
Morris Jobke ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes
LDAP Connectivity Fixes
2017-09-04 18:31:32 +02:00
Christoph Wurst 87aeae21e3 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-04 17:29:26 +02:00
Joas Schilling dea011243e Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 17:01:31 +02:00
Morris Jobke 91fc25c28c Merge pull request #6082 from nextcloud/theming-fix-white-element-color
Use separate element color in theming
2017-09-04 15:43:06 +02:00
Morris Jobke e0c92c2da3 Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 15:42:34 +02:00
Joas Schilling 6dbb64c4a2 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-04 15:07:41 +02:00
Joas Schilling 95ecab0356 Set the meta data before everything
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 14:46:05 +02:00
Julius Härtl 63d1da50b4 Cleanup theming styles to fit the new login page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:31:57 +02:00
Julius Härtl 8f10cee3ff Fix tests for primary element color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-04 14:30:46 +02:00
Julius Härtl da5662c454 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 14:30:46 +02:00
Morris Jobke 4fd3240b5f Merge pull request #6254 from nextcloud/async-bus-split
Allow configuring different command bus backends
2017-09-04 14:22:06 +02:00
Morris Jobke 1ebf91ec16 Add proper EOL
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:21:44 +02:00
Morris Jobke 30ca3b70ed Merge pull request #6196 from nextcloud/downstream-26539-2
Handle invalid ext storage backend to keep mount point visible
2017-09-04 14:17:28 +02:00
Morris Jobke 0326c2c54f Fix broken tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:17:03 +02:00
Morris Jobke c04a494ea7 Merge pull request #6064 from nextcloud/fix-5219-absolute-path-must-be-relative-to-files-on-theming-update
Still throw a locked exception when the path is not relative to $user/files/
2017-09-04 14:05:34 +02:00
blizzz 2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix
Public upload share permission handling
2017-09-04 12:43:02 +02:00
Roeland Jago Douma f0158e42e9 Merge pull request #6309 from nextcloud/new-dav-event
add a new dav event to allow apps to register their own sabredav plugins
2017-09-04 12:12:46 +02:00
Morris Jobke 5927a63680 Merge pull request #6351 from nhirokinet/master
not to backquote LIMIT on CalDavBackend.php
2017-09-04 12:10:57 +02:00
Roeland Jago Douma c4f175d079 Merge pull request #6326 from nextcloud/fix_4654_3375
Pass new value to triggerChange
2017-09-04 12:03:19 +02:00
Roeland Jago Douma 57b74c921b Merge pull request #6342 from nextcloud/rich-link-preview
Add rich link preview to the login page
2017-09-04 12:02:33 +02:00
Morris Jobke 139f9bd3ca Merge pull request #6331 from nextcloud/update-repair-step
Generate system wide key pair (update repair step after backport)
2017-09-04 11:59:34 +02:00
Bjoern Schiessle e195021926 update autoloader
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-09-04 11:59:00 +02:00
Morris Jobke e33aa460f1 Merge pull request #6297 from te-online/add-mimetype-internet-shortcut
Add mimetype application/internet-shortcut for .url files
2017-09-04 11:55:05 +02:00
Robin Appelman e9a58f8579 show storage as unavailable in the file list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-04 11:54:13 +02:00
Robin Appelman 68ee79b595 set the exception for failedstorage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-04 11:54:13 +02:00
Morris Jobke 442d4ed24a Use the FailedStorage instead
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 11:54:13 +02:00
Vincent Petry 5df5b9c8b1 Handle invalid ext storage backend to keep mount point visible
Keep mount point visible and also ext storage config visible when
dealing with configs relating to storage backends or auth mechanisms
that were provided by an app that is currently disabled.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 11:54:08 +02:00
Morris Jobke d21713d526 Merge pull request #6334 from nextcloud/fix-mixup-of-id-and-name
Fix naming of user id in email meta data
2017-09-04 11:43:41 +02:00
Morris Jobke d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix
Correctly format OCS response with favorites
2017-09-04 08:46:09 +02:00
Morris Jobke ad5a298570 Merge pull request #6352 from nextcloud/scss-rebuild-frontend-controller
Rebuild SCSS files if frontend controller value changes
2017-09-03 20:59:25 +02:00
Morris Jobke 27644c7502 Merge pull request #6341 from nextcloud/jquery-ui-scss
Use SCSS for jquery-ui-fixes
2017-09-03 20:25:25 +02:00
Morris Jobke 92a440a0b5 Fix font color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-03 18:32:44 +02:00
Julius Härtl b09ce70117 Rebuild SCSS files if frontend controller value changes
fixes #6271
2017-09-03 17:32:41 +02:00
nhirokinet baba99a7e6 not to backquote LIMIT on CalDavBackend.php 2017-09-03 23:51:49 +09:00
Julius Härtl 99404fe5cd Remove unnecessary files for jquery-ui-fixes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-03 15:34:04 +02:00
Morris Jobke 0f71e3fba2 Merge pull request #6344 from nextcloud/theming-invert-threshold
Theming change invertion threshold to 55%
2017-09-03 14:01:05 +02:00
Nextcloud bot fd075240a4 [tx-robot] updated from transifex 2017-09-03 00:08:15 +00:00
Julius Härtl 0a49757535 Change invertion threshold to 55%
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-02 21:48:14 +02:00
Julius Härtl 46229a00f3 Add rich link preview to the login page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-02 21:39:38 +02:00
Julius Härtl 2fdc51ffdf Use SCSS for jquery-ui-fixes
- Move to SCSS so we use theming color values
- Apply tab style from files sidebar to ui-tabs (e.g. in user_ldap)
- Move select style to the jquery-ui-fixes file and make those only apply to ui-autocomplete elements

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-09-02 15:50:51 +02:00
Nextcloud bot 27c6dc9657 [tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Joas Schilling e47d627fc4 Fix naming of user id in email meta data
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-01 15:04:17 +02:00
Bjoern Schiessle e039a4c191 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-09-01 11:05:11 +02:00
Nextcloud bot 45f687a279 [tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Arthur Schiwon ab92e2ee14 listen to deletion hooks for proper handling, adjust and add tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-08-31 23:03:21 +02:00
Arthur Schiwon efedc81c0a 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-08-31 23:03:16 +02:00
Roeland Jago Douma ffe1429c4f 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-08-31 21:59:27 +02:00
Thomas Ebert 93d539b0cf Add mimetype support for .URL (Windows) and .webloc (macOS) files. Update places/link svg. Add filetype/link icon. Add repair step for mime types.
Signed-off-by: Thomas Ebert <thomas.ebert@te-online.net>
2017-08-31 16:53:07 +02:00
Roeland Jago Douma 84ea66dca8 Merge pull request #6296 from nextcloud/improve_2fa
Improve 2FA
2017-08-31 10:52:40 +02:00
Morris Jobke 77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails
Implement metadata for email templates of remaining emails
2017-08-31 09:54:31 +02:00
Nextcloud bot 99dcf5036d [tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke 404bd1be60 Implement metadata for email templates of remaining emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-30 22:56:14 +02:00
Morris Jobke ee14659ae8 Merge pull request #6216 from nextcloud/allow-to-sort-groups-by-name
Allow to sort groups by name
2017-08-30 22:01:10 +02:00
Morris Jobke d26ec44617 Add side effect note
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-30 21:16:27 +02:00
Roeland Jago Douma 969eea2c0d Merge pull request #6273 from nextcloud/move-multiple-files
Move multiple files
2017-08-30 14:23:05 +02:00
Bjoern Schiessle 454d136a06 also allow to register additional plugins if the old endpoint is used
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 14:05:18 +02:00
Bjoern Schiessle f8cc8e1c9e add a new dav event to allow apps to register their own sabredav plugins
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-30 14:05:18 +02:00
Morris Jobke 2aa9a9840e Merge pull request #5994 from nextcloud/drone_postgres_71
Add drone step for postgres with php 7.1
2017-08-30 14:03:59 +02:00
Roeland Jago Douma 7e065c2946 Add drone step for postgres with php 7.1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-30 13:55:16 +02:00
Nextcloud bot 1e24fe858a [tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Roeland Jago Douma 84b7022118 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-29 20:27:36 +02:00
Morris Jobke 4edb261805 Merge pull request #6303 from nextcloud/background-image
Adjust background image to the one used on the website
2017-08-29 19:09:54 +02:00
Morris Jobke d86bb5aed8 Merge pull request #6301 from nextcloud/master-add-share-with
Add shareWith to email template metadata
2017-08-29 17:58:00 +02:00
Morris Jobke b2dd7bf045 Merge pull request #6302 from nextcloud/comradekingu-patch-1
Spelling: Shortening and single please.
2017-08-29 17:53:58 +02:00
Allan Nordhøy d6adc240c4 Spelling: Shortening and single please. 2017-08-29 16:10:54 +02:00
Morris Jobke 3cfe91bf0f Add shareWith to email template metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-29 16:09:25 +02:00
Jan-Christoph Borchardt 2e6d1a3453 Set primary action button color to same as theming color
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt badbab81ea Update background image to the one used on the website
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-29 16:04:11 +02:00
Joas Schilling 79a7b7f192 Merge pull request #6293 from nextcloud/less-user-enumeration
Return the user id in case of an error
2017-08-29 13:25:24 +02:00
Morris Jobke 7d8b7d4e4e Merge pull request #4925 from nextcloud/error-styling
Improve design and wording of various error messages
2017-08-29 12:03:16 +02:00
Roeland Jago Douma eea7de4c9f 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-08-29 12:03:13 +02:00
Morris Jobke 8c917cbfe0 Merge pull request #6288 from nextcloud/master-6287
Allow the expiration date to be set to null
2017-08-29 11:32:11 +02:00
Joas Schilling 0aff1c9268 Return the user id in case of an error
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-29 11:10:30 +02:00
Björn Schießle 5adc1efe9f Merge pull request #6283 from nextcloud/add-new-propfind
add propfind to detect encryption status
2017-08-29 10:47:33 +02:00
Nextcloud bot daf2d6cb96 [tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Morris Jobke be23f7e1de Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-28 17:49:16 +02:00
Bjoern Schiessle e83e1c7c23 add propfind to detect encryption status
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-28 14:02:25 +02:00
Nextcloud bot 8e4085526d [tx-robot] updated from transifex 2017-08-28 00:08:24 +00:00
Thomas Citharel 2af0c3d928 Move multiple files
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-08-27 15:20:18 +02:00
Roeland Jago Douma a17aba4e23 Merge pull request #6245 from nextcloud/postgres
[Drone] Properly quote "7.0" in drone so it actually runs tests
2017-08-27 14:13:44 +02:00
Roeland Jago Douma df268fef34 Properly quote 7.0 so drone handles it right
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 19:01:56 +02:00
Morris Jobke 34716f99a2 Merge pull request #6263 from nextcloud/scanner-exception-handling
Better handling of errors durring scanning
2017-08-26 19:00:52 +02:00
Robin Appelman 804d97d6ff unlock file when an exception occurs during scanning
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 18:58:06 +02:00
Robin Appelman 18908af87b Dont swallow exception when inserting mimetypes if we're inside a transaction
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 18:58:06 +02:00
Morris Jobke 2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data
Add meta information to emails for better customisation
2017-08-26 18:53:52 +02:00
Morris Jobke 0b652648cc Merge pull request #6177 from nextcloud/properly-add-slo-url
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
2017-08-26 18:50:52 +02:00
Morris Jobke 2966b503ba Merge pull request #6253 from nextcloud/update-synfony-components
update symfony components to 3.3.6
2017-08-26 18:34:30 +02:00
Morris Jobke 92292dc06a Merge pull request #6189 from nextcloud/circle-token
link to getShareByToken
2017-08-26 18:26:12 +02:00
Roeland Jago Douma 85d5a71258 Merge pull request #6182 from nextcloud/fixes-in-files-drop-js
Fixes in files_drop.js
2017-08-26 17:58:30 +02:00
Morris Jobke f0c34a3e89 Allow the expiration date to be set to null
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-26 17:57:24 +02:00
Roeland Jago Douma 141bee931f Merge pull request #6250 from nextcloud/twofactor/provider-custom-csp
Allow 2FA providers to specify their custom CSP
2017-08-26 16:25:41 +02:00
Roeland Jago Douma 6c6253ff6f Bump autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-26 13:48:18 +02:00
Christoph Wurst 6676232a56 Allow 2FA providers to specify their custom CSP
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-08-26 13:48:08 +02:00
Morris Jobke cfe5d35862 Merge pull request #6252 from nextcloud/only_show1_error
Don't try the actual file upload if the checks already error out
2017-08-26 12:46:01 +02:00
Morris Jobke ae1ef85137 Merge pull request #6157 from nextcloud/smb-2.0.2
update icewind/smb to 2.0.2
2017-08-26 12:02:48 +02:00
Roeland Jago Douma 69d2d0178a 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 11:30:04 +02:00
Morris Jobke 4e6343a4fb Merge pull request #6262 from nextcloud/navigation-entries-sort
Fix sorting of entries in Files sidebar
2017-08-26 11:16:39 +02:00
Robin Appelman b477615a41 update symfony components
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-26 11:09:39 +02:00
Robin Appelman 42915b1e8b Fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 10:52:22 +02:00
Robin Appelman 37e8b698f7 cache nodes from search results
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-26 10:18:19 +02:00
Nextcloud bot ca490bafb9 [tx-robot] updated from transifex 2017-08-26 00:08:26 +00:00
Jan-Christoph Borchardt d0d6a92054 Fix sorting of entries in Files sidebar
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 18:40:28 +02:00
Roeland Jago Douma 1682ead807 Merge pull request #6260 from nextcloud/popover-border-radius
Add standard border-radius to datepicker
2017-08-25 15:58:23 +02:00
Roeland Jago Douma f456462dfd Merge pull request #6261 from nextcloud/fix-favorites-permanent
Fix permanent display of favorite icon
2017-08-25 15:57:07 +02:00
Jan-Christoph Borchardt ee69a29f2f Fix permanent display of favorite icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 14:25:21 +02:00
Jan-Christoph Borchardt cd1e384b14 Add standard border-radius to datepicker
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-25 14:08:29 +02:00
Nextcloud bot 7b8bd8188e [tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Morris Jobke 15a29717f1 Merge pull request #6244 from nextcloud/redis_cluster
[drone] Give redis a change to fireup
2017-08-25 00:17:59 +02:00
Roeland Jago Douma 8b29ea53db Merge pull request #6249 from nextcloud/ignore-vscode
Add Visual Studio Code to .gitignore
2017-08-24 19:27:19 +02:00
Roeland Jago Douma f99527ab8b Merge pull request #6251 from nextcloud/get_right_translation
Don't fetch the translation from core but from files
2017-08-24 19:24:07 +02:00
Roeland Jago Douma 3d22e7a6f5 Use a new phpredis
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 19:01:13 +02:00
Björn Schießle 60ee450809 Merge pull request #5870 from nextcloud/generate-system-wide-key-pair
extend the identity proof manager to allow system wide key pairs
2017-08-24 18:36:35 +02:00
Joas Schilling 6a130d01e7 Also for reset password
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 18:02:37 +02:00
Morris Jobke f6f10b5932 Merge pull request #6241 from nextcloud/integration_ram
[drone] Install intergration tests in RAM
2017-08-24 17:55:07 +02:00
Joas Schilling 09747b296a Add meta information to emails for better customisation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-24 17:54:22 +02:00
Robin Appelman 5431b8bfc2 allow configuring the command bus 2017-08-24 16:21:50 +02:00
Robin Appelman 9731350ace split async test bus for easier subclassing 2017-08-24 16:06:37 +02:00
Roeland Jago Douma 5a9a199aaa Don't fetch the translation from core but from files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 14:54:14 +02:00
Jakob Sack af8d93ac02 Add Visual Studio Code to .gitignore 2017-08-24 14:26:44 +02:00
Roeland Jago Douma 8c02bcdeee [drone] Install intergration tests in RAM
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-24 11:04:30 +02:00
Nextcloud bot a7f2dc6dd6 [tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Roeland Jago Douma 697fcc93da Merge pull request #6239 from nextcloud/fix-uploading-message
Show "Uploading..." in web UI for long uploads
2017-08-23 19:15:58 +02:00
Roeland Jago Douma ef223b7760 Give redis a change to fireup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-23 18:19:22 +02:00
Roeland Jago Douma 9357cf735a Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failed
Prevent SQL error message in case of error
2017-08-23 16:49:57 +02:00
Morris Jobke 4225f93818 Merge pull request #6165 from nextcloud/bump-dompurify
Bump DOMPurify
2017-08-23 16:35:27 +02:00
Morris Jobke 57fd256b9a Replace ... with …
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 16:22:11 +02:00
Morris Jobke 591dda2fed 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:59:05 +02:00
Morris Jobke 08b71ca682 Merge pull request #6236 from nextcloud/drone-ci-images
Fix phan test
2017-08-23 15:23:31 +02:00
Morris Jobke e826961a51 Fix phan test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 15:22:28 +02:00
Morris Jobke cba19b96e8 Merge pull request #6229 from nextcloud/drone-ci-images
Use docker images without XDebug and with Opcache
2017-08-23 15:07:44 +02:00
Morris Jobke 0460ee70ef Use docker images without XDebug and with Opcache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-23 14:15:13 +02:00
Morris Jobke 4fcd1450be Merge pull request #6218 from nextcloud/sabre-xml-fix
[3rdparty] Fix sabre/xml empty prop parsing
2017-08-23 11:18:18 +02:00
Nextcloud bot 782f6e9454 [tx-robot] updated from transifex 2017-08-23 00:08:55 +00:00
Roeland Jago Douma 2fcd555783 [3rdparty] Fix sabre/xml empty prop parsing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-22 19:02:42 +02:00
Joas Schilling 48bdb1bec1 Allow to sort groups by name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-22 14:36:00 +02:00
Nextcloud bot ae0789ef43 [tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Morris Jobke e881e01620 Merge pull request #6149 from nextcloud/downstream-26539
Downstream 26539 & 28074 - proper handling of invalid config
2017-08-21 22:11:18 +02:00
Morris Jobke 3168dec332 Merge pull request #6179 from nextcloud/no-password-reset-for-disabled-users
No password reset for disabled users
2017-08-21 17:17:32 +02:00
Morris Jobke a891d24176 Merge pull request #6201 from nextcloud/dropdown-contrast
Increase contrast of dropdown menu text, fix accessibility & visibility issues
2017-08-21 14:09:26 +02:00
Jan-Christoph Borchardt d35e54074b Increase contrast of dropdown menu text, fix accessibility & visibility issues
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-21 12:06:24 +02:00
Lukas Reschke 223265b369 Merge pull request #6169 from nextcloud/check-encoding-log
Ensure log message is UTF-8 encoded
2017-08-21 10:20:52 +02:00
Morris Jobke 2404c854c4 Merge pull request #6194 from nextcloud/proper-l10n-for-app-passwords
Use correct l10n for app password menu
2017-08-21 10:04:13 +02:00
Vincent Petry 2cb3461146 Move GDrive external storage to a separate repo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-21 09:59:10 +02:00
Morris Jobke 6e3b8db98d Merge pull request #6180 from nextcloud/fix-warnings
Fix PHPUnit warnings
2017-08-21 09:25:35 +02:00
Morris Jobke c134afee40 Use correct l10n for app password menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-21 09:18:49 +02:00
Nextcloud bot 9e1884b27c [tx-robot] updated from transifex 2017-08-21 00:08:13 +00:00
Maxence Lange 0459c03696 link to getShareByToken
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2017-08-20 15:21:58 +02:00
Nextcloud bot 8c458de4c2 [tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Nextcloud bot 6b978ebd29 [tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Lukas Reschke f8b4b2c499 Fix PHPUnit warnings
```
1) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #0 (true)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

2) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetForm with data set #1 (false)
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

3) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetSection
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead

4) OCA\FederatedFileSharing\Tests\Settings\AdminTest::testGetPriority
PHPUnit_Framework_TestCase::getMock() is deprecated, use PHPUnit_Framework_TestCase::createMock() or PHPUnit_Framework_TestCase::getMockBuilder() instead
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 15:39:10 +02:00
Lukas Reschke 2e4cd44556 Inject \OCP\IURLGenerator to make tests work
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 15:32:40 +02:00
Daniel Calviño Sánchez 4d003c812d 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-18 15:18:20 +02:00
Daniel Calviño Sánchez 313b824dd7 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-18 15:14:32 +02:00
Daniel Calviño Sánchez c70688e5d0 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-18 14:26:15 +02:00
Daniel Calviño Sánchez 2860ce027a 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-18 14:08:51 +02:00
Joas Schilling d5c6d56170 No password reset for disabled users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-18 13:21:53 +02:00
Lukas Reschke a04feff9a7 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-18 12:22:44 +02:00
Nextcloud bot 231cffffb9 [tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Morris Jobke 0d956cb4aa Merge pull request #6161 from nextcloud/drone-s3
Enable S3 tests on drone again
2017-08-17 19:18:13 +02:00
Lukas Reschke c016b01bf9 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-17 15:01:50 +02:00
Lukas Reschke 3691523203 Bump merged JS
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:33:11 +02:00
Lukas Reschke 9b81763219 Bump DOMPurify to 1.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:29:53 +02:00
Lukas Reschke ed8a98eaa1 Prevent SQL error message in case of error
`\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than
permitted in the database. This is against it's PHPDocs and we should cast this to `false`,
so that the regular error handling triggers in.

The easiest way to reproduce is on MySQL:

1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel
2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again
3. See SQL exception as error message

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:08:40 +02:00
Lukas Reschke e37cf2d6f0 Merge pull request #6158 from nextcloud/always-log-cron-execution
Always log cron execution
2017-08-17 11:14:12 +02:00
Morris Jobke 1c38a83927 Always log cron execution
There was a setting to disable the last execution of cron. There is no known
problem with this write access and it was also questioned when this feature
was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707

Recently there was also a bug report about a non-visible last cron execution
(#6088) - let's better remove this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 09:45:11 +02:00
Morris Jobke 4ee4d15f01 Enable object storage tests again
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 09:40:12 +02:00
Morris Jobke 96a404dfb3 Remove windows config settings in tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 09:39:49 +02:00
Roeland Jago Douma a53aa40b4d Merge pull request #6126 from nextcloud/trigger-search
Trigger search after re-focus
2017-08-17 09:16:13 +02:00
Nextcloud bot 0ceb06fde5 [tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Roeland Jago Douma 6e7865d05b Update to new test case
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-16 21:23:32 +02:00
Roeland Jago Douma 82791b7b06 Public upload share permission handling
If you set the permissions on a public share the SHARE permission makes
no sense. So instead of throwing a warning. Just filter out the share
permission.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-16 21:17:26 +02:00
Robin Appelman db688d0322 update icewind/smb to 2.0.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-16 18:48:07 +02:00
Joas Schilling fff192f78f Merge pull request #6136 from nextcloud/fix_groupmanagement
Fix group management which was broken since #5847
2017-08-16 14:05:48 +02:00
Morris Jobke f0eb882c2e Merge pull request #6146 from nextcloud/downstream-28073
Downstream - removal of outdated API
2017-08-16 11:03:47 +02:00
Vincent Petry 653610559d Bye bye Dropbox v1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-16 11:03:25 +02:00
Morris Jobke 4c558c99f3 Merge pull request #6130 from nextcloud/cleanup-unused-methods
Cleanup unused methods
2017-08-16 08:55:06 +02:00
Nextcloud bot d7406e5159 [tx-robot] updated from transifex 2017-08-16 00:08:33 +00:00
Morris Jobke 8c97218b95 Merge pull request #6128 from nextcloud/primary-font-color-in-capabilities
Add the primary font color to the capabilities as well
2017-08-15 21:27:28 +02:00
Morris Jobke 60a485b80d Merge pull request #6132 from nextcloud/do-not-log-maintenance-mode
Do not log WebDAV maintenance mode exception
2017-08-15 21:26:18 +02:00
Lukas Reschke f698aa11e7 Merge pull request #6101 from cbartz/patch-1
Missing array assignment in Swift.php
2017-08-15 18:17:58 +02:00
Tobia De Koninck 23039e882f Fix group management which was broken since #5847
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-08-15 17:47:54 +02:00
Lukas Reschke 422c3e302a Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-error
Catch exceptions on error of cloud id resolution
2017-08-15 17:04:42 +02:00
Morris Jobke fc12bd0be6 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-08-15 15:03:39 +02:00
Morris Jobke a55e794bfd Cleanup unused methods
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 14:29:26 +02:00
Morris Jobke cf7c4a4439 Merge pull request #6123 from nextcloud/cleanup-shareItem
Cleanup usage of shareItem in internal code base
2017-08-15 13:57:00 +02:00
Morris Jobke c5f14ac884 Merge pull request #6121 from nextcloud/cleanup-registerBackend
Use proper methods for registerBackend
2017-08-15 13:52:49 +02:00
Morris Jobke 49b28ebf84 Merge pull request #6118 from nextcloud/cleanup-checkPasswordProtectedShare
Use proper methods for checkPasswordProtectedShare
2017-08-15 13:52:05 +02:00
Joas Schilling b7b4cfd6a1 Add the primary font color to the capabilities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-15 13:50:08 +02:00
Morris Jobke 5f06380a4f 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:36:51 +02:00
Morris Jobke 8366dfa50b Cleanup usage of shareItem in internal code base
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:57:18 +02:00
Morris Jobke 895b9c2309 Use proper methods for registerBackend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:29:15 +02:00
Morris Jobke 3e13e94254 Use proper methods for checkPasswordProtectedShare
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:28:05 +02:00
Morris Jobke c5c23b30b9 Merge pull request #6116 from nextcloud/cleanup-unused-methods
Cleanup unused methods
2017-08-15 11:26:26 +02:00
Morris Jobke f640b56bfa Cleanup unused methods
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 10:09:47 +02:00
Nextcloud bot cc40f02684 [tx-robot] updated from transifex 2017-08-15 00:08:15 +00:00
Joas Schilling bd6524455b Document that it throws
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-14 22:20:57 +02:00
Joas Schilling 2e73112256 Catch exceptions on error of cloud id resolution
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-14 22:20:57 +02:00
Roeland Jago Douma e0f479a4eb Merge pull request #6098 from nextcloud/fix-federation-scope
Fix federation scope dropdown
2017-08-14 19:24:27 +02:00
Christopher Bartz bbd8797f1e 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-08-14 17:35:04 +02:00
Morris Jobke 5b2d6b080f Merge pull request #6080 from nextcloud/header-bottom-border
Add buttom border for header
2017-08-14 17:29:03 +02:00
Robin Appelman ca3aef0486 Merge pull request #5872 from nextcloud/swift-filter-dot
Filter magic dot object when swift directory
2017-08-14 15:11:53 +02:00
Morris Jobke 317521c7e7 Merge pull request #6091 from nextcloud/authpage-design
Add heading to account access page
2017-08-14 14:27:09 +02:00
Morris Jobke 95b7fa306e Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missing
Make sure the accounts table exists
2017-08-14 12:14:09 +02:00
Morris Jobke 44c6745159 Remove quotes around device name
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 11:48:56 +02:00
Morris Jobke ba8d26a150 Merge pull request #6090 from nextcloud/federationscope-title-bold
Bold federation scope title in dropdown menu, as intended
2017-08-14 11:47:47 +02:00
Morris Jobke 3d1f6a041d Fix federation scope dropdown
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 11:16:24 +02:00
Morris Jobke 228baa45fd Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 11:11:18 +02:00
Morris Jobke bd43758118 Highlight client identifier in auth grant page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-14 10:42:19 +02:00
Joas Schilling 1c2f628d8e Fix headers
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-14 09:53:48 +02:00
Joas Schilling 601f795122 Make sure the accounts table exists
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-14 09:52:41 +02:00
Morris Jobke 995ddc61d1 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 09:40:55 +02:00
Nextcloud bot d1f3e1de96 [tx-robot] updated from transifex 2017-08-14 00:08:21 +00:00
Nextcloud bot ded780a45a [tx-robot] updated from transifex 2017-08-13 00:08:14 +00:00
Jan-Christoph Borchardt ebdfcb1fe3 Add heading to account access page
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-12 19:29:49 +02:00
Jan-Christoph Borchardt faea9cb294 Shorten text of untrusted domain error
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-12 19:01:42 +02:00
Morris Jobke 83b0191017 fix design of the track trace
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-12 18:48:48 +02:00
Jan-Christoph Borchardt 9f67fb86c8 Improve design of various error messages
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-12 18:48:48 +02:00
Jan-Christoph Borchardt 04d6dfa67c Bold federation scope title in dropdown menu, as intended
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-08-12 15:48:15 +02:00
Roeland Jago Douma 6b5c6e580b Merge pull request #6084 from nextcloud/brand-it
Brand it 🙈
2017-08-12 10:31:47 +02:00
Nextcloud bot a2e3c8ede5 [tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Lukas Reschke e9ab7e4fc6 Brand it 🙈
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-11 15:47:24 +02:00
Lukas Reschke 1c88e59930 Merge pull request #5861 from nextcloud/shareinfo
Move shareinfo over to proper controller
2017-08-11 14:02:43 +02:00
Nextcloud bot c9612b9324 [tx-robot] updated from transifex 2017-08-11 00:08:20 +00:00
Roeland Jago Douma 8ea434d2d0 Merge pull request #6004 from nextcloud/forward-5902-repair-drop-account-terms-on-oc-migration
[13] Repair step: drop account terms on oc migration
2017-08-10 21:18:06 +02:00
Morris Jobke 43facdb95f Merge pull request #5616 from nextcloud/ldap-wizard-remove-LDAPTLS_REQCERT-attempt
LDAP Wizard: do not attempt to recognise cert issue by using LDAPTLS_REQCERT
2017-08-10 21:06:14 +02:00
Morris Jobke d3cb4a7965 Merge pull request #6065 from nextcloud/mysql5.5
Add CI job for mysql 5.5
2017-08-10 18:12:42 +02:00
Roeland Jago Douma 685f272212 Add unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 16:25:58 +02:00
Roeland Jago Douma 31af5cc321 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 14:27:35 +02:00
Roeland Jago Douma d34bd3f17c Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 14:27:35 +02:00
Bjoern Schiessle bae5be3dc1 add prefix to user and system keys to avoid name collisions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
Bjoern Schiessle 9524badccc extend the identity proof manager to allow system wide key pairs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
Roeland Jago Douma ca121b7561 Merge pull request #5981 from nextcloud/fix-preview-of-theming
Fix preview of theming
2017-08-10 14:23:03 +02:00
Roeland Jago Douma c9d2e31d52 Remove old code + add Middleware
* Add proper middleware for shareinfo
* Remove old shareinfo routes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:09 +02:00
Roeland Jago Douma 8a539ec0f6 Move shareinfo over to proper controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:06 +02:00
Morris Jobke f8d5dbcdb5 Add CI job for mysql 5.5
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-10 13:49:01 +02:00
Roeland Jago Douma cc0c430d25 Merge pull request #6056 from nextcloud/mysql5.6
Add CI job for mysql 5.6
2017-08-10 13:46:25 +02:00
Daniel Calviño Sánchez b16ce1b4ba Fix preview of theming
Pull request #5429 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 12:37:58 +02:00
Daniel Calviño Sánchez 5999b212d1 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 12:37:57 +02:00
Daniel Calviño Sánchez db52e861dd Provide "server.css" URL in ThemingController response
Pull request #5429 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 12:37:57 +02:00
Daniel Calviño Sánchez 986dffdae4 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 12:37:57 +02:00
Daniel Calviño Sánchez d7e45d45c4 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 12:37:57 +02:00
Daniel Calviño Sánchez 0c8627a7ee 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 12:37:57 +02:00
Daniel Calviño Sánchez 63004c8ce5 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 12:37:56 +02:00
Joas Schilling b9b88aa666 Don't lock in the appdata_ directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-10 12:35:33 +02:00
Joas Schilling 5515c7b2c0 Still throw a locked exception when the path is not relative to $user/files/
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-10 11:58:01 +02:00
Morris Jobke 3dc1bcd4c1 Merge pull request #6052 from nextcloud/fix_jail_copy
Fix copy from jailed storage
2017-08-10 10:21:56 +02:00
Roeland Jago Douma 073216e827 Merge pull request #6057 from nextcloud/fix-require-once
Fix require once for actionInclude
2017-08-10 07:52:21 +02:00
Nextcloud bot 0ef9f943b2 [tx-robot] updated from transifex 2017-08-10 00:08:15 +00:00
Morris Jobke 5aa25fcdd5 Fix require once for actionInclude
* regression from #5791

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:51:49 +02:00
Morris Jobke 7904404842 Add CI job for mysql 5.6
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:17:25 +02:00
Morris Jobke 0b1a1a58e6 Merge pull request #6051 from nextcloud/redis-cluster
Enable redis cluster CI step
2017-08-09 23:03:50 +02:00
Morris Jobke f83a783d91 Fix redis-cluster support on drone
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 22:45:25 +02:00
Morris Jobke 3b955a1625 Merge pull request #5791 from nextcloud/add-php7.2-tests
[CI] Add PHP 7.2 testing container
2017-08-09 22:08:02 +02:00
Roeland Jago Douma c6f6413bb1 Fix ldap tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 21:10:15 +02:00
Roeland Jago Douma c81e79f8b9 Fix files_sharing CacheTests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:15:27 +02:00
Roeland Jago Douma 1ea7f14f0a Fix SessionTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:13:54 +02:00
Roeland Jago Douma 26bf0ca9d4 Fix RepairMimeTypeTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:04:57 +02:00
Roeland Jago Douma db27bbf90d Fix CacheTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:01:09 +02:00
Roeland Jago Douma ba7cf03daf Fix LostControllerTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:13 +02:00
Roeland Jago Douma 9717cdfb9e If there is no content don't error
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:13 +02:00
Roeland Jago Douma 459ae6d94a User proper anonymous function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:12 +02:00
Roeland Jago Douma 8b0051eb40 Fix encryption test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:08 +02:00
Roeland Jago Douma 3bd104ef7c Fix LoginController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:12:02 +02:00
Lukas Reschke 70d42afb93 Use non-deprecated INTL_IDNA_VARIANT_UTS46
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
Lukas Reschke c78e999b21 Make definition compatible
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:02 +02:00
Lukas Reschke 0857780eb0 Update PHP 7.2 container
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:01 +02:00
Lukas Reschke e9dc4f107a Make declaration compatible
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:01 +02:00
Lukas Reschke db6d785644 Add PHP 7.2 testing container
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-09 15:12:01 +02:00
Morris Jobke e08768ee04 Merge pull request #6047 from nextcloud/fix-6017-select-indexed-columns
Use indexed column path_hash to find the parent
2017-08-09 13:53:23 +02:00
Morris Jobke c2f7396d6b Merge pull request #6031 from nextcloud/master-5937
display error icon on non-success
2017-08-09 13:44:34 +02:00
Morris Jobke bcfaaf5294 Merge pull request #6048 from nextcloud/fix-migration-generation
Fix typo in template for migration generation
2017-08-09 13:42:36 +02:00
Morris Jobke 576f370ddc Merge pull request #6009 from nextcloud/symfony_translations
Use symfony/translation for L10N plurals
2017-08-09 13:41:10 +02:00
Morris Jobke 395325d5c5 Merge pull request #6049 from nextcloud/drone-update
Update syntax to drone 0.8
2017-08-09 12:30:12 +02:00
Roeland Jago Douma ace7b69aa7 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-09 11:56:31 +02:00
Marin Treselj 09d77b8973 Display success and error icons
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-09 11:12:48 +02:00
Morris Jobke 428b8b53a5 Update syntax to drone 0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 11:10:21 +02:00
Joas Schilling f877096a28 Fix typo in template for migration generation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-09 11:01:08 +02:00
Joas Schilling 66b61eb67d Use indexed column path_hash to find the parent
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-09 10:56:16 +02:00
Nextcloud bot 8549fcf6e4 [tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Lukas Reschke 9707ef9ba7 Merge pull request #5982 from nextcloud/fix-loading-icon-inside-upload-button-in-theming-app
Fix loading icon inside upload button in Theming app
2017-08-08 18:41:57 +02:00
Maxence Lange efa062e5ff display error icon on non-success
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-08-08 16:30:48 +02:00
Morris Jobke d7645ee928 Merge pull request #5972 from nextcloud/replace-loading-icon-gif-with-pure-css-in-login-button
Replace loading icon GIF with pure CSS in login button
2017-08-08 14:40:35 +02:00
Nextcloud bot 481002a00b [tx-robot] updated from transifex 2017-08-08 00:08:10 +00:00
Roeland Jago Douma ed3b391e47 Use symfony/translation for L10N plurals
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-07 19:53:36 +02:00
Daniel Calviño Sánchez 2398e845c9 Fix loading icon inside upload button in Theming app
Pull request #5969 fixed the vertical alignment of loading icon and
status message in Theming app, but in doing so it broke the loading icon
inside the upload button.

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.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:04:43 +02:00
Daniel Calviño Sánchez 92d28fdc68 Ignore clicks on login button icon so they are received by the button
Visually, the icon positioned on the login button is part of the login
button, so clicking on the icon should be the same as clicking on the
button. As the icon is a different element this commit sets the icon to
ignore mouse events so they are received and handled by the login button
instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:28:04 +02:00
Joas Schilling 43a6ba899e Use the existing array of OC versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-07 12:09:05 +02:00
Joas Schilling 40b47f13df Add a repair step to drop the account_terms table on oc migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-07 12:08:36 +02:00
Morris Jobke de911f6e5c Merge pull request #5998 from nextcloud/drone_mysqlmb4_71
Add mysqlmb4 php7.1 drone job
2017-08-07 08:48:23 +02:00
Roeland Jago Douma e64ba1d343 Add mysqlmb4 php7.1 drone job
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 20:13:04 +02:00
Morris Jobke 7a3d746d0d Merge pull request #5997 from nextcloud/drone_mysqlmb4_70
Add myslqmb4 php 7.0 drone
2017-08-06 14:44:28 +02:00
Roeland Jago Douma 68d6e788e4 Add myslqmb4 php 7.0 drone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 13:07:34 +02:00
Morris Jobke 1247bd8755 Merge pull request #5995 from nextcloud/drone_mysql_71
Add PHP 7.1 mysql job to drone
2017-08-06 12:32:59 +02:00
Roeland Jago Douma 5164f25a54 Add PHP 7.1 mysql job to drone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-06 10:45:10 +02:00
Roeland Jago Douma 2d7e7212fa Merge pull request #5990 from nextcloud/drone_mysql_70
Also run mysql test on php7.0
2017-08-06 10:35:57 +02:00
Nextcloud bot eb2442b871 [tx-robot] updated from transifex 2017-08-06 00:08:24 +00:00
Roeland Jago Douma c0f9a397d7 Also run mysql test on php7.0
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-05 19:59:37 +02:00
Nextcloud bot 21f2fe5cb9 [tx-robot] updated from transifex 2017-08-05 00:08:08 +00:00
Morris Jobke 3e091b5294 Merge pull request #5550 from andreasjacobsen93/clean-settings-layout
Cleaned up personal settings page
2017-08-04 23:30:52 +02:00
Morris Jobke de94eefe97 Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
Fix vertical alignment of loading icon and status message in Theming app
2017-08-04 12:08:16 +02:00
Lukas Reschke 3266e81577 Merge pull request #5954 from nextcloud/textpreview_range
Do not fetch the whole text file for the sidebar preview
2017-08-04 11:23:42 +02:00
Lukas Reschke a1d44a7206 Merge pull request #5963 from nextcloud/pre_post_share_events
Move pre_shared and post_shared events to EventDispatcher
2017-08-04 11:18:53 +02:00
Morris Jobke 90d8070da3 Merge branch 'master' into clean-settings-layout 2017-08-04 11:11:33 +02:00
Morris Jobke d63beffe9e Merge pull request #5967 from nextcloud/revert-5682-inline-svg-icon
Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"
2017-08-04 10:53:21 +02:00
Marin Treselj 54444110d9 Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextcloud-server into clean-settings-layout 2017-08-04 10:23:52 +02:00
Marin Treselj a4d9845326 Fix federation icon menu and container paddings.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-04 10:22:03 +02:00
Nextcloud bot 1f8a45bbd7 [tx-robot] updated from transifex 2017-08-04 00:08:18 +00:00
Daniel Calviño Sánchez b237379fa1 Replace loading icon GIF with pure CSS loading icon
The pure CSS loading icon uses an ::after pseudo-element, and thus it
can only be used on container elements; the input element is not a
container element, so when the class "icon-loading-small" is set on an
input element it falls back to a loading icon GIF.

This commit modifies the markup of the login button to add a div element
that holds the confirm icon and the loading icon (depending on the
case). In order to position the icon in the same place as before the
input and the icon are both wrapped by another div making possible to
set the absolute position of the icon relative to the input.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:43 +02:00
Daniel Calviño Sánchez 09a8c4a5d4 Fix code style
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez c723d093a8 Remove superfluous selector part
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-03 21:09:25 +02:00
Daniel Calviño Sánchez 4fbcbd3e6d 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-03 21:09:25 +02:00
Daniel Calviño Sánchez fa7f4e5cae Do not use the same rules for loading icon than for upload icon
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-03 21:09:25 +02:00
Daniel Calviño Sánchez 33c4a674a2 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-03 21:09:25 +02:00
Roeland Jago Douma 3aa819c62c Do not fetch the whole text file for the sidebar preview
Just fetch the first 10kb. This should be more than enough in 99% of the
cases. And avoid downloading a 10mb text file just to display a tiny
portion.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 20:32:59 +02:00
Joas Schilling 9abbd6ab13 Revert "Proof of concept #5593 - inline SVG icon for icon-contacts" 2017-08-03 17:27:24 +02:00
Roeland Jago Douma 4633717f04 Move pre_shared and post_shared events to EventDispatcher
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 15:14:29 +02:00
Morris Jobke ac4927809c Merge branch 'master' into clean-settings-layout 2017-08-03 15:07:42 +02:00
Morris Jobke bb865a55fe Merge pull request #5738 from nextcloud/comradekingu-patch-3
Spelling: UID
2017-08-03 14:28:41 +02:00
Marin Treselj 7de9eb16d8 Reintroduce a more compact grid.
Overrides core `.section` values.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 13:12:00 +02:00
Marin Treselj 7284458e24 Clean up HTML structure, fix labels.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-03 12:51:27 +02:00
Morris Jobke 8fecc336ac Merge pull request #5959 from nextcloud/drop-logo-claim
Logo claim is not used anymore
2017-08-03 08:20:56 +02:00
Nextcloud bot 21dd85678f [tx-robot] updated from transifex 2017-08-03 00:08:06 +00:00
Lukas Reschke ea2e629c6c Merge pull request #5953 from nextcloud/theming-lightness-correction
Use same lightness calculation as the SCSS compiler for theming
2017-08-02 23:17:19 +02:00
Morris Jobke 585e5c6ea5 Logo claim is not used anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
Morris Jobke c40352c030 Merge pull request #5816 from nextcloud/fix-oracle
Fix oracle
2017-08-02 20:54:58 +02:00
Morris Jobke a0939f78b3 Merge pull request #5682 from nextcloud/inline-svg-icon
Proof of concept #5593 - inline SVG icon for icon-contacts
2017-08-02 20:49:45 +02:00
Marin Treselj c658862052 Replace include with file_get_contents
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
Marin Treselj ffcdc96a0b Proof of concept #5593 - inline SVG icon for icon-contacts
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 18:27:24 +02:00
Allan Nordhøy 2fcf4f2f29 Improve spelling in LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 18:12:31 +02:00
Morris Jobke 6ca4b9eee9 Merge pull request #5920 from nextcloud/gallery-share-view-fix
Top bar buttons in share view are wrong positioned
2017-08-02 16:59:24 +02:00
Morris Jobke 6290ba8299 Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
Morris Jobke 1a711b1e73 Merge pull request #5956 from nextcloud/proper-update-notification-layout
Improve update notification layout and show non-default update server
2017-08-02 16:26:57 +02:00
Roeland Jago Douma fbfd371493 Merge pull request #5923 from nextcloud/expire-federation-jobs
Expire federation jobs
2017-08-02 16:15:28 +02:00
Morris Jobke d7d2d7c803 Merge pull request #5952 from nextcloud/appmanager-isshipped
Use public methods for OC_App::isShipped
2017-08-02 16:15:02 +02:00
Marin Treselj 717a44f161 Make sure this still works in other apps.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-08-02 15:57:53 +02:00
Joas Schilling 4ca4b270e7 Close all the cursors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:35:14 +02:00
Joas Schilling 81c54ea515 Use automatic injection whenever possible
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 14:34:51 +02:00
Morris Jobke 9391d8fc60 Improve update notification layout and show non-default update server
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 13:56:36 +02:00
Morris Jobke a96c651935 Merge pull request #5949 from nextcloud/fix-broken-code
Use IUser
2017-08-02 13:54:45 +02:00
Morris Jobke 30a7030820 Merge pull request #5957 from nextcloud/updatenotification-show-status
Show correct status in update notification
2017-08-02 13:53:50 +02:00
Lukas Reschke bc9eb59384 Use IUser
This is broken and will never work as the phan CI step pointed out.

Pro-tip of the day: Check why CI fails before merging 🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-02 13:25:22 +02:00
Morris Jobke 7f2e9d10a3 Show correct status in update notification
Sometimes it could be the case that after a channel change the last updated
timestamp is reset, but the check for updates is not yet completed. In this
case the update notification showed "You are up to date" and the date was
"1970-01-01 00:00:00". With this fix the state is properly shown.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 10:45:26 +02:00
Joas Schilling 78412fda9c Add a method to compare empty strings with an expression
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:50:41 +02:00
Joas Schilling 100fe07f5d Fix repair step for oracle...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling 2f8756754f Fix last failures with oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling 293dea0625 Fix querybuilder and functionbuilder tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling bb58667511 Fix ILIKE regex for oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling fc22a2cb07 Fix auth provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling a5b0308713 Use selectAlias()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling 20f8d1094a Can not insert auto increment on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling 106df7bc33 Fix missing escape on column and table name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Joas Schilling a76d4ef04e Fix clob comparison
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
Joas Schilling 3b648645f4 Allow to specify the table space on occ
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
Joas Schilling 8ec6c1f259 Quote aliases as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:15 +02:00
Joas Schilling b29baababd Oracle does not support PDO::FETCH_KEY_PAIR
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:12 +02:00
Morris Jobke 45d080d70e Merge pull request #5951 from nextcloud/use-public-method
Use public API instead of private
2017-08-02 09:27:34 +02:00
Nextcloud bot 2800e017de [tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Morris Jobke 3f0f18b4c4 Merge pull request #5948 from nextcloud/remove-explicit-declaration
Remove explicit type hints for Controller
2017-08-01 20:12:02 +02:00
Julius Härtl 9cd21bbe8a Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-01 18:09:07 +01:00
Morris Jobke cd02b2205e Use public methods for OC_App::isShipped
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 18:57:00 +02:00
Lukas Reschke 21d1d05667 Use public API instead of private
The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work.

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

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 18:19:28 +02:00
Lukas Reschke f93a82b8b0 Remove explicit type hints for Controller
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
Robin Appelman 578e4f9903 Filter magic dot object when swift directory
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-08-01 14:57:33 +02:00
Morris Jobke 84c22fdeef Merge pull request #5907 from nextcloud/add-metadata-to-throttle-call
Add metadata to \OCP\AppFramework\Http\Response::throttle
2017-08-01 14:43:47 +02:00
Morris Jobke 6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
Joas Schilling a20934227c Remove undocumented config
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:59:10 +02:00
Joas Schilling c23c05d4f6 Fix versions app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:57:08 +02:00
Joas Schilling 231bb47ae6 Fix file size comparison
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling d703744d4a Fix comparisions in the trashbin app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling 80febeae21 Fix comparisons in the sharing app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling 7a62fbd205 Fix comparisons in the files external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling e30287cf81 Fix comparisons in the files app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling 45e2c415d4 Fix comparison in the ldap app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling 1e2de86c3a Fix comparisons in the versions app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Joas Schilling 89238164e1 Fix comparisons in the dav app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:55:07 +02:00
Joas Schilling 0ebdf871e0 Fix comparisons in encryption app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +02:00
Morris Jobke 050fa63380 Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displayname
Remove setUidAsDisplayName
2017-08-01 13:28:27 +02:00
Roeland Jago Douma c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share
Send an email once a file/folder is shared with a user
2017-08-01 13:27:15 +02:00
Roeland Jago Douma e73fdad88c Merge pull request #5943 from nextcloud/update-URLs-in-tests
Update the URLs in tests to use example.org
2017-08-01 13:11:10 +02:00
Lukas Reschke f396f803ad Merge pull request #5942 from nextcloud/typo-tRicks
Fix typo ticks to tRicks
2017-08-01 11:26:55 +02:00
Roeland Jago Douma bc54e6ff7c Use ITimeFactory
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 11:23:40 +02:00
Morris Jobke 582fb5d129 Update the URLs in tests to use example.org
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 11:16:04 +02:00
Jos Poortvliet a69bbd7ffb Update server.php
Typo: tips and tRicks ...

Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
2017-08-01 10:19:01 +02:00
Bjoern Schiessle 3ffff08819 we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 80c08e8fd0 update unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 9c9cb1a6db cleanup constructors
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 06b9e58081 expire requestSharedSecret job after 30 days
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:53 +02:00
Bjoern Schiessle 51d85eb2f8 expire getShareadSecret job after 30 days
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-01 10:07:51 +02:00
Roeland Jago Douma 2b895e0c60 Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2
Phan fixes
2017-08-01 09:25:09 +02:00
Roeland Jago Douma 2fae696d35 Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma 61a6adff14 Fix sabre test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma a5feb51a6a Fix OCS Exception
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma ede15f0988 Fix L10N::t
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma fd465d4e49 [files_external] Fix phpdoc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma fc369dd86e [DAV] Fix URLUtil::splitPath usage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:17 +02:00
Roeland Jago Douma f57a3aa81b [DAV][CalDAV] Fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Roeland Jago Douma 201bbb962c Fix Comments
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Roeland Jago Douma 19b039e6e0 [files_external] fix commands
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Roeland Jago Douma b7c8e9ed88 [files_external] Fix phpdoc
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
Lukas Reschke 0fa49db770 Some more invalid PHPDocs in legacy classes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke 66b8208791 Function also accepts ints
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke fd059a25d3 Properly name variable
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke 6fb84ebb71 null is a valid parameter
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke dfd8125aeb Replace wrong PHPDocs
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke 10414d2e7d Properly suppress
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke 4166d61ce6 Fix MigrationSchemaChecker and CryptoWrapper
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke b53c4c0db9 Fix template functions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke a4ffbc09ec Fix lib/public/User.php
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:16 +02:00
Lukas Reschke c25e782dd6 Fix settings/Controller/
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Roeland Jago Douma e1da8a769b AppData is no longer internal
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:15 +02:00
Roeland Jago Douma 75771a108b Fix OCSController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:15 +02:00
Roeland Jago Douma e945f2bc3a Fix ContactsMenuController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:15 +02:00
Roeland Jago Douma aa6d8fcdbf Fix AvatarController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:15 +02:00
Lukas Reschke d321e9792e Add |null to PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke 28098a7602 Fix \OCP\Util
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke 80b649c471 Suppress deprecated function in \OCP\JSON
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke 5424d6a40d Add proper PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke b4d4db0e39 Take IUser instead of User
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke 084bac3530 Return '0' instead of null
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:15 +02:00
Lukas Reschke e1f52fc901 Stricter phan config fixes
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 08:20:13 +02:00
Nextcloud bot 456392e627 [tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Roeland Jago Douma fa2f122e09 Merge pull request #5890 from nextcloud/fix-403-and-404-redirect
Fix 403 and 404 redirect
2017-07-31 22:14:52 +02:00
Roeland Jago Douma f71dc7523f Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Roeland Jago Douma 3548603a88 Fix middleware implementations signatures
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Roeland Jago Douma 72eb610b3d Prop argument type for Middleware
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Roeland Jago Douma 973b859cdd Merge pull request #5910 from benediktg/test-php-7.1
Also test PHP 7.0 with PostgreSQL
2017-07-31 16:18:48 +02:00
Lukas Reschke bef4f015ee Remove setUidAsDisplayName
This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-31 15:52:53 +02:00
Marin Treselj f53db38c03 Change id to class in the main share template
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-31 12:19:19 +02:00
Benedikt Geissler 8a3f3e8c4a Drop PHP 7.1 test
Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
2017-07-31 12:12:55 +02:00
Benedikt Geissler ade7d89e36 Also test PHP 7.0 and 7.1 with PostgreSQL
Signed-off-by: Benedikt Geissler <benedikt@g5r.eu>
2017-07-31 12:12:55 +02:00
Morris Jobke 7b2c08a31a Merge pull request #5905 from nextcloud/ocp-config
Use IConfig instead of static OCP\Config
2017-07-31 10:54:40 +02:00
Roeland Jago Douma 3c4ac6060a Merge pull request #5908 from nextcloud/add-css-icon
Add css class for toogle preview icon
2017-07-31 08:59:36 +02:00
Roeland Jago Douma baee0b4bcc Merge pull request #5913 from nextcloud/fix-anchor-name
Fix anchor name for federated sharing settings
2017-07-31 08:51:23 +02:00
Roeland Jago Douma 13469ec49c Merge pull request #5922 from nextcloud/master-add-brackets-on-concat-method
[master]Add brackets around concat statements so comparing the result works as intended
2017-07-31 08:49:59 +02:00
Morris Jobke a309fa7d6b Disable default activity email for incoming shares
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-31 08:19:54 +02:00
Nextcloud bot 97d06a7698 [tx-robot] updated from transifex 2017-07-31 00:08:02 +00:00
Nextcloud bot 98b664a000 [tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot b43abf7512 [tx-robot] updated from transifex 2017-07-29 00:08:31 +00:00
Joas Schilling 50912fb94f Add brackets around concat statements so comparing the result works as intended
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-28 15:36:26 +02:00
Marin Treselj 086ce709f7 Fixes nextcloud/gallery#269
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-28 14:44:29 +02:00
Morris Jobke 09e7d12157 Merge pull request #5915 from nextcloud/update-drone
Update drone
2017-07-28 12:15:40 +02:00
Morris Jobke c85b7e6ae3 Move all DB tests to top, because they are long running
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 09:21:24 +02:00
Morris Jobke 0948365809 Update all drone images to latest version
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 09:20:28 +02:00
Morris Jobke c43abe43b0 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-07-28 08:36:11 +02:00
Morris Jobke fae327799b Fix anchor name for federated sharing settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-28 08:21:25 +02:00
Nextcloud bot baa6db3539 [tx-robot] updated from transifex 2017-07-28 00:08:05 +00:00
Morris Jobke dc58206ded Merge pull request #5852 from nextcloud/preview_trash_cleanup
Preview trash cleanup
2017-07-27 17:24:47 +02:00
Morris Jobke 2bc924af96 Add css class for toogle preview icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-27 17:13:12 +02:00
Morris Jobke c7757b07f8 Merge pull request #5644 from nextcloud/add-occ-app-install
add occ app:install command
2017-07-27 15:36:30 +02:00
Lukas Reschke f22ab3e665 Add metadata to \OCP\AppFramework\Http\Response::throttle
Fixes https://github.com/nextcloud/server/issues/5891

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-27 14:17:45 +02:00
Morris Jobke c27498db71 Use IConfig instead of static OCP\Config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-27 13:43:18 +02:00
Morris Jobke 63aa12e38c Merge pull request #5895 from nextcloud/fix-password-change
Fix show password button for password change
2017-07-27 13:29:13 +02:00
Nextcloud bot 65ade4b6d5 [tx-robot] updated from transifex 2017-07-27 00:08:03 +00:00
Morris Jobke 8f0a0c805e 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:54:23 +02:00
Morris Jobke 50b355fa84 Merge pull request #5614 from nextcloud/fix-enabling-external-storage-via-web
Allow to enable the external storage app via the web ui
2017-07-26 22:30:29 +02:00
Lukas Reschke eb8cd4b80e Merge pull request #5888 from nextcloud/overlay-on-show-password
This fix the overlay of the complexity bar
2017-07-26 16:55:54 +02:00
Morris Jobke 3aa5010714 Merge pull request #5874 from nextcloud/edu-edition
Add new bundle
2017-07-26 16:46:08 +02:00
Morris Jobke 0de90cfc67 Fix 403 and 404 redirect
* Nextcloud is not properly loaded in the standalone version (especially the theming)
* it is already not listed anymore in the Nginx config (see nextcloud/documentation#392)
* the index.php-free version doesn't support this

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 16:30:09 +02:00
Maxence Lange a8f4b33cd5 This fix the overlay of the complexity bar
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-26 16:05:31 +02:00
sualko 4868e191d7 update autoloader
Signed-off-by: sualko <klaus@jsxc.org>
2017-07-26 15:25:02 +02:00
sualko 7720e19e10 add namespace
Signed-off-by: sualko <klaus@jsxc.org>
2017-07-26 15:24:24 +02:00
sualko 3e62a25155 add occ app:install command
Signed-off-by: Klaus Herberth <klaus@jsxc.org>
2017-07-26 14:35:42 +02:00
Joas Schilling 28290d8691 Allow to enable the external storage app via the web ui
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-26 14:30:21 +02:00
Morris Jobke 174cd4f478 Merge pull request #5871 from nextcloud/drone-postgres
Drone postgres
2017-07-26 14:16:50 +02:00
Lukas Reschke 013d7483bf Add new bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 11:49:03 +02:00
Nextcloud bot da31a30edb [tx-robot] updated from transifex 2017-07-26 00:08:06 +00:00
Lukas Reschke 3faef644a1 Merge pull request #5864 from nextcloud/legacy_user
Remove legacy OC_User_Backend and OC_User_Interface
2017-07-25 17:15:11 +02:00
Lukas Reschke 63676d3b24 Merge pull request #5836 from nextcloud/preview_update
Empty search no longer works
2017-07-25 17:08:31 +02:00
Lukas Reschke 68c4fc2506 Merge pull request #5772 from nextcloud/migrations-install
Install nextcloud via migrations instead of the db_structure.xml
2017-07-25 16:57:13 +02:00
Morris Jobke c191e12da4 Enable postgres on drone again
* use proper password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 13:48:28 +02:00
Joas Schilling d254797f56 Trigger update to run the migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:16 +02:00
Joas Schilling 41fca6c852 "Only variables must be passed by reference"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:16 +02:00
Joas Schilling b729cc2a02 Add *lob support for all tables
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:15 +02:00
Joas Schilling 087138f228 use template placeholders instead of html
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:15 +02:00
Joas Schilling e023899078 Always order by all values, to make sure all entries are copied correctly
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:15 +02:00
Joas Schilling 1b7c1ad5c0 Only migrate to the current state
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:15 +02:00
Joas Schilling 10d7cbb71f Use order by to avoid problems when chunking finds a same item again...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:49:12 +02:00
Joas Schilling 0a0dbbdf15 Remove generate change script which doesnt work with migrations anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Joas Schilling 3fedfe67b9 Use default connection parameters for utf8 4byte support
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Joas Schilling 42ed7a18cc Skip migrations table because it was already done when creating the schema
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Joas Schilling 1d56b52761 Use migrations on convert
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Joas Schilling 9307aaee49 Core is converted, so this is dead code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Joas Schilling 242c9ee06c No more root file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:39 +02:00
Morris Jobke 5308bd3378 Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 12:47:39 +02:00
Joas Schilling 5e04254d40 Install from migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:47:37 +02:00
Joas Schilling f6c48b1548 Add a script to generate a migration from database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-25 12:45:38 +02:00
Morris Jobke 8d751ff2b4 Merge pull request #5825 from nextcloud/more-move-tests
add tests for renaming paths with multibyte utf8 characters
2017-07-25 10:32:33 +02:00
Lukas Reschke 8521e79e76 Merge pull request #5863 from nextcloud/pimp_l10n_string
Move \OC_L10N_String to proper namespace
2017-07-25 10:29:08 +02:00
Morris Jobke 89a7b007f2 Fix comments
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-25 08:57:58 +02:00
Nextcloud bot 11e182fff2 [tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Roeland Jago Douma b930f32e89 Remove legacy OC_User_Backend and OC_User_Interface
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 20:42:55 +02:00
Roeland Jago Douma 52b8542364 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 20:18:16 +02:00
Roeland Jago Douma a907720817 Move \OC_L10N_String to proper \OC\L10N\L10NString
* Proper namespacing
* Fixed phpdocs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 20:17:20 +02:00
Morris Jobke 5dc480a38c Merge pull request #5857 from nextcloud/database-exception-cleanup
Remove unneeded parameter in DatabaseException
2017-07-24 16:14:53 +02:00
Morris Jobke e785b849c7 Merge pull request #5835 from nextcloud/cleanup_testing_app
Cleanup testing app
2017-07-24 15:03:15 +02:00
Morris Jobke c775d5e497 Merge pull request #5514 from nextcloud/assembly-stream-seek
refactor chunked assembly stream
2017-07-24 15:00:03 +02:00
Morris Jobke c43d479372 Merge pull request #5855 from nextcloud/cleanup-legacy-user-class
Cleanup legacy user class from unused methods
2017-07-24 14:39:18 +02:00
Morris Jobke 184f25c0d6 Merge pull request #5854 from nextcloud/improve-personal-page-code
Cleanup code of personal page to use public interfaces
2017-07-24 14:38:05 +02:00
Morris Jobke 5bc0edbd29 Merge pull request #5844 from nextcloud/phpstorm_inspect2
More phpstorm inspection fixes
2017-07-24 13:54:30 +02:00
Morris Jobke 71f1ef9c1d Merge pull request #5845 from nextcloud/phpstorm_inspect3
Some app fixes of phpstorm inspections
2017-07-24 13:50:27 +02:00
Morris Jobke b8ed028870 Remove unneeded parameter in DatabaseException
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 13:44:12 +02:00
Roeland Jago Douma 25c36be901 Proper DI for ILockingProvider
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:44:09 +02:00
Roeland Jago Douma 7f6a72b65d Move over locking controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:44:03 +02:00
Roeland Jago Douma 10efec246d Move over Config
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:43:00 +02:00
Roeland Jago Douma d1993c32e5 Move Application to AppInfo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 13:42:58 +02:00
Morris Jobke 6c29f63261 Merge pull request #5850 from nextcloud/revert-5783-outlook-max-width
Revert 5783 outlook max width and add height="120"
2017-07-24 13:42:39 +02:00
Morris Jobke 188b87e03b Cleanup legacy user class from unused methods
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 12:17:53 +02:00
Morris Jobke 7790017a14 Cleanup code of personal page to use public interfaces
* public interfaces instead of static code calls
* drop static private namespace methods

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 12:11:24 +02:00
Roeland Jago Douma 6d4731024a Some app fixes of phpstorm inspections
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
Roeland Jago Douma 5f227bd93b More phpstorm inspection fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:39:29 +02:00
Roeland Jago Douma 549845aa73 Delete trash using node API to trigger preview deletion
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:14:12 +02:00
Morris Jobke ae13d011d1 Remove unneeded styles
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 11:09:14 +02:00
Roeland Jago Douma 8bee9cf8d3 Empty search no longer works
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 10:56:21 +02:00
Roeland Jago Douma 5eee110b15 Merge pull request #5846 from nextcloud/fix_3186
Move image-optimization.sh to build dir
2017-07-24 10:53:33 +02:00
Lukas Reschke bb6fe6afba Adjust to height=120
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 10:18:16 +02:00
Andreas Jacobsen 25ada8208d Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout 2017-07-24 10:15:01 +02:00
Andreas Jacobsen 35494703f3 Fixed bug with sharing-settings
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-24 10:14:57 +02:00
Lukas Reschke ba1e16ea2e Revert "Set max-width of image to 100px in Outlook as well" 2017-07-24 10:14:47 +02:00
Roeland Jago Douma 02b9388fc6 Move image-optimization.sh to build dir
* We should not ship this!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 08:08:18 +02:00
Roeland Jago Douma 989614f9d5 Merge pull request #5783 from nextcloud/outlook-max-width
Set max-width of image to 100px in Outlook as well
2017-07-24 07:15:41 +02:00
Nextcloud bot d95b46ffb7 [tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Morris Jobke a98f57ebd0 Set max-width of image to 100px in Outlook as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-23 23:15:21 +02:00
Marius Blüm 05d979c665 Merge pull request #5713 from nextcloud/datepicker-redesign
Redesign jQuery UI datepicker
2017-07-23 22:06:18 +02:00
Morris Jobke 2e7e03b2f7 Merge pull request #5840 from nextcloud/phpstorm_inspect
Some phpstorm inspection fixes
2017-07-23 18:28:41 +02:00
Marin Treselj 25d29f06bc Fix font-weight for datepicker title.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:06 +02:00
Marin Treselj d138324eef Make weekday names brighter, lighter month/year title.
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:06 +02:00
Marin Treselj 0ba8903aad Make dates slightly larger and perfectly rounded.
SCSS cleanup, fix fringe cases, add margin between dates, un-bold title.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:05 +02:00
Marin Treselj b26d133e28 Remove deprecation
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:05 +02:00
Marin Treselj db6619fcf4 Add padding to popover
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:05 +02:00
Marin Treselj 82a52a8f17 Fixes issues mentioned in comments.
- [x] Highlight for selected date should be bold text.
- [x] Hover highlight for day should be the same as for the selected date.
- [x] Remove hover effect on the week.
- [x] Row for days of the week should indeed stay, but non-bold and at 50% opacity so it doesn't take away the focus.
- [x] Dates of previous and next months a bit lighter.
- [x] Remove marking the weekend blue.
- [x] The box centered below the date field, with triangle in the middle.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:05 +02:00
Marin Treselj 586eb3ed0a Redesign jQuery UI datepicker
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-23 14:06:04 +02:00
Jarkko Lehtoranta 69f6d42b17 LDAP: Simplify conditions in establishConnection
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 6a62b4784a LDAP: Add testStartTlsNegotiationFailure unit test
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 3a6511eac8 LDAP: Add testBindWithInvalidCredentials unit test
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 6103677a91 LDAP: Use imported exception in Connection class
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 79fbed4064 LDAP: Clean-up doConnect
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta d87375cbaa LDAP: Throw an exception if disabling LDAP referrals fails
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 97e14cccf2 LDAP: Fix testUseBackupServer unit test
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta de9a9bc004 LDAP: Throw an exception if Start TLS fails
This ensures that only a secure connection to the LDAP server will be used,
if Start TLS has been enabled.

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta ee2c6e8215 LDAP: Remove unnecessary "recursion" fix
This reverts commit 86d72b9a61
"LDAP: fix possible recursion".

Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 039a836d4a LDAP: Don't handle invalid credentials as a connection error
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Jarkko Lehtoranta 4e2e592635 LDAP: Connect to backup server only if it exists + handle errors
Signed-off-by: Jarkko Lehtoranta <devel@jlranta.com>
2017-07-23 14:50:01 +03:00
Nextcloud bot 46332b0d8e [tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Roeland Jago Douma 361d2badd8 Some phpstorm inspection fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-22 21:10:16 +02:00
Robin Appelman 89aaded07f add tests for renaming paths with multibyte utf8 characters
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-22 11:05:05 +02:00
Morris Jobke 9a151056d0 Merge pull request #5812 from MrJeos/master
Fix for mb strlen
2017-07-22 11:04:24 +02:00
Morris Jobke b6c67f585e Merge pull request #5827 from nextcloud/improve-public-share-header
Add filename and sharer in public page
2017-07-22 10:59:33 +02:00
Nextcloud bot ce7c62d9bb [tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Morris Jobke 655c26224b Merge pull request #5596 from nextcloud/mount-rename
Fix renaming of non-renamble mounts
2017-07-21 23:10:50 +02:00
Morris Jobke 50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling
Improve error handling for accepting federated shares
2017-07-21 22:54:14 +02:00
Morris Jobke b2b4691e48 Add filename and sharer in public page
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 18:55:37 +02:00
Morris Jobke 13dd0b0ebe Merge pull request #5785 from nextcloud/path-repair-steps-storage
Also repair storage id's when repairing invalid entries
2017-07-21 16:58:31 +02:00
Arthur Schiwon 25439919f8 fix phpdoc return types (no code change)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:12 +02:00
Arthur Schiwon 9b2f171cbd do not attempt to recognise cert issue by using LDAPTLS_REQCERT
first, it does not work (at least not everywhere/reliably), second if it
did it was not reset properly. Removes a bit of complexity.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-21 14:55:11 +02:00
Lukas Reschke 4c637a428e Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain
Fix error message on untrusted domain error page
2017-07-21 14:50:31 +02:00
Robin Appelman 06a4d6b5b9 Also repair storage id's when repairing invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 14:06:13 +02:00
Roeland Jago Douma a33b6cdd21 Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes
Minor documentation fixes
2017-07-21 13:32:10 +02:00
Robin Appelman 89b747d066 refactor chunked assembly stream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 12:49:39 +02:00
Roeland Jago Douma 86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
still remove the federated share even if we cant notify the remote
2017-07-21 12:45:01 +02:00
Roeland Jago Douma 37bff5ceda Merge pull request #5795 from nextcloud/ci-for-archive-tar
Adjust third-party ref
2017-07-21 12:36:45 +02:00
Bjoern Schiessle 8b3dfcc429 use OCSv2 to make sure that the error also arrives at the web front-end
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:09:13 +02:00
Bjoern Schiessle e78040d250 improved error handling
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:07:32 +02:00
Morris Jobke 1a4a68dbc6 Fix error message on untrusted domain error page
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 11:46:37 +02:00
Lukas Reschke 1c1ff82c06 Merge pull request #5802 from nextcloud/rm_dep_controller_functions
Remove deprecated Controller Functions
2017-07-21 10:12:20 +02:00
Marcel Waldvogel 4e42f059ed Minor typos
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
2017-07-21 09:50:44 +02:00
Marcel Waldvogel 15c51f410e The app password avoids 1Il etc. Adapted comment accordingly
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
2017-07-21 09:48:14 +02:00
Roeland Jago Douma e5bedd8947 Merge pull request #5818 from nextcloud/ocs_privatedata
PrivateData to app
2017-07-21 09:47:49 +02:00
Lukas Reschke 866a5759d1 Adjust third-party ref
CI commit for https://github.com/nextcloud/3rdparty/pull/59

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-21 09:36:58 +02:00
Morris Jobke 407a500745 Merge pull request #5803 from nextcloud/fix-public-links
fix preview for public links
2017-07-21 09:34:36 +02:00
Morris Jobke b1954bed97 Merge pull request #5797 from paulijar/share20-postUnshareFromSelf
Dispatch event postUnshareFromSelf when the recipient of a share unshares it
2017-07-21 09:32:49 +02:00
Morris Jobke 8ef75f78a5 Merge pull request #5819 from benediktg/add-mastdon-link
Add link to mastodon in readme
2017-07-21 09:26:15 +02:00
Morris Jobke 3d9fd4d0d1 Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker
Add Phan plugin to check for SQL injections
2017-07-21 09:25:24 +02:00
Benedikt Geissler 80fc33b082 Add link to mastodon in readme 2017-07-21 08:58:51 +02:00
Roeland Jago Douma 7753b93aa6 PrivateData to app
* PrivateData is an app now: https://github.com/nextcloud/privatedata
* No need to load the OCS routes.php (as there is none!)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-21 08:51:14 +02:00
Nextcloud bot 964d5338dc [tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Lukas Reschke 29e715a1b9 Exclude build/.phan/ from PHP 5.6 syntax check
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 23:04:11 +02:00
Lukas Reschke 3d2600b039 Add Phan plugin to check for SQL injections
This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues.

As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections.

The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 22:48:13 +02:00
Artem Kochnev 5abeb9519e Fix for mb strlen
Error with moving files with long names in UTF-8
2017-07-20 17:29:50 +03:00
Björn Schießle c0e9b374f1 Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload
Add recovery key on public upload
2017-07-20 14:07:57 +02:00
Pauli Järvinen 7c4a15f215 Emit hook postUnshareFromSelf when the recipient of a share unshares it
- This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
2017-07-20 14:45:46 +03:00
Morris Jobke 4826fd701d Merge pull request #5801 from nextcloud/activity-description-copy-paste
Fix copy and paste error on activity descriptions
2017-07-20 13:08:44 +02:00
Morris Jobke cb08288cf5 Merge pull request #5790 from nextcloud/fix-documentation
Fix config.sample.php documentation
2017-07-20 12:17:38 +02:00
Bjoern Schiessle 473824fa06 make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
Bjoern Schiessle 20a6b22db6 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:40:14 +02:00
Morris Jobke ac969cfbb6 Merge pull request #5800 from nextcloud/enable-acceptance-tests-again-on-drone-0.7
Enable acceptance tests again on Drone 0.7
2017-07-20 11:31:48 +02:00
Bjoern Schiessle ae8a3ce085 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:24:52 +02:00
Roeland Jago Douma 0b495ceff8 Remove deprecated Controller Functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-20 11:03:12 +02:00
Joas Schilling 0b3266531b Fix copy and paste error on activity descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-20 09:31:14 +02:00
Roeland Jago Douma 5e468c0bba Merge pull request #5794 from nextcloud/update-php7.1-container
Update PHP 7.1 containers
2017-07-20 08:45:52 +02:00
Daniel Calviño Sánchez 94144269de 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 08:08:35 +02:00
Daniel Calviño Sánchez c37329005e 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 07:56:51 +02:00
Daniel Calviño Sánchez 2fe8cad710 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 07:54:39 +02:00
Daniel Calviño Sánchez 8e9c12eed9 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 07:50:33 +02:00
Nextcloud bot 26c42d3d30 [tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Lukas Reschke e215eabbf7 Update PHP 7.1 containers
Previously this container used a very old CentOS version. It has been migrated to Debian Jessie now using the deb.sury.org repositories.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 17:00:08 +02:00
Morris Jobke 422d468d27 Fix config.sample.php documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 16:44:57 +02:00
Joas Schilling 3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens
Only use readable chars in Share Tokens
2017-07-19 16:40:18 +02:00
Morris Jobke 49c622fcba Merge pull request #5719 from nextcloud/improve-jscombiner
Properly handle if the deps file if for some reason empty
2017-07-19 16:31:29 +02:00
Roeland Jago Douma d5e3428af5 Merge pull request #5776 from nextcloud/install-phan
Run phan over code base
2017-07-19 13:45:31 +02:00
Morris Jobke cbfea4c025 Merge pull request #5781 from nextcloud/fix_5780
Allow overwriting of IOS theming values
2017-07-19 11:34:27 +02:00
Lukas Reschke 591aaa4154 Add workaround for https://github.com/etsy/phan/issues/1033
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 11:08:43 +02:00
Morris Jobke 8e6b707d2f Merge pull request #5778 from nextcloud/changelog
Add link to real changelog
2017-07-19 10:44:24 +02:00
Morris Jobke e9532cfbbb Add link to real changelog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:39:55 +02:00
Lukas Reschke e96c823f17 Update third-party ref
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:12 +02:00
Lukas Reschke 030d85bc9c Remove unused functions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:12 +02:00
Lukas Reschke 4d1d82e2d7 Install phan manually
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:12 +02:00
Lukas Reschke ac1a54cccf Use new Drone image
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:12 +02:00
Lukas Reschke 842a923a6e Exclude phan from scrutinizer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Lukas Reschke d8ec399454 Run phan over code base
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Morris Jobke e48ca730fe Add Android and iOS URLs to theming app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 10:20:47 +02:00
Roeland Jago Douma e2298e0a71 Allow overwriting of IOS theming values
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-19 08:22:45 +02:00
Nextcloud bot 0ee83ac56b [tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Morris Jobke 2ebafb06fd Properly handle if the deps file if for some reason empty
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 00:10:46 +02:00
Morris Jobke 5accbf5568 Merge pull request #5744 from 1manprojects/patch-1
Removed cast to integer in getSize
2017-07-18 23:43:09 +02:00
Morris Jobke a5495b8ef1 Merge pull request #5775 from nextcloud/fix-postgres
Disable postgres temporarily
2017-07-18 23:15:28 +02:00
Morris Jobke 6a313accfc Merge pull request #5764 from nextcloud/update-3rdparty
Update 3rdparty for "Fix infinite propfinds reporting files as direct…
2017-07-18 23:13:13 +02:00
Roeland Jago Douma f0f1e2c501 Merge pull request #5770 from nextcloud/path-repair-steps-loop
Fix invalid path repair step not getting all invalid entries
2017-07-18 22:22:51 +02:00
Morris Jobke 884751a8c0 Merge pull request #5733 from nextcloud/app-menu-ellipsis
Long app names will have ellipsis in the app menu popover.
2017-07-18 20:42:27 +02:00
Morris Jobke 75f893b62f Disable postgres temporarily
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-18 19:23:56 +02:00
Joas Schilling e71b9fb3d6 Merge pull request #5709 from nextcloud/null-user-exist
null users dont exist
2017-07-18 18:24:42 +02:00
Joas Schilling 984933e586 Only use readable chars in Share Tokens
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 15:44:34 +02:00
Robin Appelman 8b58b4c2a7 Fix invalid path repair step not getting all invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-18 14:01:49 +02:00
Joas Schilling b0809ef405 Update 3rdparty for "Fix infinite propfinds reporting files as directories"
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-18 10:03:28 +02:00
Roeland Jago Douma 1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4
Spelling: Bigversal and LDAP
2017-07-18 09:09:46 +02:00
Morris Jobke 5c900e535b Merge pull request #5745 from paulijar/master
Fix emitting of legacy hook post_unshare
2017-07-18 09:07:38 +02:00
Roeland Jago Douma ac5d238ffe Merge pull request #5758 from nextcloud/comradekingu-patch-7
Spelling: ": Bigversal"
2017-07-18 09:06:34 +02:00
Morris Jobke 58f72309cc Merge pull request #5736 from smueller18/patch-2
do not show hyphen in og:title if slogan does not exist
2017-07-18 09:04:47 +02:00
Roeland Jago Douma 4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1
Spelling: Shortening and binding
2017-07-18 08:52:09 +02:00
Morris Jobke 99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2
Spelling: command-line, Consider narrowing
2017-07-18 08:49:48 +02:00
Morris Jobke 7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6
Spelling: sent, an invitation, - successful
2017-07-18 08:49:06 +02:00
Morris Jobke 79cf7d610f Merge pull request #5740 from nextcloud/comradekingu-patch-5
Spelling: log out, : Bigversal
2017-07-18 08:48:08 +02:00
Nextcloud bot b1b843e572 [tx-robot] updated from transifex 2017-07-18 00:08:02 +00:00
Allan Nordhøy 9b0cb57e3b : Bigversal 2017-07-18 00:05:01 +02:00
1 Man Projects 3e5d590f1e changed direct cast to integer to numerical value 2017-07-17 15:19:04 +02:00
Robin Appelman 359a583186 fix parsing of dav permissions
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:09:12 +02:00
Robin Appelman 0e107bc63c non movable mounts can not be moved
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 15:09:08 +02:00
Roeland Jago Douma 1956ea0e13 Merge pull request #5743 from nextcloud/comradekingu-patch-7
Spelling: - your
2017-07-17 14:42:13 +02:00
Robin Appelman 7fa02905aa still remove the federated share even if we cant notify the remote
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:19:44 +02:00
Nextcloud bot 125767265d [tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Pauli Järvinen 8dce97a3e1 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-16 13:13:15 +03:00
1 Man Projects 56c0384044 Removed cast to integer in getSize
Fixes - Wrong or no sizes of files/folders #5031
2017-07-15 20:18:45 +02:00
Allan Nordhøy 1d24c82e38 - your
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-15 11:39:50 +02:00
Andreas Jacobsen 118f0d2b4d Merge branch 'master' into clean-settings-layout 2017-07-15 09:33:24 +02:00
Andreas Jacobsen 84eb18b011 Personal settings file changed 2017-07-15 09:30:38 +02:00
Nextcloud bot a23cdd04bb [tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Morris Jobke aa0a1c4174 Merge pull request #5724 from nextcloud/fix-drone
Fix drone
2017-07-14 23:33:13 +02:00
Morris Jobke 649c47b199 Temporarily disable acceptance and object storage tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 21:48:52 +02:00
Allan Nordhøy de6b7668c1 sent, an invitation, - successful 2017-07-14 17:28:57 +02:00
Allan Nordhøy 6ab8b90e94 log out, : Bigversal 2017-07-14 17:02:48 +02:00
Allan Nordhøy ddc804aa32 : Bigversal and LDAP 2017-07-14 15:46:05 +02:00
Allan Nordhøy 4b8c1eaa91 command-line, Consider narrowing 2017-07-14 15:32:47 +02:00
Stephan Müller 7cf3dc4e29 do not show hyphen in og:title if slogan does not exist 2017-07-14 15:26:44 +02:00
Allan Nordhøy 66cbf90853 Spelling: Shortening and binding 2017-07-14 15:24:55 +02:00
Lukas Reschke a79447c6fd Merge pull request #5699 from nextcloud/bruteforce_capability
Add bruteforce capabilities
2017-07-14 15:20:31 +02:00
Morris Jobke 9a34c5051f 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 15:04:18 +02:00
Björn Schießle f90f4db0cd Merge pull request #5725 from nextcloud/remove-legacy-files
this template file is no longer needed
2017-07-14 13:30:22 +02:00
Marin Treselj d78b281a71 Long app names will have ellipsis in the app menu popover.
Fixes #5021

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-14 13:23:07 +02:00
Andreas Jacobsen b0e83e17bb Updated layout
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 11:46:12 +02:00
Bjoern Schiessle 2f50ba92da this template file is no longer needed
since https://github.com/nextcloud/server/pull/4890 the templates
are located at settings/templates/settings/personal/

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-14 11:38:21 +02:00
Andreas Jacobsen 91651cfbb9 Moved settings to left
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-07-14 09:43:19 +02:00
Nextcloud bot 3865c77279 [tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Morris Jobke 1f1504e071 Merge pull request #5708 from nextcloud/nested-permissions-mask
Fix scan permissions with nested permissions masks
2017-07-13 23:27:01 +02:00
Morris Jobke 01466ab840 Merge pull request #5715 from nextcloud/master-5655
Fixed repair step
2017-07-13 19:30:05 +02:00
Robin Appelman 350e036c56 chunk getting invalid paths and reuse queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 16:37:38 +02:00
Robin Appelman 4a727a578c use a generator instead of fetching all rows at once
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 16:37:34 +02:00
Robin Appelman 5185a3c0c9 null users dont exist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 15:53:14 +02:00
Robin Appelman 03f27b4c2c Fix scan permissions with nested permissions masks
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:29:04 +02:00
Joas Schilling e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes
Prefer custom theme over the theming app
2017-07-13 13:41:31 +02:00
Roeland Jago Douma f71457782b Merge pull request #5695 from nextcloud/dont-error-when-the-table-doesnt-exist
Don't throw an error when the table doesn't exist
2017-07-13 13:28:52 +02:00
Roeland Jago Douma 23129aa555 Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 11:23:10 +02:00
Roeland Jago Douma 6a1f2ac076 Add bruteforce capabilities
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 11:23:08 +02:00
Morris Jobke 598835b06f Merge pull request #5703 from nextcloud/autoloader_fix
Fix autoloader
2017-07-13 10:40:16 +02:00
Roeland Jago Douma 31d5f946af Fix autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-13 09:10:59 +02:00
Nextcloud bot 261513b04a [tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Roeland Jago Douma 6461d083e2 Merge pull request #4984 from nextcloud/tmpcertfile
Create a temp certfile
2017-07-12 20:20:46 +02:00
Roeland Jago Douma 04f2090698 Write cert bundle to tmp file first
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-12 19:24:20 +02:00
Joas Schilling c6b7204fcb Don't throw an error when the table doesn't exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-12 15:35:24 +02:00
Lukas Reschke 35111144d6 Merge pull request #5690 from nextcloud/files-checker
Add test to check if new files are added to the root of the repository
2017-07-12 14:18:34 +02:00
Roeland Jago Douma 86a496d94a Merge pull request #5567 from nextcloud/public-capabilities
Public capabilities API
2017-07-12 13:04:54 +02:00
Roeland Jago Douma 08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
Morris Jobke 844e7b03b4 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-12 11:52:42 +02:00
Julius Härtl ce5ad7e7f4 Prefer custom theme over theming app
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-12 11:42:15 +02:00
Nextcloud bot 13295c2d1d [tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Lukas Reschke 1b12e7ad7b Merge pull request #5657 from nextcloud/select-error-text
[Small] warning is now selecteable
2017-07-11 21:45:57 +02:00
Morris Jobke 9e2d1caba2 Merge pull request #5681 from nextcloud/upstream-fix-circles
upstream fix circles
2017-07-11 18:03:06 +02:00
Robin Appelman dfe662ad42 Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
Morris Jobke 4153e1de79 Merge pull request #5672 from nextcloud/upload-hidden-filelist
properly block file upload to non-active filelist
2017-07-11 15:15:49 +02:00
Robin Appelman e1d6ca3c53 fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 14:03:11 +02:00
Maxence Lange 6e7be6acfd upstream
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
Morris Jobke 23ff76975f Merge pull request #5662 from nextcloud/comradekingu-patch-1
Spelling: No shouting at user, and Facebook
2017-07-11 00:13:33 +02:00
Morris Jobke 7df7d0ff3b Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns
Fix unselecting items on multi select dropdowns
2017-07-10 23:39:43 +02:00
Morris Jobke 464e635c28 Merge pull request #5666 from nextcloud/comradekingu-patch-2
Spelling: No "we" for recommendations.
2017-07-10 17:34:36 +02:00
Morris Jobke 22693aec47 Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails
Fix remote share activity emails
2017-07-10 16:16:54 +02:00
Morris Jobke a15591347a Merge pull request #5671 from GitHubUser4234/ldap_password_renew_nc12fix
Rectify variable in RenewpasswordController
2017-07-10 15:04:21 +02:00
Robin Appelman 12c9b1efb0 properly block file upload to non-active filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-10 14:32:10 +02:00
Roger Szabo 0ebec6f9a4 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:46:39 +08:00
Joas Schilling 33cb45d4a3 Fix owner cloud id in unshare activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:20:56 +02:00
Joas Schilling b69ddfba8b Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
Allan Nordhøy 04edde5bbd Spelling: No "we" for recommendations. 2017-07-10 11:04:28 +02:00
Morris Jobke c7b28064e3 Merge pull request #5649 from nextcloud/fix-5611
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
Daniel Calviño Sánchez 46e813e749 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-10 03:38:22 +02:00
Daniel Calviño Sánchez 1b4e70efe3 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-10 03:38:22 +02:00
Daniel Calviño Sánchez b43a74bdcd Add acceptance tests for unselecting items in dropdown for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-10 03:38:22 +02:00
Nextcloud bot 4f7fafb5c5 [tx-robot] updated from transifex 2017-07-10 00:08:41 +00:00
Allan Nordhøy 6adda3ffe8 Spelling: No shouting at user, and Facebook 2017-07-09 16:30:56 +02:00
Nextcloud bot cf8db31bce [tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Maxence Lange 6d5f7fd456 warning is now selecteable
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-08 21:29:10 +02:00
Daniel Calviño Sánchez 71b90cdeff 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-08 15:36:01 +02:00
Daniel Calviño Sánchez 8deab238cc Fix typo
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-08 15:33:03 +02:00
Nextcloud bot f59062ce83 [tx-robot] updated from transifex 2017-07-08 00:08:27 +00:00
Lukas Reschke a1c14a747c Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emails
Don't show mail domain and from in config report
2017-07-07 18:38:50 +02:00
Arthur Schiwon c46006934c fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-07 16:59:28 +02:00
Morris Jobke e76b867c2c Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-necessary
Only create the migration directory when necessary
2017-07-07 14:10:32 +02:00
Joas Schilling 79d7c26b8a Register autoloading before running migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 12:01:11 +02:00
Morris Jobke c2ba5e2884 Merge pull request #5529 from michaelletzgus/optimize_js_order
Optimize performance / Load CSS and JS in parallel on firefox
2017-07-07 11:16:31 +02:00
Morris Jobke b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Morris Jobke b1520a6458 Merge pull request #5643 from nextcloud/codeowners
Move mention-bot notifications to code owners
2017-07-07 10:47:33 +02:00
Morris Jobke 172b4bb6d2 Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps
Don't load navigation entries of restricted apps
2017-07-07 10:46:45 +02:00
Joas Schilling e6e79c34b1 Don't show mail domain and from in config report
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 09:53:55 +02:00
Joas Schilling 9c3b2a3991 Move mention-bot notifications to code owners
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 08:44:01 +02:00
Tobias Brunner f8735a3205 recognize groupOfUniqueNames as valid LDAP group object
This was already partly done in f88109b but was missed in the
fetchGroups function.
2017-07-07 08:29:58 +02:00
Nextcloud bot d23bc9a99a [tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Morris Jobke b4a221f9be Merge pull request #5424 from nextcloud/moveFromCache-from-shared
fix moving folders out of a cache jail
2017-07-06 18:31:18 +02:00
Morris Jobke ad1d4d363f Merge pull request #5174 from nextcloud/new-encryption-default
Use the master key by default
2017-07-06 15:58:48 +02:00
Bjoern Schiessle 001a9c02dd adjust encryption tests to the new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Bjoern Schiessle c46b158e10 update sharing test to new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Bjoern Schiessle b43f6d295e update file system tests to take the master key into account
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Bjoern Schiessle f186a5cfb1 fix and extend dav test to also test the master-key setup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 1a55ace97c no warning on password change if no encryption module uses per-user keys
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle d668e17769 since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 66debbe18e add occ command to disable the master key again
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 5f75468aa4 improve status messages
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 28a7e72868 after the master key was loaded we are ready to go, no re-login needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +02:00
Bjoern Schiessle da51ec38f4 only collect detailed access list if it is really needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +02:00
Bjoern Schiessle 9c5ba2f12c make master key the new default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +02:00
Joas Schilling 0f275b1550 Only create the migration directory when necessary
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-06 09:58:39 +02:00
Nextcloud bot 984953ef4a [tx-robot] updated from transifex 2017-07-06 00:08:44 +00:00
blizzz 75f97852b4 Merge pull request #5404 from nextcloud/use-translated-hint-insteadof-english-error
Use translated Hint instead of english error on password policy
2017-07-05 22:18:49 +02:00
Morris Jobke 60398b919b Merge pull request #5231 from nextcloud/migrations
Migrations
2017-07-05 17:32:40 +02:00
Morris Jobke ca565644b3 Merge pull request #5621 from nextcloud/fix-sorting-of-favorite-files-in-file-list
Fix sorting of favorite files in file list
2017-07-05 17:31:41 +02:00
Morris Jobke 5d5b1285ec Merge pull request #5520 from nextcloud/disable-click-on-hint
[Small] Hint should not be clickable
2017-07-05 16:19:09 +02:00
Morris Jobke 6879573b2e Merge pull request #5580 from nextcloud/admin-audit-update
Admin audit update
2017-07-05 16:16:00 +02:00
Morris Jobke 163e8774a4 Fix autoloader and namespace test
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-05 15:46:25 +02:00
Morris Jobke 7d58bb7db5 Merge pull request #5342 from nextcloud/userlist-used-space
show used space in user list
2017-07-05 15:15:25 +02:00
Daniel Calviño Sánchez be56374c51 Fix sorting of favorite files
The sort comparator checks the "isFavorite" property of the FileInfo
objects to compare. That property is set when the file list is loaded
and the response from the server is parsed, and thus a freshly loaded
file list has the proper sorting for favorite files. However, the
property is not set in other cases, like when the FileInfo objects are
derived from FileInfoModels due to a file being marked as a favorite or
a text editor being closed, which causes the file to be sorted in the
wrong position.

There is no need to add the property in those situations, though; in all
cases the TagsPlugin adds a "tags" array property that contains an
OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite".
Moreover, although "isFavorite" was added by the main "_parseFileInfo"
function it did not really belong there but to the "FileInfoParser" from
the TagsPlugin; however, as that property now is not used anywhere it
was removed altogether.

A cleaner solution would have been to make the sort comparator
extensible by plugins like other behaviours of the file list and then
add the sorting logic related to favorite files to the TagsPlugin.
However, right now only the TagsPlugin would need to alter the main
sorting logic, and it seems like a corner case anyway. Even if it is
implemented as a plugin, favorite files is a core feature, so for the
time being it will be taken into account directly in the main sorting
logic; making the sort comparator extensible by plugins is defered until
there are other use cases for that.

Fixes #5410

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-05 15:01:23 +02:00
Joas Schilling bbfc044ac5 Add migration for personal settings stuff
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 14:58:20 +02:00
Daniel Calviño Sánchez 6fa5c33af4 Add acceptance tests for sorting of favorite files
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-05 14:54:26 +02:00
Joas Schilling 6abbe4e962 Don't load navigation entries of restricted apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:52:51 +02:00
Morris Jobke f2b8535c7e Update unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-05 13:50:28 +02:00
Joas Schilling 0bff4f3f07 Fix the installer tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 4e5cd1efea Fix tests of CodeChecker and MigrationService
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 7a3d83d630 Register autoloading before running migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 6a0da09734 Update autoloading
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 3b267b165f Check the migration files for table, column and index length errors
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling fe6e8c2710 Fix dropping tables and handle the prefix automatically
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 543c181ec5 Move twofactor_backupcodes to migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:02:16 +02:00
Joas Schilling 5d9d1b1cb5 Allow to check the schema in pre and post as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 817783e4c7 Add a version to migrations, so parallel legacy branches can also have migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling df6b839b23 Add author and copyright
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 8c39e66619 Do not allow to go back on productive systems
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 2875b79c61 Fix code issues
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 3969a6b1eb Use autoloading instead of require_once from a different dir
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 194ef1a171 Adjust the code to use our interface and abstract
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 183b1dbde3 Use migrations when there is no database.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Joas Schilling 15eec7b83c Start migrations
Fixme:
- Install and update of apps
- No revert on live systems (debug only)
- Service adjustment to our interface
- Loading via autoloader

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 13:01:19 +02:00
Morris Jobke efa52ec111 Merge pull request #5441 from nextcloud/custom-theme-update
Add command to apply updates to custom themes
2017-07-05 12:44:43 +02:00
Julius Härtl 2e47210d6f Add command to apply updates to custom themes
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-07-05 12:38:07 +02:00
blizzz d8af9d4c9b Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either
Don't log passwords on dav exceptions
2017-07-05 11:58:32 +02:00
Morris Jobke e836efe68b Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix
Ldap password renewal fixes for NC12
2017-07-05 11:49:13 +02:00
Nextcloud bot 1cbb7a18d8 [tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Morris Jobke 67f4a79be7 Merge pull request #5549 from nextcloud/update-info
Update admin.php
2017-07-04 19:11:31 +02:00
Morris Jobke 711d861d8b Merge pull request #5556 from nextcloud/files_external_sftp_2048_4096
[Files external] Add support for 2048 and 4096 bit RSA key generation
2017-07-04 17:37:25 +02:00
Morris Jobke f3c25e177f Merge pull request #5407 from nextcloud/5157-simple-logo
Simplified Nextcloud logo icon #2
2017-07-04 12:56:05 +02:00
Morris Jobke 8e160c6638 Merge pull request #5591 from nextcloud/move-client-info-to-firstrunwizard
Move sync client to the firstrunwizard app
2017-07-04 11:39:21 +02:00
Morris Jobke 44d39d87c0 Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-04 11:31:10 +02:00
Joas Schilling da6dd4898a Move sync client to the firstrunwizard app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-04 10:54:13 +02:00
Nextcloud bot d772edaff2 [tx-robot] updated from transifex 2017-07-04 00:08:24 +00:00
Nextcloud bot c94dbddd12 [tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Marin Treselj 02dd7f5965 Revert background-size as requested, issue will be fixed separately
Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
2017-07-02 14:15:09 +02:00
Marin Treselj 3470d0a44e Simplified Nextcloud logo icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-02 14:14:49 +02:00
Nextcloud bot cc4373c901 [tx-robot] updated from transifex 2017-07-02 00:08:14 +00:00
Joas Schilling a4a99fa7b9 Log console commands
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-01 12:19:01 +02:00
Joas Schilling a5430b68ff Listen to app enable/disable events
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-01 12:06:14 +02:00
Joas Schilling 669f684434 Move logic to Application class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-01 11:41:21 +02:00
Joas Schilling 8260d4bf73 Move to PSR-4
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-01 11:33:20 +02:00
Nextcloud bot d49276082e [tx-robot] updated from transifex 2017-07-01 00:08:28 +00:00
Knut Ahlers 92d2fb8771 Allow group backend to declare users as admins
Signed-off-by: Knut Ahlers <knut@ahlers.me>
2017-06-30 14:28:16 +02:00
Julius Härtl b82164e602 Simplify if condition for public capabilities
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 14:18:16 +02:00
Roger Szabo 51ecc7ce11 suppress superflous php error on rejected password change
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-30 18:36:33 +08:00
Julius Härtl 01093604d3 Add tests for public capabilties
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 11:21:15 +02:00
Julius Härtl 42d9be4529 Expose theming capabilities to public
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 11:08:54 +02:00
Julius Härtl 51a0741005 Add public capabilities API
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 11:08:04 +02:00
Roeland Jago Douma e3127b8899 Remove unused member
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-06-30 09:13:36 +02:00
Nextcloud bot 2afb4857cc [tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
blizzz 72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings
Unify settings
2017-06-29 20:02:09 +02:00
Joas Schilling b27819785e Don't log passwords on dav exceptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-29 17:20:10 +02:00
Robin Appelman 601362e164 adjust to moved repair step
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-29 14:45:08 +02:00
Arthur Schiwon 010a3c09f2 … and their tests needed adjustments, too
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-29 14:38:22 +02:00
Lukas Reschke 57c5a15e41 Merge pull request #5490 from nextcloud/add-clear-site-data-header
Add Clear-Site-Data header
2017-06-29 13:32:46 +02:00
Andreas Jacobsen f6e5718040 Update for settings
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-29 12:28:36 +02:00
Roeland Jago Douma 4a9277d8da Merge pull request #5460 from nextcloud/objectstore-error-logging
improved logging of objectore errors
2017-06-29 11:22:17 +02:00
Roeland Jago Douma e0ef960848 Merge pull request #5526 from nextcloud/trashbin-error-log
Improve logging of trash bin inconsistencies
2017-06-29 11:06:50 +02:00
Roeland Jago Douma 25e08bc8a0 Allow 2048 and 4096 bit SFTP keys
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-06-29 09:32:24 +02:00
Nextcloud bot 928b6a376e [tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00
Andreas Jacobsen b55c7032ad Added space between avatar and settings
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 18:26:50 +02:00
Andreas Jacobsen b4e05e8c58 Fixed typos 2017-06-28 14:27:08 +02:00
Andreas Jacobsen 5c43f71d62 Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/server into clean-settings-layout 2017-06-28 13:15:31 +02:00
Andreas Jacobsen fe84dc73a8 Cleaned up personal settings page
Signed-off-by: Andreas Jacobsen <andreasjacobsen93@gmail.com>
2017-06-28 13:13:11 +02:00
Nextcloud bot 045d04332e [tx-robot] updated from transifex 2017-06-28 00:08:18 +00:00
Andreas Jacobsen 88ac51d522 Cleaned up personal settings page 2017-06-27 20:21:54 +02:00
Jos Poortvliet 43301fddaf Update admin.php
add a note on our staged roll-out.
2017-06-27 17:00:06 +02:00
Arthur Schiwon 005ef115fb move admin templates to the right place
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:25:37 +02:00
Arthur Schiwon 793de6a8d0 move encryption to security (and behind two factor things)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:21:18 +02:00
Nextcloud bot 3b80b72c04 [tx-robot] updated from transifex 2017-06-27 00:08:17 +00:00
Arthur Schiwon 6b5bbe1880 try to lower the timeout in an acceptance test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 14:42:07 +02:00
Arthur Schiwon da53162656 We're on 13 now…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 11:03:41 +02:00
Arthur Schiwon cfa5eea902 fix typos and unnecessary white spaces
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 10:30:42 +02:00
Nextcloud bot 6e52c8a794 [tx-robot] updated from transifex 2017-06-26 00:08:31 +00:00
Nextcloud bot 665ded38aa [tx-robot] updated from transifex 2017-06-25 00:08:18 +00:00
Michael Letzgus c77fe1ab86 Optimize performance / Load CSS and JS in parallel on firefox
Move the inline <script> after the external <script> because the internal JS between CSS <link> and external JS makes firefox loading CSS and JS not in parallel.
The internal js is now parsed last but will still be executed first since everything else is deferred js.

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-06-24 11:35:40 +02:00
Nextcloud bot 4526b8d6a3 [tx-robot] updated from transifex 2017-06-24 00:08:29 +00:00
Morris Jobke b4fa812a3d Improve logging of trash bin inconsistencies
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-23 16:09:00 -05:00
Morris Jobke 944e560155 Merge pull request #5517 from nextcloud/enhanced-failure-logging
Enhance the logging if the part file can not be renamed
2017-06-23 16:06:03 -05:00
Morris Jobke 86efe9569a Merge pull request #5518 from nextcloud/deprecate-old-log
Deprecate static writeLog() method
2017-06-23 16:03:13 -05:00
Arthur Schiwon b6b19346b4 forgotten test adjustments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 22:19:18 +02:00
Morris Jobke d6adc0eba1 Deprecate static writeLog() method
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-23 11:21:46 -05:00
Arthur Schiwon 8750d5b802 take out additional (legacy) settings section from tests
because it is dependent whether anything else registers into it and
\OC_App is static

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 14:34:55 +02:00
Arthur Schiwon 39ca06e6b9 fix setting up encryption section
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:38:33 +02:00
Arthur Schiwon c5df6db631 move twofactor_* into security
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:18:08 +02:00
Arthur Schiwon d881a3c37b adapt to force language changes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:15:08 +02:00
Arthur Schiwon a596251d6b avoid marking two sections as active when they have the same name
… in both personal and admin.
2017-06-23 12:38:06 +02:00
Arthur Schiwon b7ce492c59 adapt encryption
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon f6ecc46cfa adapt twofactore_backupcodes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 7817811d13 do not offer additional settings when there is no content
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 1ace1657b6 adapt federatedfilesharing
also drops IE8 switch

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 9c85f55202 remove obsolete file
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 26ca563545 Fix and extend acceptance tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 8a8e78d439 already declared in Trait
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon 2b128ca576 update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon ab814e7786 drone wasn't satisfied yet
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:43 +02:00
Arthur Schiwon 1cdb49d6db adjust another test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00
Arthur Schiwon 0762d3dd3e …and adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00
Arthur Schiwon 07cf046216 take over changes from #5166 and follow #5267
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00
Arthur Schiwon d7a2290ce1 take over changes from #5084
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00
Robin Appelman 0dcce5a835 move personal external storage settings to it's own section
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Robin Appelman 6e314ddabe fix getting sections
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Robin Appelman e8f5c21db9 Fix trait usage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Arthur Schiwon 28fd18de43 add missing pieces to Settings Manager and fix and extend its unit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:41 +02:00
Arthur Schiwon f873182965 remove obsolete files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:41 +02:00
Arthur Schiwon 3dca4de8b3 add Additional (+ Fallback) section for Personal settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 7f48b6f14f Adopt DB and Manager to personal settings structure
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon d56e86cfde sync clients have their own place
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 8c076e0bda take over app passwords
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 489ac4391b convert Sessions section
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 8bd887b2c6 add storage info, fix URL generation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 9e924d74c9 fix displaying groups in personal info
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon 045f652ef2 completing PersonalInfo
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon 039ee7e3aa brief, incomplete personal info settings implementation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon b68fdb473d Extend interfaces
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon 560ab2e911 one settings link, common template, styling
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon 247b305b79 add route and controller. consolidate common settings functions in a trait.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:17 +02:00
Maxence Lange 5389ffca86 Hint should not be clickable
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-06-23 09:18:20 -01:00
blizzz d9beeaec90 Merge pull request #5508 from nextcloud/no-activity-before-login
Don't create activities for email and password change before login
2017-06-23 12:04:49 +02:00
Nextcloud bot c935f1f9cc [tx-robot] updated from transifex 2017-06-23 00:09:12 +00:00
Morris Jobke eb9aedf44b Enhance the logging if the part file can not be renamed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-22 17:50:14 -05:00
Morris Jobke 846e62c225 Run repair step only once
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-22 15:43:59 -05:00
Morris Jobke d611d9c126 Merge pull request #5498 from nextcloud/allow-to-force-a-language
Allow to force a language and set it via the ocs api
2017-06-22 12:47:00 -05:00
blizzz 65b4e2a1db Merge pull request #5491 from nextcloud/issue-5457-create-users-in-non-default-backends
Create users in non default backends first
2017-06-22 13:01:36 +02:00
Roger Szabo bf9412df63 set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:58:30 +08:00
Roger Szabo 1d8e73b108 css for button adjustment for nc12
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:53:11 +08:00
Joas Schilling c50cb6ad81 Don't create activities for email and password change before login
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:02:12 +02:00
Nextcloud bot e1e4d188f9 [tx-robot] updated from transifex 2017-06-22 00:08:37 +00:00
Robin Appelman 0a12b5d38d improved logging of objectore errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-21 17:33:26 -05:00
Morris Jobke 18824d476e Merge pull request #5474 from nextcloud/wording-4925
Improve wording of various error messages
2017-06-21 17:28:54 -05:00
Morris Jobke 6a1c4990ab Merge pull request #5252 from derkostka/master
Use realpath to obtain the webroot.
2017-06-21 17:25:12 -05:00
Jan-Christoph Borchardt fd63577089 Improve wording of various error messages
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-21 14:51:59 -05:00
Morris Jobke 07a0f95ebf Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-21 14:41:47 -05:00
Morris Jobke 96e1daba33 Added missing PHPDoc for @since
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-21 12:23:55 -05:00
Robin Appelman d3c20eefca Add repair step for invalid paths
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-21 15:52:27 +02:00
Joas Schilling fa717d9706 Add unit tests for the new code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 12:21:21 +02:00
Joas Schilling 7816c54625 Allow to force a language and set it via the ocs api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 11:34:52 +02:00
Roger Szabo 0fcbc0954c pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-21 14:40:44 +08:00
Nextcloud bot 146c699eb4 [tx-robot] updated from transifex 2017-06-21 00:08:15 +00:00
Sebastian Kostka c7ce42e45b Squashed the webroot fix
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
2017-06-20 22:15:20 +02:00
Joas Schilling b726204f91 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-20 19:59:41 +02:00
Lukas Reschke 2f87fb6b45 Add Clear-Site-Data header
This adds a Clear-Site-Data header to the logout response which will delete all relevant data in the caches which may contain potentially sensitive content.

See https://w3c.github.io/webappsec-clear-site-data/#header for the definition of the types.

Ref https://twitter.com/mikewest/status/877149667909406723

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-20 19:46:10 +02:00
Morris Jobke b556c4855c Merge pull request #5479 from nextcloud/pr-5459-follow-up
Also allow group admins to toogle the storage location
2017-06-20 10:47:50 -05:00
Joas Schilling ca3a6ec607 Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 14:25:24 +02:00
Joas Schilling 90fa27694a Use PNG version of the icons for shipped activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Joas Schilling 8b0546e3f9 Add a flag to allow checking if SVGs are okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 12:40:45 +02:00
Joas Schilling e30ed1de84 Also allow group admins to toogle the storage location
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:35:22 +02:00
Nextcloud bot 2660a3b49c [tx-robot] updated from transifex 2017-06-20 00:08:41 +00:00
Morris Jobke 60edf2f18a Merge pull request #5459 from nextcloud/issue-5399-dont-reload-on-subadmin-setting-change
Don't try to save the setting when its not an admin
2017-06-19 11:35:46 -05:00
Morris Jobke 09a027ddff Merge pull request #5450 from nextcloud/fix-appmenu-more-theming
Fix more icon in apps menu on bright backgrounds
2017-06-19 08:28:02 -05:00
Robin Appelman c9ef998f17 Merge pull request #5091 from nextcloud/shared-cache-during-init
dont die if we try to access the shared cache while setting up the shared storage
2017-06-19 13:47:59 +02:00
Jan-Christoph Borchardt a5ad6def3d Merge pull request #5447 from nextcloud/calendar-icon-white
Add white version of the calendar.svg icon
2017-06-19 13:18:46 +02:00
Joas Schilling 35413d9912 Don't try to save the setting when its not an admin
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 12:55:00 +02:00
Morris Jobke 381850bd07 Merge pull request #5429 from nextcloud/cache-baseurl
Use base url for cache prefix and SCSS caching
2017-06-18 22:21:40 -05:00
Nextcloud bot 76d10bc46b [tx-robot] updated from transifex 2017-06-19 00:08:20 +00:00
Morris Jobke 38cf9b8dc0 Merge pull request #5423 from nextcloud/better-svg-optimization
Remove XML header and line breaks in SVG files.
2017-06-17 18:35:14 -05:00
Marin Treselj d3d0ce8df3 Add CSS class for icon-calendar
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-06-17 12:27:05 +02:00
Julius Härtl adf2f88873 Fix more icon in apps menu on bright backgrounds
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-17 10:14:21 +02:00
Marin Treselj 9d25b86a83 Add viewport to all core/img/places/* icons.
Also removed some unneeded style declarations.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-06-17 09:32:59 +02:00
Lukas Reschke d7ebe0b37b Merge pull request #5436 from jplitza/patch-1
Fix 500 Internal Server Error on writing
2017-06-17 08:21:03 +02:00
Nextcloud bot 26d6c4a64a [tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Marin Treselj 40c1f3e3ce Add white version of the calendar.svg icon
There's no reason for not including it and it is needed for Deck app.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-06-16 23:06:25 +02:00
Robin Appelman cc0ff6f5e3 Merge pull request #5177 from Bekcpear/master
Fix upload remaining time
2017-06-16 14:11:55 +02:00
Jan-Philipp Litza 0b066d9297 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-06-16 11:38:22 +02:00
Julius Härtl 41621d3b59 Fix tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-16 11:06:26 +02:00
Julius Härtl 517dfdda0d Fix theming app to also use the prefix
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-16 10:51:37 +02:00
Julius Härtl f039ba7480 Add tests and inject IRequest
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-16 10:51:31 +02:00
Joas Schilling 698a7cb7f0 Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items
Allow dir-listing also when one child is blocked by access control
2017-06-16 10:47:08 +02:00
Bekcpear 2a1681510b update core.js
Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 15:36:09 +08:00
Bekcpear 8267e5e007 Fix uploadrate value of 'original-title' attribute
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 15:35:51 +08:00
Bekcpear 82e263ed04 Fix upload remaining time
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.

Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 15:33:10 +08:00
Nextcloud bot 74654288e6 [tx-robot] updated from transifex 2017-06-16 00:08:44 +00:00
Morris Jobke 5bf447649d Merge pull request #5421 from nextcloud/5190-master
[master] Treat PHP Errors on User session regenerate
2017-06-15 10:11:56 -05:00
Robin Appelman 2e8e6f95b9 show used space in user list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-15 14:06:54 +02:00
Robin Appelman fa81759917 fix moving folders out of a cache jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-15 13:59:06 +02:00
blizzz 8ccc2e2758 Merge pull request #5396 from nextcloud/gpx-mimetype
add gpx mimetype
2017-06-15 13:23:32 +02:00
Marin Treselj 843f0ec6ad Remove XML heared and line breaks in SVG files.
My suggestion for further SVG optimiztion - as mentioned in #5229

Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-06-15 13:21:51 +02:00
Julius Härtl 0999ed1778 Do not open version file again
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-15 12:46:51 +02:00
Julius Härtl 0789adaf95 Make cache and scss caching depend on the baseUrl
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-15 12:46:24 +02:00
Arthur Schiwon d1a8269de3 Forward port of #5190 to master
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:20:49 +02:00
Morris Jobke ca3c69c8ae Merge pull request #5298 from nextcloud/bugfix/4885/calendar_shares_url_special_char_issue
urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:40 -05:00
Morris Jobke ac565cecad Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares
allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:00:39 -05:00
Morris Jobke db14089d6c Merge pull request #5375 from nextcloud/share-folder-for-remote-shares
Use the share_folder config for remote shares
2017-06-14 22:42:06 -05:00
Nextcloud bot 7a269ae872 [tx-robot] updated from transifex 2017-06-15 00:08:40 +00:00
Morris Jobke 2398d40d98 Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email
Allow to find local users by their email address
2017-06-14 18:03:24 -05:00
Morris Jobke fc47d0bbaa Merge pull request #5244 from nextcloud/dynamic-percentual-appmenu-limit
Now using dynamic percentual appmenu limit
2017-06-14 11:36:04 -05:00
Morris Jobke 8eb955d5c6 Merge pull request #4993 from michaelletzgus/emit_css-tags
Emit css tags
2017-06-14 11:29:25 -05:00
Joas Schilling f28511cac6 Add unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:32:34 +02:00
Joas Schilling 4f98852f52 Make sure to only add system users once
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:07:21 +02:00
Joas Schilling 07bfedb062 Merge pull request #5409 from nextcloud/1param2much
a parameter too much
2017-06-14 14:47:56 +02:00
Joas Schilling da95d4bcf1 Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholder
Localize contacts menu search input placeholder
2017-06-14 14:44:54 +02:00
Arthur Schiwon ed49d9b9ed a parameter too much
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 14:41:30 +02:00
Lukas Reschke 3cacd4156f Merge pull request #5013 from nextcloud/update-integration-tests-composer-cache
Update integration tests composer cache
2017-06-14 14:22:24 +02:00
Lukas Reschke a7abac5897 Merge pull request #5392 from nextcloud/maintenance-mode-style
Use the guest.css for the maintenance page as well
2017-06-14 14:11:28 +02:00
Joas Schilling e62e7a201d Use translated Hint instead of english error on password policy
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 12:17:16 +02:00
Arthur Schiwon 0f92a2c6fd bycatch, x-ldif entry was missing
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 11:47:44 +02:00
Arthur Schiwon 4d692b6966 add location filetype icon
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 11:46:00 +02:00
Julius Härtl cec2893d3b Show at least 8 icons, don't use percentage on mobile
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-14 11:14:04 +02:00
Arthur Schiwon c1d9565131 added kml, kmz, tcx types as well while at it
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 11:02:05 +02:00
Arthur Schiwon addcda9325 add geospatial mime types repair step
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 10:48:56 +02:00
blizzz f3f3d077ae Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check
remove check, user_webdavauth is not an app anymore for long
2017-06-14 10:32:14 +02:00
Christoph Wurst 64d39aad25 Localize contacts menu search input placeholder
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-14 10:29:36 +02:00
Lukas Reschke b76e43e0a3 Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encryption
don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:45 +02:00
Morris Jobke 57fb36b6ae Update integration tests composer cache
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-14 09:37:47 +02:00
Nextcloud bot dc61fb999d [tx-robot] updated from transifex 2017-06-14 00:08:39 +00:00
Morris Jobke f38f2baa5a Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birthday_calendar
allow PropPatch requests to contact_birthdays
2017-06-13 18:11:13 -05:00
Morris Jobke 0b92700b52 Merge pull request #5072 from mjmunger/master
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-13 17:51:16 -05:00
Morris Jobke 262e6fc1b0 Merge pull request #5061 from nextcloud/example-theme-guest
Fix example theme
2017-06-13 17:48:05 -05:00
Arthur Schiwon 6538302daa add gpx mimetype
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-14 00:26:01 +02:00
Morris Jobke 0f83cdc78e Use the guest.css for the maintenance page as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 16:43:25 -05:00
Morris Jobke 101d1c0f81 Merge pull request #5367 from nextcloud/better-share-error
Better error message on invalid sharing link
2017-06-13 14:59:38 -05:00
Morris Jobke 69fd3a3c7b Merge pull request #5380 from nextcloud/global-scale-settings
fix "add to your nextcloud" input field
2017-06-13 14:41:32 -05:00
Morris Jobke c4bb37b4ee Merge pull request #5383 from nextcloud/revert-5259
Revert "allow admin to disable groups on personal page"
2017-06-13 14:39:02 -05:00
Morris Jobke e7b5c5c268 Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-for-clients-that-dont-follow-specs
Prevent sending second WWW-Authenticate header
2017-06-13 12:36:31 -05:00
Morris Jobke eafaa2f238 Merge pull request #5378 from patschi/fix-5349
Fix #5349, no themed icon when dragging folder
2017-06-13 12:21:17 -05:00
Morris Jobke 666e4de55f Merge pull request #5305 from nextcloud/add-quota-to-files-view
Add quota to the files view
2017-06-13 12:19:27 -05:00
Joas Schilling 0f8c1b13a3 Fix unknown share token
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:44:50 +02:00
Joas Schilling ae693129db Allow to find local users by their email address
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:07:47 +02:00
Bjoern Schiessle 2b3549610b 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:46 +02:00
Morris Jobke 8760abae63 Revert "allow admin to disable groups on personal page"
This reverts commit 28e1a9da6c.

See #5259
2017-06-13 10:43:21 -05:00
Morris Jobke 906b2402b4 Merge pull request #5369 from nextcloud/fix-user-group-name-escaping
Fix escaping of user and group names in "shared by" message
2017-06-13 10:34:31 -05:00
Morris Jobke 4a256aa6e4 Do not show icon for quota bar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 10:30:26 -05:00
Lukas Reschke 2f7f6e28a2 Merge pull request #5373 from nextcloud/i-like-you-all-but-would-like-you-more-if-you-dont-ignore-red-ci-states
Remove duplicate dependencies entry
2017-06-13 17:22:11 +02:00
Morris Jobke 40802f3acd Merge pull request #5364 from nextcloud/fix-strings
fix config switch description
2017-06-13 10:21:42 -05:00
Patrik Kernstock 144fc1b5de Fix #5349, no themed icon when dragging folder
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-13 17:11:05 +02:00
Lukas Reschke 72ccab0ab6 Merge pull request #5370 from nextcloud/update-third-party-ref
Update third-party ref
2017-06-13 15:10:13 +02:00
Joas Schilling b5beaf7ef4 Use the share_folder config for remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 14:30:25 +02:00
Lukas Reschke 64c1cee027 Remove duplicate dependencies entry
🙈

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 14:02:34 +02:00
Lukas Reschke 633396001f 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 13:54:52 +02:00
Lukas Reschke a0d753bc4b Update third-party ref
Ref https://github.com/nextcloud/3rdparty/pull/52

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-13 13:28:29 +02:00
Joas Schilling b7761be4d9 Merge pull request #5302 from nextcloud/fix_5047
use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:41 +02:00
Joas Schilling 376fe0e246 Fix escaping of user and group names in "shared by" message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 12:14:21 +02:00
Joas Schilling 27690e0fb4 Remove unused element
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:45 +02:00
Morris Jobke 2fe2b5a1d0 Put the quota bar to the bottom
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 11:17:45 +02:00
Joas Schilling b481fa40ef Adjust the unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling 3a17131995 Remove the colored corners
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling fcdcd3f283 Add an event so apps can add hidden fields to the files page
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:44 +02:00
Joas Schilling b0171a7584 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 11:17:44 +02:00
Joas Schilling d8f10e96a2 Content will come from the external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:43 +02:00
Joas Schilling 06a925d888 Remove useless translation and make it better on unlimited
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:43 +02:00
Jan-Christoph Borchardt 3f549609b9 Style quota entry in files view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-13 11:17:43 +02:00
Joas Schilling 0554dba69e Add quota to the files view
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 11:17:42 +02:00
Lukas Reschke c46422b780 Merge pull request #5343 from nextcloud/share-filter-missing-groups
filter missing groups in share provider
2017-06-13 10:53:26 +02:00
Bjoern Schiessle ceab119c29 fix config switch description, this is only about searching for users, to enable/disable the possibility to publish users data we have a seperate config switch below
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 10:35:06 +02:00
Bjoern Schiessle 86eb23b91e don't try to encrypt/decrypt the certificate bundle
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 09:50:45 +02:00
Morris Jobke 6a06df824e Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs
Version and dependency are now required
2017-06-12 22:33:16 -05:00
Nextcloud bot ea64cb0028 [tx-robot] updated from transifex 2017-06-13 00:08:22 +00:00
Morris Jobke aa243376ef Merge pull request #5271 from nextcloud/use-mailer-to-create-email-template
Also use IMailer interface to generate the email template
2017-06-12 17:52:52 -05:00
Morris Jobke 69b6504285 Merge pull request #5167 from nextcloud/rakekniven-patch-2
l10n improvements from transifex
2017-06-12 16:18:54 -05:00
Morris Jobke 6b3b341775 Merge pull request #5315 from nextcloud/global-eval
execute eval in global scope, addresses #5314
2017-06-12 15:52:55 -05:00
Morris Jobke 9c629eaf0e Merge pull request #5323 from nextcloud/use-touch-icon-for-favicon-fb.png
Theme image for favicon-fb.png
2017-06-12 15:28:00 -05:00
Lukas Reschke a4b48d55ad Fix tests
return is not defined

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-06-12 22:19:44 +02:00
Lukas Reschke 7f0ed97522 Merge pull request #5310 from nextcloud/fix-tag-label-removed-when-share-view-is-opened
Fix tag label removed when share view is opened
2017-06-12 22:11:15 +02:00
Lukas Reschke 8b514bc4c1 Merge pull request #5341 from m4dz/bug/everyone-group-highlight
Highlight everyone group by default
2017-06-12 22:03:14 +02:00
Lukas Reschke 659a8bf24c Merge pull request #5344 from nextcloud/fix-transifex
Remove the char because it breaks the export from transifex
2017-06-12 22:00:07 +02:00
Georg Ehrke 35781ae45c urldecode group principals in Cal- and CardDAV backend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-12 21:01:30 +02:00
Morris Jobke 0577e55559 Merge pull request #5319 from nextcloud/theming-undo-hover
Show reset to default button for theming values on hover, fix #3198
2017-06-12 13:23:07 -05:00
Joas Schilling 8ecdeaa716 Remove the char because it breaks the export from transifex
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-12 16:30:08 +02:00
Robin Appelman f707a40f19 filter missing groups in share provider
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-12 15:46:19 +02:00
m4dz 56adbb4e1d [docs] remove useless TODO mark 2017-06-12 11:19:31 +02:00
m4dz 5feabd4634 [fix] Highlight 'everyone' group by default 2017-06-12 10:14:18 +02:00
Nextcloud bot 7297757a6a [tx-robot] updated from transifex 2017-06-12 00:08:12 +00:00
Nextcloud bot 08702cbaba [tx-robot] updated from transifex 2017-06-11 00:08:21 +00:00
Jan-Christoph Borchardt 6769d177c1 Merge pull request #5331 from nextcloud/remove-unneeded-css-apppasswords
Remove unneeded CSS
2017-06-11 00:51:49 +02:00
Marius Blüm bfbbc57025 Remove unneeded CSS
* was removed with #5166 so there is no more apppasswords-section

Signed-off-by: Marius Blüm <marius@lineone.io>
2017-06-10 21:50:25 +02:00
Patrik Kernstock c0c5df31c0 Decimal percentage, dynamic appIcon width
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-10 17:33:01 +02:00
Nextcloud bot b2892274fc [tx-robot] updated from transifex 2017-06-10 00:08:38 +00:00
Lukas Reschke ae6e1fe1df 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:12:37 +02:00
Jan-Christoph Borchardt 35eaae4209 Merge pull request #5307 from artemanufrij/master
Fix height for horizontal scrollbar
2017-06-09 16:39:55 +02:00
Lukas Reschke ee1b9d8762 Merge pull request #5122 from nextcloud/fix-ldap-integration-tests
Fix ldap integration tests
2017-06-09 16:05:36 +02:00
Morris Jobke 1286e9716b Merge pull request #5311 from nextcloud/revert-5116-zipstreamer
Revert "Always enable Zip64 extension for zipstreamer"
2017-06-09 08:56:20 -05:00
Jan-Christoph Borchardt 67069facb7 Show reset to default button for theming values on hover, fix #3198
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-09 15:54:17 +02:00
Lukas Reschke 602d82d5ee Merge pull request #5318 from nextcloud/fix-master
Fix missing js merge on master
2017-06-09 14:54:49 +02:00
Joas Schilling 42294612d7 Fix missing js merge on master
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-09 14:33:14 +02:00
Arthur Schiwon 944738c71d 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-09 13:43:09 +02:00
Lukas Reschke 0433c4e4cf Merge pull request #5118 from nextcloud/use-language-of-recipient-not-admin
Use the language of the recipient not the actor
2017-06-09 11:34:08 +02:00
Björn Schießle e99bcc496d Merge pull request #5308 from nextcloud/fix_running_only_dav_tests
add missing parent::setUp that broke any other dav app test
2017-06-09 10:46:31 +02:00
Joas Schilling 7d806bdfbd Revert "Always enable Zip64 extension for zipstreamer" 2017-06-09 10:21:26 +02:00
Daniel Calviño Sánchez 6bcace4609 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-09 09:13:29 +02:00
Daniel Calviño Sánchez ccf4b9ec69 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-09 09:04:24 +02:00
Daniel Calviño Sánchez 9e767b46ec 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-09 09:02:14 +02:00
Daniel Calviño Sánchez 599274f509 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-09 08:43:53 +02:00
Daniel Calviño Sánchez 0a3d9f25c1 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-09 03:14:23 +02:00
Daniel Calviño Sánchez 423136d319 Extract duplicated code to a method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-09 03:03:47 +02:00
Daniel Calviño Sánchez be02b3df28 Add acceptance tests for showing the input field for tags
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-06-09 03:02:33 +02:00
Nextcloud bot 628284a34c [tx-robot] updated from transifex 2017-06-09 00:08:24 +00:00
Artem Anufrij cf83729873 Fix height for horizontal scrollbar
Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
2017-06-08 19:27:32 +02:00
Georg Ehrke a0c2e6e922 add missing parent::setUp that broke any other dav app test
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 19:26:36 +02:00
Joas Schilling 3384c5fb70 Merge pull request #5287 from nextcloud/personal-page-gs-mode
show input fields if they are not empty but disable them in global scale mode
2017-06-08 15:03:58 +02:00
Bjoern Schiessle 1ef8ea5a7e 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:46:52 +02:00
Georg Ehrke 0f1d47cdf3 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:21:56 +02:00
Georg Ehrke 9563c25c69 allow PropPatch requests to contact_birthdays
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-06-08 08:00:52 +02:00
Nextcloud bot a74901fce1 [tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Morris Jobke a753fbe818 Merge pull request #5185 from nextcloud/error-spam-in-log
Don't try to generate logs for chunking paths
2017-06-07 17:12:47 -05:00
Morris Jobke e934e5104d Merge pull request #5277 from nextcloud/fix-personal-settings-regression
Allow to change avatar when groups are disables
2017-06-07 11:43:02 -05:00
Morris Jobke 3ad4a2839f 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:27:27 -05:00
Bjoern Schiessle 1ad4268046 unify look of disabled display name / email address and the other input fields
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 18:07:53 +02:00
Bjoern Schiessle f5731e1ba4 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 17:13:29 +02:00
Joas Schilling b6d6f3c521 Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-07 11:24:00 +02:00
Joas Schilling 3678be045e Merge pull request #5267 from nextcloud/personal-sessions-renamwe
reword sessions to security in personal settings
2017-06-07 10:11:08 +02:00
Nextcloud bot a3c5d43cd5 [tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Morris Jobke 72235064fb Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
allow admin to disable groups on personal page
2017-06-06 11:30:08 -05:00
Morris Jobke b58928b4c1 Also use IMailer interface to generate the email template
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 10:47:48 -05:00
Morris Jobke 4a3e118add Merge pull request #5268 from nextcloud/allow-to-theme-emails
Allow to overwrite the email template again
2017-06-06 10:00:34 -05:00
Robin Appelman 340fdc1e70 reword sessions to security in personal settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-06 15:25:28 +02:00
Morris Jobke 15314b6f5b Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fields
Don't allow the user to set fields they can't see
2017-06-06 08:06:39 -05:00
Morris Jobke 811f7b527a Merge pull request #5265 from nextcloud/follow-up-5166-bring-back-description
Bring back the description for app passwords
2017-06-06 08:04:40 -05:00
Morris Jobke edec9ade80 Update autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 08:04:26 -05:00
Joas Schilling 3af8abb098 Allow to overwrite the email template again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 14:23:03 +02:00
Joas Schilling 3ed8ad1584 Bring back the description for app passwords
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:44:37 +02:00
Joas Schilling f39fdaf46e adjust the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 11:42:48 +02:00
Bjoern Schiessle 28e1a9da6c allow admin to disable groups on personal page
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 09:58:52 +02:00
Morris Jobke c092b33466 Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-list
Combine sessions and app passwords view into one single view
2017-06-05 23:04:06 -05:00
Nextcloud bot bb884c341f [tx-robot] updated from transifex 2017-06-06 00:08:45 +00:00
Nextcloud bot f901861f81 [tx-robot] updated from transifex 2017-06-05 00:08:29 +00:00
Morris Jobke 529d8122bb Merge pull request #4791 from nextcloud/permalink_copy_on_click
Copy permalink directly on click
2017-06-04 12:18:53 -05:00
Patrik Kernstock c88e4e2feb Now using dynamic percentual appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-06-04 03:26:40 +02:00
Nextcloud bot f03d6f225e [tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot 5d39f700e4 [tx-robot] updated from transifex 2017-06-03 00:09:00 +00:00
blizzz 2e2d406bf5 Merge pull request #5213 from nextcloud/fix-change-hook
Trigger changeUser hook only on real changes
2017-06-02 13:14:33 +02:00
blizzz 45305c762d Merge pull request #5209 from nextcloud/fix-install-mysql-mb4
fix install on mb4 enabled mariadb/mysql
2017-06-02 13:10:28 +02:00
Joas Schilling 19041ed1a8 Also cover the settings endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 12:31:37 +02:00
Björn Schießle 74fccf20c8 Merge pull request #5084 from nextcloud/useful-gs-settings
add new config switched for the global scale architecture
2017-06-02 10:58:43 +02:00
Joas Schilling 0e26ba4c2a Don't allow the user to set fields they can't see
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 10:09:42 +02:00
Nextcloud bot c70de161cf [tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Arthur Schiwon 18a8f3654b fix install on mb4 enabled mariadb/mysql
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:44:18 +02:00
Joas Schilling d4f3d85e3c Merge pull request #5110 from nextcloud/rakekniven-patch-1
l10n change
2017-06-01 11:58:16 +02:00
Arthur Schiwon 999455c1aa emit changeUser only if there really was a change (quota, displayname)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 11:34:17 +02:00
Nextcloud bot 8801b68d45 [tx-robot] updated from transifex 2017-06-01 00:08:38 +00:00
Arthur Schiwon 2bbd5147e7 remove check, user_webdavauth is not an app anymore for long
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 01:33:04 +02:00
blizzz 8318b2a137 Merge pull request #5104 from nextcloud/ldap-attempt-reconnect
Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
2017-06-01 01:20:57 +02:00
rakekniven f2d999aa70 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-05-31 13:41:45 +02:00
Morris Jobke a0f16c69ac Merge pull request #5160 from nextcloud/comradekingu-patch-1
no "mail" or mid sentence "E-mail"
2017-05-31 11:16:51 +02:00
Joas Schilling 97e41015b3 Don't try to generate logs for chunking paths
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-31 11:10:42 +02:00
Nextcloud bot 5f9cc5a2d5 [tx-robot] updated from transifex 2017-05-31 00:08:48 +00:00
Joas Schilling 1d227d83c0 Merge pull request #5116 from McNetic/zipstreamer
Always enable Zip64 extension for zipstreamer
2017-05-30 12:37:01 +02:00
Joas Schilling bd19eef2ae Merge pull request #5135 from patschi/remove-appmenu-limit
Remove appmenu limit
2017-05-30 11:51:10 +02:00
Christoph Wurst 593f6281dc Combine sessions and app passwords view into one single view
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-30 09:54:10 +02:00
Nextcloud bot b9b7f8bede [tx-robot] updated from transifex 2017-05-30 00:08:44 +00:00
Bjoern Schiessle 7c2d473d76 add new config switched for the global scale architecture
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-29 18:19:28 +02:00
comradekingu 864b21dd46 no "mail" or mid sentence "E-mail" 2017-05-29 18:16:09 +02:00
Nextcloud bot 4be17dff0f [tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Lukas Reschke caccb9ca9c Merge pull request #5126 from nextcloud/setting-the-same-email-shouldnt-trigger-activity
Don't trigger activity when the email didn't change
2017-05-28 18:25:09 +01:00
Nextcloud bot 4f2b26d246 [tx-robot] updated from transifex 2017-05-28 00:08:14 +00:00
Nextcloud bot e3e3e8edf2 [tx-robot] updated from transifex 2017-05-27 00:08:32 +00:00
Patrik Kernstock 65d52a1ddf Closed #5121, remove appmenu limit
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-26 19:39:22 +02:00
Joas Schilling d0c614a322 Allow dir-listing also when one child is blocked by access control
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 15:54:39 +02:00
Arthur Schiwon b79f9cadc2 fix paging
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 13:44:43 +02:00
Joas Schilling 7ef6f065ca Don't trigger activity when the email didn't change
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 12:49:12 +02:00
Björn Schießle 53c8e98f69 Merge pull request #5095 from patschi/patch-1
Fix #5059 by adding sanity checks before using var
2017-05-26 12:10:57 +02:00
Arthur Schiwon a619d349bf add convenience script to run all tests at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:31:26 +02:00
Arthur Schiwon f11d998371 Make IDE happy
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:30:43 +02:00
Arthur Schiwon 10ef98a3b1 add missing INotificationManager when creating User backend, LDAP
UserManager

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-26 11:25:54 +02:00
blizzz de953b4d74 Merge pull request #5090 from nextcloud/try-fixing-missing-background-jobs-on-app-update
Register the autoloading earlier so we can load the background jobs
2017-05-26 10:43:08 +02:00
Joas Schilling cec6ceba9c Use the language of the recipient not the actor
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 10:16:14 +02:00
Nextcloud bot c1925ddfd0 [tx-robot] updated from transifex 2017-05-26 00:08:16 +00:00
Nicolai Ehemann 619afd499e Always enable Zip64 extension for zipstreamer
Signed-off-by: Nicolai Ehemann <en@enlightened.de>
2017-05-25 22:30:03 +02:00
rakekniven ee80f02a46 l10n change
See https://www.transifex.com/nextcloud/nextcloud/translate/#nb_NO/sharebymail/108178153
2017-05-25 14:23:56 +02:00
Michael Letzgus 0d320fba4b Streamline templates, more DRY
Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-)

(Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?)

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-05-25 11:13:43 +02:00
Nextcloud bot a46d2f1d39 [tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Arthur Schiwon bd5d12528f make sure used ldap connection resource is always up to date
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:45:48 +02:00
bline 8c89bf7c59 moved to something a little less invasive. back to passing CR around.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-05-25 00:36:51 +02:00
bline 8829d84949 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-25 00:34:52 +02:00
Patrik Kernstock dba8927011 Fix #5059 by adding sanity checks before using var
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-24 15:08:29 +02:00
Robin Appelman ed89034047 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-05-24 13:56:09 +02:00
Joas Schilling 3f29c55914 Register the autoloading earlier so we can load the background jobs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-24 12:58:10 +02:00
Nextcloud bot 6cc26efbc5 [tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Michael Munger b8f2418248 Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071 2017-05-23 10:29:30 -04:00
Roeland Jago Douma 91315f63cf Copy permalink directly on click
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-23 13:44:42 +02:00
Roeland Jago Douma 30ac7ec2bf Merge pull request #5004 from nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table
fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:26:10 +02:00
Julius Härtl 22607b54e5 Move styles.css to server.css
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-23 12:10:09 +02:00
Roeland Jago Douma 250db249b5 Merge pull request #5042 from nextcloud/external-get-for-group-sql-type
use the correct param type when getting external storages for groups
2017-05-23 11:36:20 +02:00
Roeland Jago Douma 3aee260737 Merge pull request #4969 from nextcloud/fix-broken-activity-avatars-with-external-users
Fix username and avatar for external users
2017-05-23 08:33:49 +02:00
Nextcloud bot 9c8a838624 [tx-robot] updated from transifex 2017-05-23 00:08:29 +00:00
Robin Appelman 0baeec170e use the correct param type when getting external storages for groups
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-22 17:39:56 +02:00
Joas Schilling 1efd961476 Merge pull request #5010 from nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app
Fix starting lower case letter in tooltip of Theming app
2017-05-22 15:03:18 +02:00
Roeland Jago Douma 9fdc64e0b6 Merge pull request #5014 from nextcloud/update-opcache-recommendation
Update Opcache recommendation
2017-05-22 14:52:59 +02:00
Roeland Jago Douma cc5393f536 Merge pull request #5016 from nextcloud/reset-opcache-on-updater-page-load
Reset opcache if update is detected
2017-05-22 14:52:20 +02:00
Joas Schilling ecd299e8de Merge pull request #5023 from nextcloud/version_bump
We are working on 13 now!
2017-05-22 12:20:05 +02:00
Joas Schilling 3ec9d91bd0 Split multi-author entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
Joas Schilling bc8fbc1a67 Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15 Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Joas Schilling 02275e60c6 Add missing version requirement to OAuth2 app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 09:56:49 +02:00
Joas Schilling eebd2811dc Version and dependency are now required
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 09:54:44 +02:00
Morris Jobke e102923a97 Merge pull request #5000 from nextcloud/phil-davis-filename-input-tooltip
Make rename file tooltip error text change
2017-05-22 01:51:42 -05:00
Roeland Jago Douma 9f91fd95c0 We are working on 13 now!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-22 08:40:38 +02:00
Roeland Jago Douma 43eb424da1 Merge pull request #5009 from nextcloud/update-acceptance-tests-for-issue-4921
Update acceptance tests for issue #4921
2017-05-22 08:36:11 +02:00
Nextcloud bot 462f12611c [tx-robot] updated from transifex 2017-05-22 00:08:23 +00:00
Morris Jobke b744639136 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:38:24 -05:00
Morris Jobke 1fedf450ac Update Opcache recommendation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-21 18:21:28 -05:00
Lukas Reschke 1db93ec7c5 Merge pull request #5007 from nextcloud/fix_scss_cache
Fix scss cache
2017-05-21 22:52:24 +02:00
Roeland Jago Douma 3cec5ee8c5 Increase version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-21 22:11:02 +02:00
Roeland Jago Douma 32f5c028a0 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:10:00 +02:00
Lukas Reschke 5b39c6fdd0 v12.0.0
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-21 17:11:12 +02:00
Daniel Calviño Sánchez 41412088db 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 14:45:43 +02:00
Georg Ehrke 4b5379309e fix replacing of 4MB Unicode Chars in cal props table
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-05-21 13:26:46 +02:00
Phil Davis 2b2f27486a Make new file file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-21 08:23:17 +05:45
Phil Davis ca1d41e077 Make rename file tooltip error text change
Signed-off-by: Phil Davis <phil@jankaritech.com>
2017-05-21 08:22:40 +05:45
Morris Jobke 6521b6e9a0 Merge pull request #4983 from nextcloud/master-oauth-not-disable
Mark OAuth app as always enabled
2017-05-20 19:11:56 -05:00
Nextcloud bot c677f49469 [tx-robot] updated from transifex 2017-05-21 00:08:26 +00:00
Morris Jobke 2dbd389bdb Merge pull request #4997 from nextcloud/federated-share-fix
fix for sharing
2017-05-20 17:01:15 -05:00
Morris Jobke 0dae4946cf Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2
Make page loading faster, deferred script loading, now switchable:
2017-05-20 16:53:30 -05:00
Lukas Reschke 7a8bd73547 Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 16:38:32 -05:00
Lukas Reschke dfe944c272 Merge pull request #4995 from nextcloud/master-version-dump
12.0.0RC3
2017-05-20 20:31:32 +02:00
Daniel Calviño Sánchez 8a05494964 Fix starting lower case letter in tooltip of Theming app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-20 17:10:26 +02:00
Daniel Hansson 119e8474b6 fix for sharing
Signed-off-by: Daniel Hansson <daniel@techandme.se>
2017-05-20 16:23:04 +02:00
Lukas Reschke 2bbf623aeb 12.0.0RC3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-20 14:21:05 +02:00
Michael Letzgus fb9f13d4c1 Make page loading faster by deferred script loading:
* Create generalized function for emmitting <script defer src=""> tags to templates
* Remove type attribute from inline_js
* Add defer attribute to external <script> tags

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-05-20 13:44:04 +02:00
Nextcloud bot a442c86a84 [tx-robot] updated from transifex 2017-05-20 00:08:27 +00:00
Lukas Reschke 3487f62d55 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:24:41 -05:00
Morris Jobke fe8c67ad23 Merge pull request #4981 from nextcloud/fix-missing-argument-2-getAppContainer-master
Fix missing argument 2 for Settings classes
2017-05-19 17:05:49 -05:00
Joas Schilling a411adee6c Fix missing argument 2 for Settings classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 22:32:50 +02:00
Björn Schießle d7eb58f09d Merge pull request #4943 from nextcloud/rename-secure-drop
rename secure drop back to files drop
2017-05-19 21:56:36 +02:00
Lukas Reschke 5cecaae91f Merge pull request #4974 from nextcloud/fix-hidden-sidebar
Fixes visible sidebar even if hidden is applied
2017-05-19 21:48:32 +02:00
Lukas Reschke 2e10812898 Merge pull request #4972 from nextcloud/fix-group-restriction
Fix group restriction regression
2017-05-19 21:46:10 +02:00
Lukas Reschke 86a790a544 12.0.0RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 21:18:51 +02:00
Lukas Reschke c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream
Fix logo being too big on log in page, fix #4585
2017-05-19 20:50:09 +02:00
Morris Jobke 3636672fa5 Fixes visible sidebar even if hidden is applied
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 13:03:54 -05:00
Morris Jobke c7ade85982 Fix group restriction regression
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:05:09 -05:00
Roeland Jago Douma 7eb8b3cec1 Merge pull request #4956 from nextcloud/endless-loop-on-invalid-asset
Stop infinit loop on invalid settings css/js file
2017-05-19 16:51:49 +02:00
Lukas Reschke 494cd2de5f Merge pull request #4970 from franga2000/patch-1
Fixed typo
2017-05-19 16:19:52 +02:00
Julius Härtl 52f10c436e Scale logo only for custom ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-19 16:18:09 +02:00
Miha Frangez 0d6493a0c7 Fixed typo 2017-05-19 15:58:13 +02:00
Joas Schilling edb4956290 Fix username and avatar for external users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-19 15:45:14 +02:00
Joas Schilling bcddca9a64 Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.php
Allow automatic DI for apps that don't register the container in app.php
2017-05-19 13:48:01 +02:00
Lukas Reschke dd29e5ab9d Merge pull request #4950 from nextcloud/master-workaround-4948
Lowercase the scriptname again
2017-05-19 12:37:32 +02:00
Joas Schilling 4792867357 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:41:08 +02:00
Morris Jobke 770f37a01c Merge pull request #4951 from nextcloud/transifex-oauth2
Add oauth2 to transifex
2017-05-18 19:11:28 -05:00
Morris Jobke f53c6b146c Add oauth2 to transifex
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-18 19:10:55 -05:00
Nextcloud bot e24105feba [tx-robot] updated from transifex 2017-05-19 00:08:26 +00:00
Lukas Reschke eab9468109 Lowercase the scriptname again
Ref https://github.com/nextcloud/server/issues/4948

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 01:59:00 +02:00
Lukas Reschke 44c9080f51 12.0.0RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 00:59:34 +02:00
Bjoern Schiessle e9ab452ff3 rename secure drop back to files drop because of name collision with securedrop.org
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 16:55:58 +02:00
Joas Schilling c1cc8193a7 Allow automatic DI for apps that don't register the container in app.php
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-16 17:37:41 +02:00
Jan-Christoph Borchardt 70c750dacc Fix logo being too big on log in page, fix #4585
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 15:53:54 +02:00
coderkun b44c3dd198 Improve warning for X-Frame-Options header DENY (#3808)
Signed-off-by: Oliver Hanraths <olli@coderkun.de>
2017-05-14 13:16:36 +02:00
3813 changed files with 99345 additions and 292378 deletions
+309 -57
View File
@@ -25,7 +25,7 @@ pipeline:
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 .
- ./lib/composer/bin/parallel-lint --exclude build/.phan/ --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 .
when:
matrix:
TESTS: syntax-php5.6
@@ -45,6 +45,16 @@ pipeline:
when:
matrix:
TESTS: syntax-php7.1
phan:
image: nextcloudci/php7.2:php7.2-11
commands:
- composer install
- composer require --dev "phan/phan:0.11.1"
- ./lib/composer/phan/phan/phan -k build/.phan/config.php
- php ./build/.phan/plugin-checker.php
when:
matrix:
TESTS: phan
litmus-v1:
image: nextcloudci/litmus-php7.0:litmus-php7.0-6
commands:
@@ -160,6 +170,14 @@ pipeline:
matrix:
DB: NODB
PHP: 7.1
nodb-php7.2:
image: nextcloudci/php7.2:php7.2-9
commands:
- NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite
when:
matrix:
DB: NODB
PHP: 7.2
sqlite-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
@@ -184,7 +202,14 @@ pipeline:
matrix:
DB: sqlite
PHP: 7.1
sqlite-php7.2:
image: nextcloudci/php7.2:php7.2-9
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite
when:
matrix:
DB: sqlite
PHP: 7.2
mysql-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
@@ -193,15 +218,106 @@ pipeline:
matrix:
DB: mysql
PHP: 5.6
mysql-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql
PHP: "7.0"
mysql-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql
PHP: 7.1
mysql-php7.2:
image: nextcloudci/php7.2:php7.2-9
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql
PHP: 7.2
mysql5.6-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.6
PHP: 5.6
mysql5.6-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.6
PHP: "7.0"
mysql5.6-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.6
PHP: 7.1
mysql5.5-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.5
PHP: 5.6
mysql5.5-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.5
PHP: "7.0"
mysql5.5-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysql
when:
matrix:
DB: mysql5.5
PHP: 7.1
postgres-php5.6:
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
when:
matrix:
DB: postgres
PHP: 5.6
POSTGRES: 9
postgres-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- sleep 10 # gives the database enough time to initialize
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
when:
matrix:
DB: postgres
PHP: "7.0"
postgres-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- sleep 10 # gives the database enough time to initialize
- POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql
when:
matrix:
DB: postgres
PHP: 5.6
PHP: 7.1
mysqlmb4-php5.6:
image: nextcloudci/php5.6:php5.6-8
commands:
@@ -210,10 +326,34 @@ pipeline:
matrix:
DB: mysqlmb4
PHP: 5.6
mysqlmb4-php7.0:
image: nextcloudci/php7.0:php7.0-16
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
matrix:
DB: mysqlmb4
PHP: "7.0"
mysqlmb4-php7.1:
image: nextcloudci/php7.1:php7.1-15
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
matrix:
DB: mysqlmb4
PHP: 7.1
mysqlmb4-php7.2:
image: nextcloudci/php7.2:php7.2-9
commands:
- NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mysqlmb4
when:
matrix:
DB: mysqlmb4
PHP: 7.2
integration-capabilities_features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh capabilities_features/capabilities.feature
when:
@@ -231,7 +371,7 @@ pipeline:
integration-auth:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/auth.feature
when:
@@ -240,7 +380,7 @@ pipeline:
integration-maintenance-mode:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/maintenance-mode.feature
when:
@@ -249,7 +389,7 @@ pipeline:
integration-ratelimiting:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- ./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
@@ -264,7 +404,7 @@ pipeline:
integration-carddav:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/carddav.feature
when:
@@ -273,7 +413,7 @@ pipeline:
integration-dav-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/dav-v2.feature
when:
@@ -282,7 +422,7 @@ pipeline:
integration-ocs-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/ocs-v1.feature
when:
@@ -291,7 +431,7 @@ pipeline:
integration-sharing-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/sharing-v1.feature
when:
@@ -300,7 +440,7 @@ pipeline:
integration-sharing-v1-part2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/sharing-v1-part2.feature
when:
@@ -309,7 +449,7 @@ pipeline:
integration-sharing-v1-part3:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/sharing-v1-part3.feature
when:
@@ -318,7 +458,7 @@ pipeline:
integration-checksums-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/checksums.feature
when:
@@ -327,7 +467,7 @@ pipeline:
integration-external-storage:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/external-storage.feature
when:
@@ -336,7 +476,7 @@ pipeline:
integration-provisioning-v1:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/provisioning-v1.feature
when:
@@ -345,7 +485,7 @@ pipeline:
integration-tags:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/tags.feature
when:
@@ -354,7 +494,7 @@ pipeline:
integration-caldav:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/caldav.feature
when:
@@ -363,7 +503,7 @@ pipeline:
integration-comments:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/comments.feature
when:
@@ -372,7 +512,7 @@ pipeline:
integration-favorites:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/favorites.feature
when:
@@ -381,7 +521,7 @@ pipeline:
integration-provisioning-v2:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/provisioning-v2.feature
when:
@@ -390,7 +530,7 @@ pipeline:
integration-webdav-related:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/webdav-related.feature
when:
@@ -399,7 +539,7 @@ pipeline:
integration-sharees-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh sharees_features/sharees.feature
when:
@@ -408,7 +548,7 @@ pipeline:
integration-sharees-v2-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh sharees_features/sharees_provisioningapiv2.feature
when:
@@ -425,7 +565,7 @@ pipeline:
integration-filesdrop-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh filesdrop_features/filesdrop.feature
when:
@@ -434,7 +574,7 @@ pipeline:
integration-transfer-ownership-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/transfer-ownership.feature
when:
@@ -443,7 +583,7 @@ pipeline:
integration-ldap-features:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- ./occ app:enable user_ldap
- cd build/integration
- ./run.sh ldap_features/ldap-ocs.feature
@@ -453,12 +593,21 @@ pipeline:
integration-trashbin:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh features/trashbin.feature
when:
matrix:
TESTS: integration-trashbin
integration-remote-api:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
- cd build/integration
- ./run.sh remoteapi_features/remote.feature
when:
matrix:
TESTS: integration-remote-api
acceptance-access-levels:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
@@ -466,6 +615,13 @@ pipeline:
when:
matrix:
TESTS-ACCEPTANCE: access-levels
acceptance-app-comments:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
- tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-comments --selenium-server selenium:4444 allow-git-repository-modifications features/app-comments.feature
when:
matrix:
TESTS-ACCEPTANCE: app-comments
acceptance-app-files:
image: nextcloudci/integration-php7.0:integration-php7.0-6
commands:
@@ -551,6 +707,88 @@ matrix:
ENABLE_REDIS: true
- TESTS: db-codecov
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: NODB
PHP: 7.2
ENABLE_REDIS: false
- 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: sqlite
PHP: 7.2
ENABLE_REDIS: false
- DB: mysql
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql
PHP: 7.0
ENABLE_REDIS: true
- DB: mysql
PHP: 7.1
ENABLE_REDIS: true
- DB: mysql
PHP: 7.2
ENABLE_REDIS: false
- DB: mysql5.6
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql5.6
PHP: 7.0
ENABLE_REDIS: true
- DB: mysql5.6
PHP: 7.1
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 5.6
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 7.0
ENABLE_REDIS: true
- DB: mysql5.5
PHP: 7.1
ENABLE_REDIS: true
- DB: postgres
PHP: 5.6
POSTGRES: 9
ENABLE_REDIS: true
- DB: postgres
PHP: 7.0
POSTGRES: 9
ENABLE_REDIS: true
- DB: postgres
PHP: 7.1
POSTGRES: 9
ENABLE_REDIS: true
- DB: postgres
PHP: 7.1
POSTGRES: 10
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 5.6
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 7.0
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 7.1
ENABLE_REDIS: true
- DB: mysqlmb4
PHP: 7.2
ENABLE_REDIS: false
- TESTS: integration-capabilities_features
- TESTS: integration-federation_features
- TESTS: integration-maintenance-mode
@@ -579,8 +817,11 @@ matrix:
- TESTS: integration-transfer-ownership-features
- TESTS: integration-ldap-features
- TESTS: integration-trashbin
- TESTS: integration-remote-api
- TESTS: acceptance
TESTS-ACCEPTANCE: access-levels
- TESTS: acceptance
TESTS-ACCEPTANCE: app-comments
- TESTS: acceptance
TESTS-ACCEPTANCE: app-files
- TESTS: acceptance
@@ -591,6 +832,7 @@ matrix:
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
- TESTS: syntax-php7.1
- TESTS: phan
- TESTS: litmus-v1
- TESTS: litmus-v2
- TESTS: caldavtester-old-endpoint
@@ -606,33 +848,6 @@ matrix:
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:
@@ -645,7 +860,7 @@ services:
when:
matrix:
ENABLE_REDIS_CLUSTER: true
postgres:
postgres-9:
image: postgres:9
environment:
- POSTGRES_USER=oc_autotest
@@ -656,8 +871,21 @@ services:
when:
matrix:
DB: postgres
POSTGRES: 9
postgres-10:
image: postgres:10
environment:
- POSTGRES_USER=oc_autotest
- POSTGRES_DB=oc_autotest_dummy
- POSTGRES_PASSWORD=owncloud
tmpfs:
- /var/lib/postgresql/data
when:
matrix:
DB: postgres
POSTGRES: 10
mysql:
image: mysql:5.7.22
image: mysql:5.7
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
@@ -668,6 +896,30 @@ services:
when:
matrix:
DB: mysql
mysql:
image: mysql:5.6
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysql5.6
mysql:
image: mysql:5.5
environment:
- MYSQL_ROOT_PASSWORD=owncloud
- MYSQL_USER=oc_autotest
- MYSQL_PASSWORD=owncloud
- MYSQL_DATABASE=oc_autotest
tmpfs:
- /var/lib/mysql
when:
matrix:
DB: mysql5.5
mysqlmb4:
image: mysql:5.7.22
environment:
+2
View File
@@ -0,0 +1,2 @@
*/Activity/* @nickvergessen
*/Notifications/* @nickvergessen
+7
View File
@@ -83,6 +83,9 @@ nbproject
.idea
*.iml
# vscode
.vscode
# geany
*.geany
@@ -135,3 +138,7 @@ Vagrantfile
/config/config-autotest-backup.php
/config/autoconfig.php
clover.xml
# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/
+4 -1
View File
@@ -28,7 +28,10 @@
"_": true,
"OC": true,
"OCA": true,
"OCP": true,
"t": true,
"n": true
"n": true,
"escapeHTML": true,
"Promise": true
}
}
+10 -6
View File
@@ -100,6 +100,7 @@ derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
Donquixote <marjunebatac@gmail.com> Donquixote <marjunebatac@gmailcom>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>
@@ -140,12 +141,13 @@ ganomi <ganomi@gmail.com>
Gaël Beaudoin <gaboo@home.gaboo.org>
geez0x1 <geez0x1@users.noreply.github.com>
gekmihesg <markus@gekmihesg.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@ownCloud.com>
Georg Ehrke <oc.list@georgehrke.com> Georg Ehrke <georg@owncloud.com>
Golnaz Nilieh <g382nilieh@gmail.com>
Grundik <grundik@ololo.cc>
Guillaume AMAT <guillaume.amat@informatique-libre.com>
@@ -315,6 +317,7 @@ Robin McCorkell <robin@mccorkell.me.uk> Robin McCorkell <rmccorkell@owncloud.com
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Jago Douma <rullzer@owncloud.com>
Roeland Jago Douma <roeland@famdouma.nl> Roeland Douma <rullzer@users.noreply.github.com>
Roger Szabo <roger.szabo@web.de> root <roger.szabo@web.de>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>
@@ -400,6 +403,7 @@ Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
Vincent Cloutier <vincent1cloutier@gmail.com>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
Vinicius Cubas Brand <vinicius@eita.org.br> Vinicius Cubas Brand <viniciuscb@gmail.com>
Vitaly Kuznetsov <vitty@altlinux.ru>
Vladimir Sapronov <vladimir.sapronov@gmail.com>
Volkan Gezer <volkangezer@gmail.com> Volkan Gezer <wakeup@users.noreply.github.com>
-34
View File
@@ -1,34 +0,0 @@
{
"maxReviewers": 3,
"numFilesToCheck": 5,
"alwaysNotifyForPaths": [
{
"name": "nickvergessen",
"files": [
"lib/private/Activity/**",
"lib/private/Notification/**",
"lib/public/Activity/**",
"lib/public/Notification/**"
]
},
{
"name": "Xenopathic",
"files": [
"apps/files_external/**"
]
}
],
"userBlacklist": [
"DeepDiver1975",
"nextcloud-bot",
"owncloud-bot",
"PVince81",
"scrutinizer-auto-fixer",
"th3fallen",
"zander",
"luckydonald",
"jancborchardt"
],
"createReviewRequest": true,
"createComment": false
}
+5
View File
@@ -1,6 +1,11 @@
before_commands:
- 'git submodule update --init --recursive'
checks:
php:
excluded_dependencies:
- etsy/phan
filter:
excluded_paths:
- '3rdparty/*'
+104 -27
View File
@@ -1,16 +1,24 @@
Nextcloud is written by:
- 1 Man Projects <reed@1manprojects.de>
- AW-UC <git@a-wesemann.de>
- Aaron Wood <aaronjwood@gmail.com>
- Achim Königs <garfonso@tratschtante.de>
- Adam Williamson <awilliam@redhat.com>
- Administrator <Administrator@WINDOWS-2012>
- Administrator "Administrator@WINDOWS-2012"
- Aldo "xoen" Giambelluca <xoen@xoen.org>
- Alex Weirig <alex.weirig@technolink.lu>
- Alexander Bergolth <leo@strike.wu.ac.at>
- Allan Nordhøy <epost@anotheragency.no>
- Andreas Fischer <bantu@owncloud.com>
- Andreas Pflug <dev@admin4.org>
- Andrew Brown <andrew@casabrown.com>
- Andrius <andrius.kulbis@ktu.lt>
- André Gaul <gaul@web-yard.de>
- Ardinis <Ardinis@users.noreply.github.com>
- Artem Kochnev <MrJeos@gmail.com>
- Artem Sidorenko <artem@posteo.de>
- Arthur Schiwon <blizzz@arthur-schiwon.de>
- Axel Helmert <axel.helmert@luka.de>
- Bart Visscher <bartv@thisnet.nl>
- Bartek Przybylski <bart.p.pl@gmail.com>
- Bastien Ho <bastienho@urbancube.fr>
@@ -21,7 +29,9 @@ Nextcloud is written by:
- Birk Borkason <daniel.niccoli@gmail.com>
- Bjoern Schiessle <bjoern@schiessle.org>
- Björn Schießle <bjoern@schiessle.org>
- Boris Rybalkin <ribalkin@gmail.com>
- Borjan Tchakaloff <borjan@tchakaloff.fr>
- Brent Bloxam <brent.bloxam@gmail.com>
- Brice Maron <brice@bmaron.net>
- Byron Marohn <combustible@live.com>
- Carla Schroder <carla@owncloud.com>
@@ -31,41 +41,48 @@ Nextcloud is written by:
- Christian Jürges <christian@eqipe.ch>
- Christian Kampka <christian@kampka.net>
- Christian Weiske <cweiske@cweiske.de>
- Christoph Schaefer <christophł@wolkesicher.de>
- Christoph Schaefer "christophł@wolkesicher.de"
- Christoph Wickert <cwickert@suse.de>
- Christoph Wurst <christoph@owncloud.com>
- Christopher Bartz <bartz@dkrz.de>
- Christopher Schäpers <kondou@ts.unde.re>
- Christopher T. Johnson <ctjctj@gmail.com>
- Clark Tomlinson <fallen013@gmail.com>
- Craig Morrissey <craig@owncloud.com>
- Cornelius Kölbel <cornelius.koelbel@netknights.it>
- Damjan Georgievski <gdamjan@gmail.com>
- Dan Bartram <daneybartram@gmail.com>
- Daniel Hansson <enoch85@gmail.com>
- Daniel Calviño Sánchez <danxuliu@gmail.com>
- Daniel Hansson <daniel@techandme.se>
- Daniel Jagszent <daniel@jagszent.de>
- Daniel Molkentin <daniel@molkentin.de>
- Daniel Tosello <tosello.daniel@gmail.com>
- David Prévot <taffit@debian.org>
- David Toledo <dtoledo@solidgear.es>
- Derek <derek.kelly27@gmail.com>
- Dominik Schmidt <dev@dominik-schmidt.de>
- Donquixote <marjunebatac@gmail.com>
- Fabian Henze <flyser42@gmx.de>
- Faruk Uzun <farukuzun@collabora.com>
- Felix Böhm <felixboehm@gmx.de>
- Fabrizio Steiner <fabrizio.steiner@gmail.com>
- Felix A. Epp <work@felixepp.de>
- Felix Epp <work@felixepp.de>
- Felix Heidecke <felix@heidecke.me>
- Felix Moeller <mail@felixmoeller.de>
- Florian Preinstorfer <nblock@archlinux.us>
- Florian Pritz <bluewind@xinu.at>
- Felix Rupp <github@felixrupp.com>
- Florin Peter <github@florin-peter.de>
- Francesco Rovelli <francesco.rovelli@gmail.com>
- Frank Isemann <frank@isemann.name>
- Frank Karlitschek <frank@karlitschek.de>
- François Kubler <francois@kubler.org>
- Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
- Gadzy <dev@gadzy.fr>
- Georg Ehrke <georg@owncloud.com>
- Guillaume AMAT <guillaume.amat@informatique-libre.com>
- Hasso Tepper <hasso@zone.ee>
- Georg Ehrke <oc.list@georgehrke.com>
- Hemanth Kumar Veeranki <hems.india1997@gmail.com>
- Hendrik Leppelsack <hendrik@leppelsack.de>
- Hugo Gonzalez Labrador <hglavra@gmail.com>
- Ilja Neumann <ineumann@owncloud.com>
- Individual IT Services <info@individual-it.net>
- Jakob Sack <mail@jakobsack.de>
- Jan-Christoph Borchardt <hey@jancborchardt.net>
- Jarrett <JetUni@users.noreply.github.com>
- Jan-Philipp Litza <jplitza@users.noreply.github.com>
- Jarkko Lehtoranta <devel@jlranta.com>
- Jean-Louis Dupond <jean-louis@dupond.be>
- Jens-Christian Fischer <jens-christian.fischer@switch.ch>
- Jesús Macias <jmacias@solidgear.es>
@@ -74,80 +91,121 @@ Nextcloud is written by:
- Joas Schilling <coding@schilljs.com>
- Johan Björk <johanimon@gmail.com>
- Johannes Ernst <jernst@indiecomputing.com>
- Johannes Schlichenmaier <johannes@schlichenmaier.info>
- Johannes Willnecker <johannes@willnecker.com>
- John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- John Molakvoæ <skjnldsv@users.noreply.github.com>
- Jonny007-MKD <1-23-4-5@web.de>
- Juan Pablo Villafañez <jvillafanez@solidgear.es>
- Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- Juan Pablo Villafáñez <jvillafanez@solidgear.es>
- Julius Haertl <jus@bitgrid.net>
- Julius Härtl <jus@bitgrid.net>
- Jörn Friedrich Dreyer <jfd@butonic.de>
- Jürgen Haas <juergen@paragon-es.de>
- KB7777 <k.burkowski@gmail.com>
- Kamil Domanski <kdomanski@kdemail.net>
- Kawohl <john@owncloud.com>
- Kenneth Newwood <kenneth@newwood.name>
- Klaas Freitag <freitag@owncloud.com>
- Knut Ahlers <knut@ahlers.me>
- Ko- <k.stoffelen@cs.ru.nl>
- Kristof Provost <github@sigsegv.be>
- Lars <winnetou+github@catolic.de>
- Laurens Post <Crote@users.noreply.github.com>
- Laurens Post <lkpost@scept.re>
- Lennart Rosam <hello@takuto.de>
- Lennart Rosam <lennart.rosam@medien-systempartner.de>
- Leonardo Diez <leio10@users.noreply.github.com>
- Leon Klingele <git@leonklingele.de>
- Leon Klingele <leon@struktur.de>
- Loki3000 <github@labcms.ru>
- Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
- Lukas Reschke <lukas@statuscode.ch>
- Luke Policinski <lpolicinski@gmail.com>
- Lyonel Vincent <lyonel@ezix.org>
- Magnus Walbeck <mw@mwalbeck.org>
- Manish Bisht <manish.bisht490@gmail.com>
- Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
- Marin Treselj <marin@pixelipo.com>
- Mario Kolling <mario.kolling@serpro.gov.br>
- Marius Blüm <marius@lineone.io>
- Markus Goetz <markus@woboq.com>
- Martin <github@diemattels.at>
- Martin Konrad <info@martin-konrad.net>
- Martin Konrad <konrad@frib.msu.edu>
- Martin Mattel <martin.mattel@diemattels.at>
- Marvin Thomas Rabe <mrabe@marvinrabe.de>
- Masaki Kawabata Neto <masaki.kawabata@gmail.com>
- Matthew Setter <matthew@matthewsetter.com>
- Maxence Lange <maxence@artificial-owl.com>
- Maxence Lange <maxence@nextcloud.com>
- Maxence Lange <maxence@pontapreta.net>
- Michael Gapczynski <GapczynskiM@gmail.com>
- Michael Göhler <somebody.here@gmx.de>
- Michael Kuhn <suraia@ikkoku.de>
- Michael Jobst <mjobst+github@tecratech.de>
- Michael Letzgus <www@chronos.michael-letzgus.de>
- Michael Roitzsch <reactorcontrol@icloud.com>
- Michael Roth <michael.roth@rz.uni-augsburg.de>
- Michael U <mdusher@users.noreply.github.com>
- Miguel Prokop <miguel.prokop@vtu.com>
- Miha Frangez <miha.frangez@gmail.com>
- Mitar <mitar.git@tnode.com>
- Morris Jobke <hey@morrisjobke.de>
- Nicolai Ehemann <en@enlightened.de>
- Nicolas Grekas <nicolas.grekas@gmail.com>
- Nils <git@to.nilsschnabel.de>
- Nmz <nemesiz@nmz.lt>
- Normal Ra <normalraw@gmail.com>
- Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
- Oliver Gasser <oliver.gasser@gmail.com>
- Oliver Kohl D.Sc. <oliver@kohl.bz>
- Olivier Mehani <shtrom@ssji.net>
- Olivier Paroz <github@oparoz.com>
- Otto Sabart <ottosabart@seberm.com>
- Owen Winkler <a_github@midnightcircus.com>
- Pascal de Bruijn <pmjdebruijn@pcode.nl>
- Patrick Paysant <patrick.paysant@linagora.com>
- Patrick Paysant <ppaysant@linagora.com>
- Patrik Kernstock <info@pkern.at>
- Pauli Järvinen <pauli.jarvinen@gmail.com>
- Pellaeon Lin <nfsmwlin@gmail.com>
- Petr Svoboda <weits666@gmail.com>
- Phiber2000 <phiber2000@gmx.de>
- Phil Davis <phil.davis@inf.org>
- Philipp Kapfer <philipp.kapfer@gmx.at>
- Philipp Schaffrath <github@philipp.schaffrath.email>
- Philippe Jung <phil.jung@free.fr>
- Pierre Jochem <pierrejochem@msn.com>
- Pierre Ozoux <pierre@ozoux.net>
- Pierre Rudloff <contact@rudloff.pro>
- Piotr Filiciak <piotr@filiciak.pl>
- Piotr M <mrow4a@yahoo.com>
- Piotr Mrowczynski <mrow4a@yahoo.com>
- Piotr Mrówczyński <mrow4a@yahoo.com>
- Qingping Hou <dave2008713@gmail.com>
- Raghu Nayyar <hey@raghunayyar.com>
- Raghu Nayyar <me@iraghu.com>
- Ralph Krimmel <rkrimme1@gwdg.de>
- Ramiro Aparicio <rapariciog@gmail.com>
- Randolph Carter <RandolphCarter@fantasymail.de>
- RealRancor <Fisch.666@gmx.de>
- RealRancor <fisch.666@gmx.de>
- Rello <Rello@users.noreply.github.com>
- Remco Brenninkmeijer <requist1@starmail.nl>
- Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
- Robert Scheck <robert@fedoraproject.org>
- Robin Appelman <robin@icewind.nl>
- Robin McCorkell <robin@mccorkell.me.uk>
- Roeland Jago Douma <roeland@famdouma.nl>
- Roman Geber <rgeber@owncloudapps.com>
- Roger Szabo <roger.szabo@web.de>
- Roman Kreisel <mail@romankreisel.de>
- Ross Nicoll <jrn@jrn.me.uk>
- SA <stephen@mthosting.net>
- Sam Tuke <mail@samtuke.com>
- Sander <brantje@gmail.com>
- Sander Ruitenbeek <sander@grids.be>
- Sandro Lutz <sandro.lutz@temparus.ch>
- Sascha Sambale <mastixmc@gmail.com>
- Sean Comeau <sean@ftlnetworks.ca>
- Sebastian Döll <sebastian.doell@libasys.de>
- Sebastian Wessalowski <sebastian@wessalowski.org>
- Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
- Senorsen <senorsen.zhang@gmail.com>
- Serge Martin <edb@sigluy.net>
- Sergio Bertolin <sbertolin@solidgear.es>
@@ -156,64 +214,83 @@ Nextcloud is written by:
- Sjors van der Pluijm <sjors@desjors.nl>
- Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
- Stefan Rado <owncloud@sradonia.net>
- Stefan Schneider <stefan.schneider@squareweave.com.au>
- Stefan Weil <sw@weilnetz.de>
- Steffen Lindner <mail@steffen-lindner.de>
- Stephan Müller <mail@stephanmueller.eu>
- Stephan Peijnik <speijnik@anexia-it.com>
- TheSFReader <TheSFReader@gmail.com>
- Steven Bühner <buehner@me.com>
- Sujith H <sharidasan@owncloud.com>
- Thibaut GRIDEL <tgridel@free.fr>
- Thomas Citharel <tcit@tcit.fr>
- Thomas Ebert <thomas.ebert@usability.de>
- Thomas Müller <thomas.mueller@tmit.eu>
- Thomas Pulzer <t.pulzer@kniel.de>
- Thomas Tanghus <thomas@tanghus.net>
- Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
- Tim Dettrick <t.dettrick@uq.edu.au>
- Tobia De Koninck <tobia@ledfan.be>
- Tobias Brunner <tobias@tobru.ch>
- Tobias Kaminsky <tobias@kaminsky.me>
- Tom Needham <tom@owncloud.com>
- Torben Dannhauer <torben@dannhauer.de>
- Ujjwal Bhardwaj <ujjwalb1996@gmail.com>
- Victor Dubiniuk <dubiniuk@owncloud.com>
- Viktor Szépe <viktor@szepe.net>
- Vincent Chan <plus.vincchan@gmail.com>
- Vincent Cloutier <vincent1cloutier@gmail.com>
- Vincent Petry <pvince81@owncloud.com>
- Vinicius Cubas Brand <vinicius@eita.org.br>
- Volkan Gezer <volkangezer@gmail.com>
- William Pain <pain.william@gmail.com>
- Xuanwo <xuanwo@yunify.com>
- adrien <adrien.waksberg@believedigital.com>
- alexweirig <alex.weirig@technolink.lu>
- bline <scottbeck@gmail.com>
- brumsel <brumsel@losecatcher.de>
- cetra3 <peter@parashift.com.au>
- cmeh <cmeh@users.noreply.github.com>
- dampfklon <me@dampfklon.de>
- coderkun <olli@coderkun.de>
- dartcafe <github@dartcafe.de>
- davidgumberg <davidnoizgumberg@gmail.com>
- davitol <dtoledo@solidgear.es>
- derkostka <sebastian.kostka@gmail.com>
- duritong <peter.meier+github@immerda.ch>
- eduardo <eduardo@vnexu.net>
- fabian <fabian@web2.0-apps.de>
- felixboehm <felix@webhippie.de>
- goodkiller <markopraakli@gmail.com>
- helix84 <helix84@centrum.sk>
- hkjolhede <hkjolhede@gmail.com>
- iamfool <praveenraonp@gmail.com>
- ideaship <ideaship@users.noreply.github.com>
- j-ed <juergen@eisfair.org>
- jknockaert <jasper@knockaert.nl>
- josh4trunks <joshruehlig@gmail.com>
- justin-sleep <justin@quarterfull.com>
- karakayasemi <karakayasemi@itu.edu.tr>
- macjohnny <estebanmarin@gmx.ch>
- martin-rueegg <martin.rueegg@metaworx.ch>
- martin.mattel@diemattels.at <martin.mattel@diemattels.at>
- michag86 <micha_g@arcor.de>
- mmccarn <mmccarn-github@mmsionline.us>
- nhirokinet <nhirokinet@nhiroki.net>
- nishiki <nishiki@yaegashi.fr>
- noveens <noveen.sachdeva@research.iiit.ac.in>
- oparoz <owncloud@interfasys.ch>
- root <root@oc.(none)>
- phisch <git@philippschaffrath.de>
- rakekniven <mark.ziegler@rakekniven.de>
- root "root@oc.(none)"
- root <root@localhost.localdomain>
- scambra <sergio@entrecables.com>
- scolebrook <scolebrook@mac.com>
- shkdee <louis.traynard@m4x.org>
- sualko <klaus@jsxc.org>
- tbartenstein <tbartenstein@users.noreply.github.com>
- tbelau666 <thomas.belau@gmx.de>
- unclejamal3000 <andreas.pramhaas@posteo.de>
- tux-rampage <tux-rampage@users.noreply.github.com>
- v1r0x <vinzenz.rosenkranz@gmail.com>
- voxsim <Simon Vocella>
- vkuimov "vkuimov@nextcloud"
- voxsim "Simon Vocella"
With help from many libraries and frameworks including:
Open Collaboration Services
+2 -18
View File
@@ -1,20 +1,4 @@
ChangeLog
Changelog
=========
NC 11 (2016-12-13)
------------------
* PHP 5.4 and 5.5 no longer supported
* PHP 7.1 support
* OC_L10N removed use \OCP\IL10N (#1948)
* Preview handling is improved by sharing previews:
* Preview sharing (shared files/external storages)
* Previews are stored in the AppData
* Previews are served faster by not first converting them to image objects
* Core preview route changed:
* Route for the urlgenerator changed from 'core_ajax_preview' to 'core.Preview.getPreview'
* $urlGenerator->linkToRoute('core_ajax_preview', ...) => $urlGenerator->linkToRoute('core.Preview.getPreview', ...)
* Avatars are cached
* Avatars are moved to AppData
* For existing avatars this happens automatically in a background job which means that on upgrade you might
not see your avatar right away. However after the job has run it should show up again automatically.
The change log is at [https://nextcloud.com/changelog/](https://nextcloud.com/changelog/).
+9
View File
@@ -0,0 +1,9 @@
In the Nextcloud community, participants from all over the world come together to create Free Software for a free internet. This is made possible by the support, hard work and enthusiasm of thousands of people, including those who create and use Nextcloud software.
Our code of conduct offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
The Code of Conduct is shared by all contributors and users who engage with the Nextcloud team and its community services. It presents a summary of the shared values and “common sense” thinking in our community.
You can find our full code of conduct on our website: https://nextcloud.com/code-of-conduct/
Please, keep our CoC in mind when you contribute! That way, everyone can be a part of our community in a productive, positive, creative and fun way.
+3 -2
View File
@@ -15,7 +15,7 @@
* :package: **Sync your Data** You keep your files, contacts, calendars and more synchronized amongst your devices.
* :arrows_counterclockwise: **Share your Data** …by giving others access to the stuff you want them to see or to collaborate with.
* :rocket: **Expandable with dozens of Apps** ...like [Calendar](https://github.com/nextcloud/calendar), [Contacts](https://github.com/nextcloud/contacts), [Mail](https://github.com/nextcloud/mail) and all those you can discover in our [App Store](https://apps.nextcloud.com)
* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentification.
* :lock: **Security** with our encryption mechanisms, [HackerOne bounty program](https://hackerone.com/nextcloud) and two-factor authentication.
*You want to learn more about how you can use Nextcloud to access, share and protect your files, calendars, contacts, communication & more at home and at your Enterprise?* [**Learn about all our Features**](https://nextcloud.com/features).
@@ -32,6 +32,7 @@
* :clipboard: [Forum](https://help.nextcloud.com)
* :busts_in_silhouette: [Facebook](https://facebook.com/nextclouders)
* :hatching_chick: [Twitter](https://twitter.com/Nextclouders)
* :elephant: [Mastodon](https://mastodon.xyz/@nextcloud)
[…learn more about how to get support for Nextcloud here!](https://nextcloud.com/support)
@@ -59,7 +60,7 @@ More information how to contribute: [https://nextcloud.com/contribute/](https://
Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation.
Several apps by default included in regular releases like [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually as required.
Several apps that are included by default in regular releases such as [firstrunwizard](https://github.com/nextcloud/firstrunwizard) or [gallery](https://github.com/nextcloud/gallery) are missing in `master` and have to be installed manually.
That aside Git checkouts can be handled the same as release archives.
+3 -13
View File
@@ -3,7 +3,7 @@
* @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 Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -23,15 +23,5 @@
*
*/
$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,
$eventDispatcher
);
$auditLogger->registerHooks();
$app = new \OCA\AdminAudit\AppInfo\Application();
$app->register();
+3 -2
View File
@@ -5,9 +5,10 @@
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
<licence>AGPL</licence>
<author>Nextcloud</author>
<version>1.2.0</version>
<version>1.3.0</version>
<namespace>AdminAudit</namespace>
<dependencies>
<nextcloud min-version="12" max-version="12" />
<nextcloud min-version="13" max-version="13" />
</dependencies>
<types>
<logging/>
+7
View File
@@ -0,0 +1,7 @@
<?php
// autoload.php @generated by Composer
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitAdminAudit::getLoader();
+13
View File
@@ -0,0 +1,13 @@
{
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
"classmap-authoritative": true,
"autoloader-suffix": "AdminAudit"
},
"autoload" : {
"psr-4": {
"OCA\\AdminAudit\\": "../lib/"
}
}
}
@@ -0,0 +1,444 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
* // register classes with namespaces
* $loader->add('Symfony\Component', __DIR__.'/component');
* $loader->add('Symfony', __DIR__.'/framework');
*
* // activate the autoloader
* $loader->register();
*
* // to enable searching the include path (eg. for PEAR packages)
* $loader->setUseIncludePath(true);
*
* In this example, if you try to use a class in the Symfony\Component
* namespace or one of its children (Symfony\Component\Console for instance),
* the autoloader will first look for the class under the component/
* directory, and it will then fallback to the framework/ directory if not
* found before giving up.
*
* This class is loosely based on the Symfony UniversalClassLoader.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
// PSR-4
private $firstCharsPsr4 = array();
private $prefixLengthsPsr4 = array(); // For BC with legacy static maps
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
{
return $this->classMap;
}
/**
* @param array $classMap Class to filename map
*/
public function addClassMap(array $classMap)
{
if ($this->classMap) {
$this->classMap = array_merge($this->classMap, $classMap);
} else {
$this->classMap = $classMap;
}
}
/**
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
return;
}
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
if ('\\' !== substr($prefix, -1)) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->firstCharsPsr4[$prefix[0]] = true;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
if ('\\' !== substr($prefix, -1)) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->firstCharsPsr4[$prefix[0]] = true;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
}
/**
* Turns on searching the include path for class files.
*
* @param bool $useIncludePath
*/
public function setUseIncludePath($useIncludePath)
{
$this->useIncludePath = $useIncludePath;
}
/**
* Can be used to check if the autoloader uses the include path to check
* for classes.
*
* @return bool
*/
public function getUseIncludePath()
{
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
}
/**
* Unregisters this instance as an autoloader.
*/
public function unregister()
{
spl_autoload_unregister(array($this, 'loadClass'));
}
/**
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True if loaded, null otherwise
*/
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
includeFile($file);
return true;
}
}
/**
* Finds the path to the file where the class is defined.
*
* @param string $class The name of the class
*
* @return string|false The path if found, false otherwise
*/
public function findFile($class)
{
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}
@@ -0,0 +1,21 @@
Copyright (c) Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
@@ -0,0 +1,20 @@
<?php
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\AdminAudit\\Actions\\Action' => $baseDir . '/../lib/Actions/Action.php',
'OCA\\AdminAudit\\Actions\\AppManagement' => $baseDir . '/../lib/Actions/AppManagement.php',
'OCA\\AdminAudit\\Actions\\Auth' => $baseDir . '/../lib/Actions/Auth.php',
'OCA\\AdminAudit\\Actions\\Console' => $baseDir . '/../lib/Actions/Console.php',
'OCA\\AdminAudit\\Actions\\Files' => $baseDir . '/../lib/Actions/Files.php',
'OCA\\AdminAudit\\Actions\\GroupManagement' => $baseDir . '/../lib/Actions/GroupManagement.php',
'OCA\\AdminAudit\\Actions\\Sharing' => $baseDir . '/../lib/Actions/Sharing.php',
'OCA\\AdminAudit\\Actions\\Trashbin' => $baseDir . '/../lib/Actions/Trashbin.php',
'OCA\\AdminAudit\\Actions\\UserManagement' => $baseDir . '/../lib/Actions/UserManagement.php',
'OCA\\AdminAudit\\Actions\\Versions' => $baseDir . '/../lib/Actions/Versions.php',
'OCA\\AdminAudit\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
);
@@ -0,0 +1,9 @@
<?php
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
);
@@ -0,0 +1,10 @@
<?php
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\AdminAudit\\' => array($baseDir . '/../lib'),
);
@@ -0,0 +1,43 @@
<?php
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitAdminAudit
{
private static $loader;
public static function loadClassLoader($class)
{
if ('Composer\Autoload\ClassLoader' === $class) {
require __DIR__ . '/ClassLoader.php';
}
}
public static function getLoader()
{
if (null !== self::$loader) {
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->setClassMapAuthoritative(true);
$loader->register(true);
return $loader;
}
}
@@ -0,0 +1,43 @@
<?php
// autoload_static.php @generated by Composer
namespace Composer\Autoload;
class ComposerStaticInitAdminAudit
{
public static $firstCharsPsr4 = array (
'O' => true,
);
public static $prefixDirsPsr4 = array (
'OCA\\AdminAudit\\' =>
array (
0 => __DIR__ . '/..' . '/../lib',
),
);
public static $classMap = array (
'OCA\\AdminAudit\\Actions\\Action' => __DIR__ . '/..' . '/../lib/Actions/Action.php',
'OCA\\AdminAudit\\Actions\\AppManagement' => __DIR__ . '/..' . '/../lib/Actions/AppManagement.php',
'OCA\\AdminAudit\\Actions\\Auth' => __DIR__ . '/..' . '/../lib/Actions/Auth.php',
'OCA\\AdminAudit\\Actions\\Console' => __DIR__ . '/..' . '/../lib/Actions/Console.php',
'OCA\\AdminAudit\\Actions\\Files' => __DIR__ . '/..' . '/../lib/Actions/Files.php',
'OCA\\AdminAudit\\Actions\\GroupManagement' => __DIR__ . '/..' . '/../lib/Actions/GroupManagement.php',
'OCA\\AdminAudit\\Actions\\Sharing' => __DIR__ . '/..' . '/../lib/Actions/Sharing.php',
'OCA\\AdminAudit\\Actions\\Trashbin' => __DIR__ . '/..' . '/../lib/Actions/Trashbin.php',
'OCA\\AdminAudit\\Actions\\UserManagement' => __DIR__ . '/..' . '/../lib/Actions/UserManagement.php',
'OCA\\AdminAudit\\Actions\\Versions' => __DIR__ . '/..' . '/../lib/Actions/Versions.php',
'OCA\\AdminAudit\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->firstCharsPsr4 = ComposerStaticInitAdminAudit::$firstCharsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitAdminAudit::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitAdminAudit::$classMap;
}, null, ClassLoader::class);
}
}
@@ -2,6 +2,7 @@
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -20,7 +21,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
use OCP\ILogger;
@@ -0,0 +1,58 @@
<?php
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class AppManagement extends Action {
/**
* @param string $appName
*/
public function enableApp($appName) {
$this->log('App "%s" enabled',
['app' => $appName],
['app']
);
}
/**
* @param string $appName
* @param string[] $groups
*/
public function enableAppForGroups($appName, array $groups) {
$this->log('App "%s" enabled for groups: %s',
['app' => $appName, 'groups' => implode(', ', $groups)],
['app', 'groups']
);
}
/**
* @param string $appName
*/
public function disableApp($appName) {
$this->log('App "%s" disabled',
['app' => $appName],
['app']
);
}
}
@@ -2,6 +2,7 @@
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -20,12 +21,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
/**
* Class Auth logs all auth related actions
*
* @package OCA\Admin_Audit\Actions
* @package OCA\AdminAudit\Actions
*/
class Auth extends Action {
public function loginAttempt(array $params) {
+45
View File
@@ -0,0 +1,45 @@
<?php
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\Actions;
class Console extends Action {
/**
* @param $arguments
*/
public function runCommand($arguments) {
if ($arguments[1] === '_completion') {
// Don't log autocompletion
return;
}
// Remove `./occ`
array_shift($arguments);
$this->log('Console command executed: %s',
['arguments' => implode(' ', $arguments)],
['arguments']
);
}
}
@@ -2,6 +2,7 @@
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -20,12 +21,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
/**
* Class Files logs the actions to files
*
* @package OCA\Admin_Audit\Actions
* @package OCA\AdminAudit\Actions
*/
class Files extends Action {
/**
@@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Roger Szabo <roger.szabo@web.de>
*
@@ -23,18 +24,16 @@
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
use OCA\Admin_Audit\Actions\Action;
use OCP\IGroup;
use OCP\IUser;
/**
* Class GroupManagement logs all group manager related events
*
* @package OCA\Admin_Audit
* @package OCA\AdminAudit\Actions
*/
class GroupManagement extends Action {
@@ -2,6 +2,7 @@
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -20,13 +21,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
use OCP\Share;
/**
* Class Sharing logs the sharing actions
*
* @package OCA\Admin_Audit\Actions
* @package OCA\AdminAudit\Actions
*/
class Sharing extends Action {
/**
@@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
@@ -21,8 +22,7 @@
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
class Trashbin extends Action {
@@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
@@ -21,13 +22,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
use OCP\IUser;
/**
* Class UserManagement logs all user management related actions.
*
* @package OCA\Admin_Audit\Actions
* @package OCA\AdminAudit\Actions
*/
class UserManagement extends Action {
/**
@@ -66,14 +70,25 @@ class UserManagement extends Action {
* @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',
]
);
switch($params['feature']) {
case 'enabled':
$this->log(
$params['value'] === 'true' ? 'User enabled: "%s"' : 'User disabled: "%s"',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
case 'eMailAddress':
$this->log(
'Email address changed for user %s',
['user' => $params['user']->getUID()],
[
'user',
]
);
break;
}
}
@@ -3,6 +3,7 @@
* @copyright Bjoern Schiessle <bjoern@schiessle.org>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
@@ -21,8 +22,7 @@
*
*/
namespace OCA\Admin_Audit\Actions;
namespace OCA\AdminAudit\Actions;
class Versions extends Action {
@@ -0,0 +1,221 @@
<?php
/**
* @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
*
* @author Bjoern Schiessle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\AdminAudit\AppInfo;
use OC\Files\Filesystem;
use OC\Files\Node\File;
use OC\Group\Manager;
use OC\User\Session;
use OCA\AdminAudit\Actions\AppManagement;
use OCA\AdminAudit\Actions\Auth;
use OCA\AdminAudit\Actions\Console;
use OCA\AdminAudit\Actions\Files;
use OCA\AdminAudit\Actions\GroupManagement;
use OCA\AdminAudit\Actions\Sharing;
use OCA\AdminAudit\Actions\Trashbin;
use OCA\AdminAudit\Actions\UserManagement;
use OCA\AdminAudit\Actions\Versions;
use OCP\App\ManagerEvent;
use OCP\AppFramework\App;
use OCP\Console\ConsoleEvent;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IPreview;
use OCP\IUserSession;
use OCP\Util;
use Symfony\Component\EventDispatcher\GenericEvent;
class Application extends App {
public function __construct() {
parent::__construct('admin_audit');
}
public function register() {
$this->registerHooks();
}
/**
* Register hooks in order to log them
*/
protected function registerHooks() {
$logger = $this->getContainer()->getServer()->getLogger();
$this->userManagementHooks($logger);
$this->groupHooks($logger);
$this->authHooks($logger);
$this->consoleHooks($logger);
$this->appHooks($logger);
$this->sharingHooks($logger);
$this->fileHooks($logger);
$this->trashbinHooks($logger);
$this->versionsHooks($logger);
}
protected function userManagementHooks(ILogger $logger) {
$userActions = new UserManagement($logger);
Util::connectHook('OC_User', 'post_createUser', $userActions, 'create');
Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
/** @var IUserSession|Session $userSession */
$userSession = $this->getContainer()->getServer()->getUserSession();
$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
}
protected function groupHooks(ILogger $logger) {
$groupActions = new GroupManagement($logger);
/** @var IGroupManager|Manager $groupManager */
$groupManager = $this->getContainer()->getServer()->getGroupManager();
$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);
$groupManager->listen('\OC\Group', 'postCreate', [$groupActions, 'createGroup']);
}
protected function sharingHooks(ILogger $logger) {
$shareActions = new Sharing($logger);
Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
}
protected function authHooks(ILogger $logger) {
$authActions = new Auth($logger);
Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
Util::connectHook('OC_User', 'logout', $authActions, 'logout');
}
protected function appHooks(ILogger $logger) {
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE, function(ManagerEvent $event) use ($logger) {
$appActions = new AppManagement($logger);
$appActions->enableApp($event->getAppID());
});
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, function(ManagerEvent $event) use ($logger) {
$appActions = new AppManagement($logger);
$appActions->enableAppForGroups($event->getAppID(), $event->getGroups());
});
$eventDispatcher->addListener(ManagerEvent::EVENT_APP_DISABLE, function(ManagerEvent $event) use ($logger) {
$appActions = new AppManagement($logger);
$appActions->disableApp($event->getAppID());
});
}
protected function consoleHooks(ILogger $logger) {
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$eventDispatcher->addListener(ConsoleEvent::EVENT_RUN, function(ConsoleEvent $event) use ($logger) {
$appActions = new Console($logger);
$appActions->runCommand($event->getArguments());
});
}
protected function fileHooks(ILogger $logger) {
$fileActions = new Files($logger);
$eventDispatcher = $this->getContainer()->getServer()->getEventDispatcher();
$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,
Filesystem::signal_post_rename,
$fileActions,
'rename'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
$fileActions,
'create'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
$fileActions,
'copy'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
$fileActions,
'write'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_update,
$fileActions,
'update'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_read,
$fileActions,
'read'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_delete,
$fileActions,
'delete'
);
}
protected function versionsHooks(ILogger $logger) {
$versionsActions = new Versions($logger);
Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
}
protected function trashbinHooks(ILogger $logger) {
$trashActions = new Trashbin($logger);
Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
}
}
-209
View File
@@ -1,209 +0,0 @@
<?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
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
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;
use OCA\Admin_Audit\Actions\Sharing;
use OCA\Admin_Audit\Actions\Trashbin;
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;
/**
* AuditLogger constructor.
*
* @param ILogger $logger
* @param IUserSession $userSession
* @param IGroupManager $groupManager
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(ILogger $logger,
IUserSession $userSession,
IGroupManager $groupManager,
EventDispatcherInterface $eventDispatcher) {
$this->logger = $logger;
$this->userSession = $userSession;
$this->groupManager = $groupManager;
$this->eventDispatcher = $eventDispatcher;
}
/**
* Register hooks in order to log them
*/
public function registerHooks() {
$this->userManagementHooks();
$this->groupHooks();
$this->sharingHooks();
$this->authHooks();
$this->fileHooks();
$this->trashbinHooks();
$this->versionsHooks();
}
/**
* 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']);
}
private function groupHooks() {
$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']);
}
/**
* connect to sharing events
*/
private function sharingHooks() {
$shareActions = new Sharing($this->logger);
Util::connectHook('OCP\Share', 'post_shared', $shareActions, 'shared');
Util::connectHook('OCP\Share', 'post_unshare', $shareActions, 'unshare');
Util::connectHook('OCP\Share', 'post_update_permissions', $shareActions, 'updatePermissions');
Util::connectHook('OCP\Share', 'post_update_password', $shareActions, 'updatePassword');
Util::connectHook('OCP\Share', 'post_set_expiration_date', $shareActions, 'updateExpirationDate');
Util::connectHook('OCP\Share', 'share_link_access', $shareActions, 'shareAccessed');
}
/**
* connect to authentication event and related actions
*/
private function authHooks() {
$authActions = new Auth($this->logger);
Util::connectHook('OC_User', 'pre_login', $authActions, 'loginAttempt');
Util::connectHook('OC_User', 'post_login', $authActions, 'loginSuccessful');
Util::connectHook('OC_User', 'logout', $authActions, 'logout');
}
/**
* 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,
Filesystem::signal_post_rename,
$fileActions,
'rename'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_create,
$fileActions,
'create'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_copy,
$fileActions,
'copy'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_write,
$fileActions,
'write'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_post_update,
$fileActions,
'update'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_read,
$fileActions,
'read'
);
Util::connectHook(
Filesystem::CLASSNAME,
Filesystem::signal_delete,
$fileActions,
'delete'
);
}
public function versionsHooks() {
$versionsActions = new Versions($this->logger);
Util::connectHook('\OCP\Versions', 'rollback', $versionsActions, 'rollback');
Util::connectHook('\OCP\Versions', 'delete',$versionsActions, 'delete');
}
/**
* Connect to trash bin hooks
*/
private function trashbinHooks() {
$trashActions = new Trashbin($this->logger);
Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
}
}
+3
View File
@@ -0,0 +1,3 @@
{
"directory": "js/vendor"
}
+3 -11
View File
@@ -2,7 +2,9 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @license AGPL-3.0
@@ -27,6 +29,7 @@ $eventDispatcher->addListener(
function() {
\OCP\Util::addScript('oc-backbone-webdav');
\OCP\Util::addScript('comments', 'merged');
\OCP\Util::addStyle('comments', 'autocomplete');
\OCP\Util::addStyle('comments', 'comments');
}
);
@@ -57,14 +60,3 @@ $commentsManager->registerEventHandler(function () {
$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
return $handler;
});
$commentsManager->registerDisplayNameResolver('user', function($id) {
$manager = \OC::$server->getUserManager();
$user = $manager->get($id);
if(is_null($user)) {
$l = \OC::$server->getL10N('comments');
$displayName = $l->t('Unknown user');
} else {
$displayName = $user->getDisplayName();
}
return $displayName;
});
+10 -3
View File
@@ -4,11 +4,12 @@
<name>Comments</name>
<description>Files app plugin to add comments to files</description>
<licence>AGPL</licence>
<author>Arthur Schiwon, Vincent Petry</author>
<author>Arthur Schiwon</author>
<author>Vincent Petry</author>
<default_enable/>
<version>1.2.0</version>
<version>1.3.0</version>
<dependencies>
<nextcloud min-version="12" max-version="12" />
<nextcloud min-version="13" max-version="13" />
</dependencies>
<types>
<logging/>
@@ -27,4 +28,10 @@
<provider>OCA\Comments\Activity\Provider</provider>
</providers>
</activity>
<collaboration>
<plugins>
<plugin type="autocomplete-sort">OCA\Comments\Collaboration\CommentersSorter</plugin>
</plugins>
</collaboration>
</info>
+9 -9
View File
@@ -1,9 +1,10 @@
<?php
/**
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
@@ -20,9 +21,8 @@
*
*/
use \OCA\Comments\AppInfo\Application;
$application = new Application();
$application->registerRoutes($this, ['routes' => [
['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
]]);
return [
'routes' => [
['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
]
];
+7
View File
@@ -0,0 +1,7 @@
<?php
// autoload.php @generated by Composer
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitComments::getLoader();
+13
View File
@@ -0,0 +1,13 @@
{
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
"classmap-authoritative": true,
"autoloader-suffix": "Comments"
},
"autoload" : {
"psr-4": {
"OCA\\Comments\\": "../lib/"
}
}
}
@@ -0,0 +1,444 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
* // register classes with namespaces
* $loader->add('Symfony\Component', __DIR__.'/component');
* $loader->add('Symfony', __DIR__.'/framework');
*
* // activate the autoloader
* $loader->register();
*
* // to enable searching the include path (eg. for PEAR packages)
* $loader->setUseIncludePath(true);
*
* In this example, if you try to use a class in the Symfony\Component
* namespace or one of its children (Symfony\Component\Console for instance),
* the autoloader will first look for the class under the component/
* directory, and it will then fallback to the framework/ directory if not
* found before giving up.
*
* This class is loosely based on the Symfony UniversalClassLoader.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
// PSR-4
private $firstCharsPsr4 = array();
private $prefixLengthsPsr4 = array(); // For BC with legacy static maps
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
{
return $this->classMap;
}
/**
* @param array $classMap Class to filename map
*/
public function addClassMap(array $classMap)
{
if ($this->classMap) {
$this->classMap = array_merge($this->classMap, $classMap);
} else {
$this->classMap = $classMap;
}
}
/**
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
return;
}
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
if ('\\' !== substr($prefix, -1)) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->firstCharsPsr4[$prefix[0]] = true;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
if ('\\' !== substr($prefix, -1)) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->firstCharsPsr4[$prefix[0]] = true;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
}
/**
* Turns on searching the include path for class files.
*
* @param bool $useIncludePath
*/
public function setUseIncludePath($useIncludePath)
{
$this->useIncludePath = $useIncludePath;
}
/**
* Can be used to check if the autoloader uses the include path to check
* for classes.
*
* @return bool
*/
public function getUseIncludePath()
{
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
}
/**
* Unregisters this instance as an autoloader.
*/
public function unregister()
{
spl_autoload_unregister(array($this, 'loadClass'));
}
/**
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True if loaded, null otherwise
*/
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
includeFile($file);
return true;
}
}
/**
* Finds the path to the file where the class is defined.
*
* @param string $class The name of the class
*
* @return string|false The path if found, false otherwise
*/
public function findFile($class)
{
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}
+21
View File
@@ -0,0 +1,21 @@
Copyright (c) Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
@@ -0,0 +1,20 @@
<?php
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\Comments\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
'OCA\\Comments\\Activity\\Listener' => $baseDir . '/../lib/Activity/Listener.php',
'OCA\\Comments\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
'OCA\\Comments\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
'OCA\\Comments\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir . '/../lib/Collaboration/CommentersSorter.php',
'OCA\\Comments\\Controller\\Notifications' => $baseDir . '/../lib/Controller/Notifications.php',
'OCA\\Comments\\EventHandler' => $baseDir . '/../lib/EventHandler.php',
'OCA\\Comments\\JSSettingsHelper' => $baseDir . '/../lib/JSSettingsHelper.php',
'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
);
@@ -0,0 +1,9 @@
<?php
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
);
@@ -0,0 +1,10 @@
<?php
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = $vendorDir;
return array(
'OCA\\Comments\\' => array($baseDir . '/../lib'),
);
@@ -0,0 +1,43 @@
<?php
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitComments
{
private static $loader;
public static function loadClassLoader($class)
{
if ('Composer\Autoload\ClassLoader' === $class) {
require __DIR__ . '/ClassLoader.php';
}
}
public static function getLoader()
{
if (null !== self::$loader) {
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitComments', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitComments', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitComments::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->setClassMapAuthoritative(true);
$loader->register(true);
return $loader;
}
}
@@ -0,0 +1,43 @@
<?php
// autoload_static.php @generated by Composer
namespace Composer\Autoload;
class ComposerStaticInitComments
{
public static $firstCharsPsr4 = array (
'O' => true,
);
public static $prefixDirsPsr4 = array (
'OCA\\Comments\\' =>
array (
0 => __DIR__ . '/..' . '/../lib',
),
);
public static $classMap = array (
'OCA\\Comments\\Activity\\Filter' => __DIR__ . '/..' . '/../lib/Activity/Filter.php',
'OCA\\Comments\\Activity\\Listener' => __DIR__ . '/..' . '/../lib/Activity/Listener.php',
'OCA\\Comments\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
'OCA\\Comments\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
'OCA\\Comments\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__ . '/..' . '/../lib/Collaboration/CommentersSorter.php',
'OCA\\Comments\\Controller\\Notifications' => __DIR__ . '/..' . '/../lib/Controller/Notifications.php',
'OCA\\Comments\\EventHandler' => __DIR__ . '/..' . '/../lib/EventHandler.php',
'OCA\\Comments\\JSSettingsHelper' => __DIR__ . '/..' . '/../lib/JSSettingsHelper.php',
'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->firstCharsPsr4 = ComposerStaticInitComments::$firstCharsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitComments::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitComments::$classMap;
}, null, ClassLoader::class);
}
}
+77
View File
@@ -0,0 +1,77 @@
/**
* based upon apps/comments/js/vendor/At.js/dist/css/jquery.atwho.css,
* only changed colors and font-weight
*/
.atwho-view {
position:absolute;
top: 0;
left: 0;
display: none;
margin-top: 18px;
background: $color-main-background;
color: $color-main-text;
border: 1px solid $color-border;
border-radius: $border-radius;
box-shadow: 0 0 5px $color-box-shadow;
min-width: 120px;
z-index: 11110 !important;
}
.atwho-view .atwho-header {
padding: 5px;
margin: 5px;
cursor: pointer;
border-bottom: solid 1px $color-border;
color: $color-main-text;
font-size: 11px;
font-weight: bold;
}
.atwho-view .atwho-header .small {
color: $color-main-text;
float: right;
padding-top: 2px;
margin-right: -5px;
font-size: 12px;
font-weight: normal;
}
.atwho-view .atwho-header:hover {
cursor: default;
}
.atwho-view .cur {
background: $color-primary;
color: $color-primary-text;
}
.atwho-view .cur small {
color: $color-primary-text;
}
.atwho-view strong {
color: $color-main-text;
font-weight: normal;
}
.atwho-view .cur strong {
color: $color-primary-text;
font-weight: normal;
}
.atwho-view ul {
/* width: 100px; */
list-style:none;
padding:0;
margin:auto;
max-height: 200px;
overflow-y: auto;
}
.atwho-view ul li {
display: block;
padding: 5px 10px;
border-bottom: 1px solid $color-border;
cursor: pointer;
}
.atwho-view small {
font-size: smaller;
color: $color-main-text;
font-weight: normal;
}
+61 -17
View File
@@ -35,35 +35,60 @@
border: none;
opacity: .3;
}
#commentsTabView .newCommentForm .submit:hover,
#commentsTabView .newCommentForm .submit:focus {
#commentsTabView .newCommentForm .submit:not(:disabled):hover,
#commentsTabView .newCommentForm .submit:not(:disabled):focus {
opacity: 1;
}
#commentsTabView .newCommentForm .submitLoading {
background-position: left;
/* Match rules for '#commentsTabView .newCommentForm .submit' to place the
loading icon at the same position as the confirm icon */
position: absolute;
bottom: 0px;
right: 8px;
width: 30px;
margin: 0;
padding: 7px 9px;
/* Match rules for 'input[type="submit"]' to place the loading icon at the
same position as the confirm icon */
min-height: 34px;
box-sizing: border-box;
}
#commentsTabView .newCommentForm .cancel {
margin-right: 6px;
}
#commentsTabView .newCommentForm textarea {
#commentsTabView .newCommentForm div.message {
resize: none;
}
#commentsTabView .newCommentForm div.message:empty:before {
content: attr(data-placeholder);
color: grey;
}
#commentsTabView .comment {
position: relative;
margin-bottom: 30px;
word-wrap: break-word;
overflow-wrap: break-word;
}
#commentsTabView .comment .avatar {
#commentsTabView .comment .avatar,
.atwho-view-ul * .avatar{
width: 32px;
height: 32px;
line-height: 32px;
margin-right: 5px;
}
#commentsTabView .comment .message .avatar {
#commentsTabView .comment .message .avatar,
.atwho-view-ul * .avatar
{
display: inline-block;
}
@@ -102,7 +127,7 @@
background-repeat: no-repeat;
}
#commentsTabView .authorRow>div {
#commentsTabView .authorRow>div:not(.contactsmenu-popover) {
display: inline-block;
vertical-align: middle;
}
@@ -112,32 +137,52 @@
}
#commentsTabView .comments li .message .avatar-name-wrapper,
.atwho-view-ul * .avatar-name-wrapper,
#commentsTabView .comment .authorRow {
position: relative;
display: inline-flex;
align-items: center;
width: 100%;
}
#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser),
#commentsTabView .comment:not(.newCommentRow) .message .avatar-name-wrapper:not(.currentUser) .avatar,
#commentsTabView .comment .authorRow .avatar:not(.currentUser),
#commentsTabView .comment .authorRow .author:not(.currentUser) {
cursor: pointer;
}
.atwho-view-ul .avatar-name-wrapper,
.atwho-view-ul .avatar-name-wrapper .avatar {
cursor: pointer;
}
#commentsTabView .comments li .message .atwho-inserted {
margin-left: 5px;
}
.atwho-view-ul * .avatar-name-wrapper {
white-space: nowrap;
}
#commentsTabView .comment .author,
#commentsTabView .comment .date {
opacity: .5;
}
#commentsTabView .comment .author {
margin-left: 5px;
}
#commentsTabView .comment .date {
position: absolute;
right: 0;
top: 5px;
margin-left: auto;
}
#commentsTabView .comments li .message {
padding-left: 40px;
display: inline-flex;
flex-wrap: wrap;
align-items: center;
}
#commentsTabView .comment .action {
opacity: 0;
vertical-align: middle;
display: inline-block;
padding: 5px;
}
#commentsTabView .comment:hover .action {
@@ -148,7 +193,8 @@
opacity: 1;
}
#commentsTabView .comment .action.delete {
#commentsTabView .comment .action.delete,
#commentsTabView .comment .deleteLoading {
position: absolute;
right: 0;
}
@@ -164,8 +210,6 @@
#commentsTabView .message.error {
color: #e9322d;
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7;
}
+302 -72
View File
@@ -23,14 +23,15 @@
var EDIT_COMMENT_TEMPLATE =
'<div class="newCommentRow comment" data-id="{{id}}">' +
' <div class="authorRow">' +
' <div class="avatar" data-username="{{actorId}}"></div>' +
' <div class="author">{{actorDisplayName}}</div>' +
' <div class="avatar currentUser" data-username="{{actorId}}"></div>' +
' <div class="author currentUser">{{actorDisplayName}}</div>' +
'{{#if isEditMode}}' +
' <a href="#" class="action delete icon icon-delete has-tooltip" title="{{deleteTooltip}}"></a>' +
' <div class="deleteLoading icon-loading-small hidden"></div>'+
'{{/if}}' +
' </div>' +
' <form class="newCommentForm">' +
' <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
' <div contentEditable="true" class="message" data-placeholder="{{newMessagePlaceholder}}">{{message}}</div>' +
' <input class="submit icon-confirm" type="submit" value="" />' +
'{{#if isEditMode}}' +
' <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
@@ -42,8 +43,8 @@
var COMMENT_TEMPLATE =
'<li class="comment{{#if isUnread}} unread{{/if}}{{#if isLong}} collapsed{{/if}}" data-id="{{id}}">' +
' <div class="authorRow">' +
' <div class="avatar" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
' <div class="author">{{actorDisplayName}}</div>' +
' <div class="avatar{{#if isUserAuthor}} currentUser{{/if}}" {{#if actorId}}data-username="{{actorId}}"{{/if}}> </div>' +
' <div class="author{{#if isUserAuthor}} currentUser{{/if}}">{{actorDisplayName}}</div>' +
'{{#if isUserAuthor}}' +
' <a href="#" class="action edit icon icon-rename has-tooltip" title="{{editTooltip}}"></a>' +
'{{/if}}' +
@@ -62,6 +63,7 @@
/** @lends OCA.Comments.CommentsTabView.prototype */ {
id: 'commentsTabView',
className: 'tab commentsTabView',
_autoCompleteData: undefined,
events: {
'submit .newCommentForm': '_onSubmitComment',
@@ -69,7 +71,11 @@
'click .action.edit': '_onClickEditComment',
'click .action.delete': '_onClickDeleteComment',
'click .cancel': '_onClickCloseComment',
'click .comment': '_onClickComment'
'click .comment': '_onClickComment',
'keyup div.message': '_onTextChange',
'change div.message': '_onTextChange',
'input div.message': '_onTextChange',
'paste div.message': '_onPaste'
},
_commentMaxLength: 1000,
@@ -80,11 +86,12 @@
this.collection.on('request', this._onRequest, this);
this.collection.on('sync', this._onEndRequest, this);
this.collection.on('add', this._onAddModel, this);
this.collection.on('change:message', this._onChangeModel, this);
this._commentMaxThreshold = this._commentMaxLength * 0.9;
// TODO: error handling
_.bindAll(this, '_onTypeComment');
_.bindAll(this, '_onTypeComment', '_initAutoComplete', '_onAutoComplete');
},
template: function(params) {
@@ -140,8 +147,10 @@
setFileInfo: function(fileInfo) {
if (fileInfo) {
this.model = fileInfo;
this.render();
this.collection.setObjectId(fileInfo.id);
this._initAutoComplete($('#commentsTabView').find('.newCommentForm .message'));
this.collection.setObjectId(this.model.id);
// reset to first page
this.collection.reset([], {silent: true});
this.nextPage();
@@ -164,7 +173,91 @@
this.delegateEvents();
this.$el.find('.message').on('keydown input change', this._onTypeComment);
autosize(this.$el.find('.newCommentRow textarea'))
autosize(this.$el.find('.newCommentRow .message'))
},
_initAutoComplete: function($target) {
var s = this;
var limit = 10;
if(!_.isUndefined(OC.appConfig.comments)) {
limit = OC.appConfig.comments.maxAutoCompleteResults;
}
$target.atwho({
at: '@',
limit: limit,
callbacks: {
remoteFilter: s._onAutoComplete,
highlighter: function (li) {
// misuse the highlighter callback to instead of
// highlighting loads the avatars.
var $li = $(li);
$li.find('.avatar').avatar(undefined, 32);
return $li;
},
sorter: function (q, items) { return items; }
},
displayTpl: function (item) {
return '<li>'
+ '<span class="avatar-name-wrapper">'
+ '<div class="avatar" '
+ ' data-username="' + escapeHTML(item.id) + '"' // for avatars
+ ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+ '</span></li>';
},
insertTpl: function (item) {
return ''
+ '<span class="avatar-name-wrapper">'
+ '<div class="avatar" '
+ ' data-username="' + escapeHTML(item.id) + '"' // for avatars
+ ' data-user="' + escapeHTML(item.id) + '"' // for contactsmenu
+ ' data-user-display-name="' + escapeHTML(item.label) + '"></div>'
+ ' <strong>' + escapeHTML(item.label) + '</strong>'
+ '</span>';
},
searchKey: "label"
});
$target.on('inserted.atwho', function (je, $el) {
var editionMode = true;
s._postRenderItem(
// we need to pass the parent of the inserted element
// passing the whole comments form would re-apply and request
// avatars from the server
$(je.target).find(
'div[data-username="' + $el.find('[data-username]').data('username') + '"]'
).parent(),
editionMode
);
});
},
_onAutoComplete: function(query, callback) {
if(_.isEmpty(query)) {
return;
}
var s = this;
if(!_.isUndefined(this._autoCompleteRequestTimer)) {
clearTimeout(this._autoCompleteRequestTimer);
}
this._autoCompleteRequestTimer = _.delay(function() {
if(!_.isUndefined(this._autoCompleteRequestCall)) {
this._autoCompleteRequestCall.abort();
}
this._autoCompleteRequestCall = $.get(
OC.generateUrl('/autocomplete/get'),
{
search: query,
itemType: 'files',
itemId: s.model.get('id'),
sorter: 'commenters|share-recipients',
limit: OC.appConfig.comments.maxAutoCompleteResults
},
function (data) {
callback(data);
}
);
}, 400);
},
_formatItem: function(commentModel) {
@@ -215,18 +308,83 @@
}
},
/**
* takes care of post-rendering after a new comment was added to the
* collection
*
* @param model
* @param collection
* @param options
* @private
*/
_onAddModel: function(model, collection, options) {
var $el = $(this.commentTemplate(this._formatItem(model)));
// we need to render it immediately, to ensure that the right
// order of comments is kept on opening comments tab
var $comment = $(this.commentTemplate(this._formatItem(model)));
if (!_.isUndefined(options.at) && collection.length > 1) {
this.$container.find('li').eq(options.at).before($el);
this.$container.find('li').eq(options.at).before($comment);
} else {
this.$container.append($el);
this.$container.append($comment);
}
this._postRenderItem($comment);
$('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true);
// we need to update the model, because it consists of client data
// only, but the server might add meta data, e.g. about mentions
var oldMentions = model.get('mentions');
var self = this;
model.fetch({
success: function (model) {
if(_.isEqual(oldMentions, model.get('mentions'))) {
// don't attempt to render if unnecessary, avoids flickering
return;
}
var $updated = $(self.commentTemplate(self._formatItem(model)));
$comment.html($updated.html());
self._postRenderItem($comment);
}
})
this._postRenderItem($el);
},
_postRenderItem: function($el) {
/**
* takes care of post-rendering after a new comment was edited
*
* @param model
* @private
*/
_onChangeModel: function (model) {
if(model.get('message').trim() === model.previous('message').trim()) {
return;
}
var $form = this.$container.find('.comment[data-id="' + model.id + '"] form');
var $row = $form.closest('.comment');
var $target = $row.data('commentEl');
if(_.isUndefined($target)) {
// ignore noise this is only set after editing a comment and hitting post
return;
}
var self = this;
// we need to update the model, because it consists of client data
// only, but the server might add meta data, e.g. about mentions
model.fetch({
success: function (model) {
$target.removeClass('hidden');
$row.remove();
var $message = $target.find('.message');
$message
.html(self._formatMessage(model.get('message'), model.get('mentions')))
.find('.avatar')
.each(function () { $(this).avatar(); });
self._postRenderItem($message);
}
});
},
_postRenderItem: function($el, editionMode) {
$el.find('.has-tooltip').tooltip();
$el.find('.avatar').each(function() {
var $this = $(this);
@@ -240,16 +398,27 @@
}
var $message = $el.find('.message');
this._postRenderMessage($message);
if($message.length === 0) {
// it is the case when writing a comment and mentioning a person
$message = $el;
}
this._postRenderMessage($message, editionMode);
},
_postRenderMessage: function($el) {
_postRenderMessage: function($el, editionMode) {
if (editionMode) {
return;
}
$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);
var username = $(this).data('username');
if (username !== oc_current_user) {
$.merge(avatar, strong).contactsMenu(avatar.data('user'), 0, appendTo);
}
});
},
@@ -257,23 +426,19 @@
* Convert a message to be displayed in HTML,
* converts newlines to <br> tags.
*/
_formatMessage: function(message, mentions) {
_formatMessage: function(message, mentions, editMode) {
message = escapeHTML(message).replace(/\n/g, '<br/>');
for(var i in mentions) {
if(!mentions.hasOwnProperty(i)) {
return;
}
var mention = '@' + mentions[i].mentionId;
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 = ''
+ '<span class="avatar-name-wrapper">'
+ avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>'
+ '</span>';
var displayName = this._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);
// replace every mention either at the start of the input or after a whitespace
// followed by a non-word character.
@@ -284,10 +449,29 @@
}
);
}
if(editMode !== true) {
message = OCP.Comments.plainToRich(message);
}
return message;
},
_composeHTMLMention: function(uid, displayName) {
var avatar = '<div class="avatar" '
+ 'data-username="' + _.escape(uid) + '"'
+ ' data-user="' + _.escape(uid) + '"'
+ ' data-user-display-name="'
+ _.escape(displayName) + '"></div>';
var isCurrentUser = (uid === OC.getCurrentUser().uid);
return ''
+ '<span class="atwho-inserted" contenteditable="false">'
+ '<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">'
+ avatar + ' <strong>'+ _.escape(displayName)+'</strong>'
+ '</span>'
+ '</span>';
},
nextPage: function() {
if (this._loading || !this.collection.hasMoreResults()) {
return;
@@ -310,21 +494,32 @@
// spawn form
$comment.after($formRow);
$formRow.data('commentEl', $comment);
$formRow.find('textarea').on('keydown input change', this._onTypeComment);
$formRow.find('.message').on('keydown input change', this._onTypeComment);
// copy avatar element from original to avoid flickering
$formRow.find('.avatar:first').replaceWith($comment.find('.avatar:first').clone());
$formRow.find('.has-tooltip').tooltip();
var $message = $formRow.find('.message');
$message
.html(this._formatMessage(commentToEdit.get('message'), commentToEdit.get('mentions'), true))
.find('.avatar')
.each(function () { $(this).avatar(); });
var editionMode = true;
this._postRenderItem($message, editionMode);
// Enable autosize
autosize($formRow.find('textarea'));
autosize($formRow.find('.message'));
// enable autocomplete
this._initAutoComplete($formRow.find('.message'));
return false;
},
_onTypeComment: function(ev) {
var $field = $(ev.target);
var len = $field.val().length;
var len = $field.text().length;
var $submitButton = $field.data('submitButtonEl');
if (!$submitButton) {
$submitButton = $field.closest('form').find('.submit');
@@ -342,9 +537,13 @@
$field.toggleClass('error', limitExceeded);
$submitButton.prop('disabled', limitExceeded);
//submits form on ctrl+Enter or cmd+Enter
if (ev.keyCode === 13 && (ev.ctrlKey || ev.metaKey)) {
// Submits form with Enter, but Shift+Enter is a new line. If the
// autocomplete popover is being shown Enter does not submit the
// form either; it will be handled by At.js which will add the
// currently selected item to the message.
if (ev.keyCode === 13 && !ev.shiftKey && !$field.atwho('isSelecting')) {
$submitButton.click();
ev.preventDefault();
}
},
@@ -368,10 +567,17 @@
ev.preventDefault();
var $comment = $(ev.target).closest('.comment');
var commentId = $comment.data('id');
var $loading = $comment.find('.submitLoading');
var $loading = $comment.find('.deleteLoading');
var $commentField = $comment.find('.message');
var $submit = $comment.find('.submit');
var $cancel = $comment.find('.cancel');
$commentField.prop('contenteditable', false);
$submit.prop('disabled', true);
$cancel.prop('disabled', true);
$comment.addClass('disabled');
$loading.removeClass('hidden');
this.collection.get(commentId).destroy({
success: function() {
$comment.data('commentEl').remove();
@@ -380,6 +586,10 @@
error: function() {
$loading.addClass('hidden');
$comment.removeClass('disabled');
$commentField.prop('contenteditable', true);
$submit.prop('disabled', false);
$cancel.prop('disabled', false);
OC.Notification.showTemporary(t('comments', 'Error occurred while retrieving comment with ID {id}', {id: commentId}));
}
});
@@ -393,48 +603,42 @@
},
/**
* takes care of updating comment elements after submit (either new
* takes care of updating comment element states after submit (either new
* comment or edit).
*
* @param {OC.Backbone.Model} model
* @param {jQuery} $form
* @param {string|undefined} commentId
* @private
*/
_onSubmitSuccess: function(model, $form, commentId) {
var self = this;
_onSubmitSuccess: function(model, $form) {
var $submit = $form.find('.submit');
var $loading = $form.find('.submitLoading');
var $textArea = $form.find('.message');
model.fetch({
success: function(model) {
$submit.removeClass('hidden');
$loading.addClass('hidden');
var $target;
$submit.removeClass('hidden');
$loading.addClass('hidden');
},
if(!_.isUndefined(commentId)) {
var $row = $form.closest('.comment');
$target = $row.data('commentEl');
$target.removeClass('hidden');
$row.remove();
} else {
$target = $('.commentsTabView .comments').find('li:first');
$textArea.val('').prop('disabled', false);
}
_commentBodyHTML2Plain: function($el) {
var $comment = $el.clone();
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);
}
$comment.find('.avatar-name-wrapper').each(function () {
var $this = $(this);
var $inserted = $this.parent();
$inserted.html('@' + $this.find('.avatar').data('username'));
});
$comment.html(OCP.Comments.richToPlain($comment.html()));
var oldHtml;
var html = $comment.html();
do {
// replace works one by one
oldHtml = html;
html = oldHtml.replace("<br>", "\n"); // preserve line breaks
} while(oldHtml !== html);
$comment.html(html);
return $comment.text();
},
_onSubmitComment: function(e) {
@@ -444,26 +648,27 @@
var currentUser = OC.getCurrentUser();
var $submit = $form.find('.submit');
var $loading = $form.find('.submitLoading');
var $textArea = $form.find('.message');
var message = $textArea.val().trim();
var $commentField = $form.find('.message');
var message = $commentField.text().trim();
e.preventDefault();
if (!message.length || message.length > this._commentMaxLength) {
return;
}
$textArea.prop('disabled', true);
$commentField.prop('contenteditable', false);
$submit.addClass('hidden');
$loading.removeClass('hidden');
message = this._commentBodyHTML2Plain($commentField);
if (commentId) {
// edit mode
var comment = this.collection.get(commentId);
comment.save({
message: $textArea.val()
message: message
}, {
success: function(model) {
self._onSubmitSuccess(model, $form, commentId);
self._onSubmitSuccess(model, $form);
},
error: function() {
self._onSubmitError($form, commentId);
@@ -475,7 +680,7 @@
actorDisplayName: currentUser.displayName,
actorType: 'users',
verb: 'comment',
message: $textArea.val(),
message: message,
creationDateTime: (new Date()).toUTCString()
}, {
at: 0,
@@ -485,7 +690,7 @@
self._onSubmitSuccess(model, $form);
},
error: function() {
self._onSubmitError($form);
self._onSubmitError($form, undefined);
}
});
}
@@ -504,7 +709,7 @@
_onSubmitError: function($form, commentId) {
$form.find('.submit').removeClass('hidden');
$form.find('.submitLoading').addClass('hidden');
$form.find('.message').prop('disabled', false);
$form.find('.message').prop('contenteditable', true);
if(!_.isUndefined(commentId)) {
OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'});
@@ -513,6 +718,31 @@
}
},
/**
* ensures the contenteditable div is really empty, when user removed
* all input, so that the placeholder will be shown again
*
* @private
*/
_onTextChange: function() {
var $message = $('#commentsTabView').find('.newCommentForm div.message');
if(!$message.text().trim().length) {
$message.empty();
}
},
/**
* Limit pasting to plain text
*
* @param e
* @private
*/
_onPaste: function (e) {
e.preventDefault();
var text = e.originalEvent.clipboardData.getData("text/plain");
document.execCommand('insertText', false, text);
},
/**
* Returns whether the given message is long and needs
* collapsing
+3 -1
View File
@@ -5,5 +5,7 @@
"commentsummarymodel.js",
"commentstabview.js",
"filesplugin.js",
"activitytabviewplugin.js"
"activitytabviewplugin.js",
"vendor/Caret.js/dist/jquery.caret.min.js",
"vendor/At.js/dist/js/jquery.atwho.min.js"
]
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+7 -9
View File
@@ -12,10 +12,10 @@ OC.L10N.register(
"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 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"],
"_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
@@ -25,12 +25,10 @@ OC.L10N.register(
"%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 “{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.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"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."
"Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
"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.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem"
},
"nplurals=2; plural=(n != 1);");
+7 -9
View File
@@ -10,10 +10,10 @@
"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 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"],
"_%n unread comment_::_%n unread comments_" : ["%n ongelese kommentaar","%n ongelese kommentare"],
"Comment" : "Kommentaar",
"You commented" : "U het kommentaar gelewer",
"%1$s commented" : "%1$s het kommentaar gelewer",
@@ -23,12 +23,10 @@
"%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 “{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.",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Jy is genoem op “{lêer}”, in die kommentaar van 'n gebruiker wat intussen geskrap is.",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem",
"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."
"Files app plugin to add comments to files" : "Lêertoepinprop om kommentaar op lêers te lewer",
"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.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s het u in n kommentaar op “%2$s” genoem"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+1 -2
View File
@@ -20,7 +20,6 @@ OC.L10N.register(
"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> على الملفات",
"Unknown user" : "مستخدم غير معروف"
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات"
},
"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;");
+1 -2
View File
@@ -18,7 +18,6 @@
"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> على الملفات",
"Unknown user" : "مستخدم غير معروف"
"<strong>Comments</strong> for files" : "<strong>تعليقات</strong> على الملفات"
},"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;"
}
-3
View File
@@ -25,9 +25,6 @@ OC.L10N.register(
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"{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}»",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
},
"nplurals=2; plural=(n != 1);");
-3
View File
@@ -23,9 +23,6 @@
"{author} commented on {file}" : "{autor} comentó en {ficheru}",
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> pa ficheros",
"{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}»",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentóte nun comentariu de «%2$s»"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+3 -6
View File
@@ -8,7 +8,7 @@ OC.L10N.register(
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+3 -6
View File
@@ -6,7 +6,7 @@
"Cancel" : "Отказ",
"[Deleted user]" : "[Изтрит потребител]",
"Comments" : "Коментари",
"No comments yet, start the conversation!" : "Все-още няма коментари, започни разговор!",
"No comments yet, start the conversation!" : "Все още няма коментари, започнете разговор!",
"More comments …" : "Още коментари...",
"Save" : "Запазване",
"Allowed characters {count} of {max}" : "Позволени символи {count} от {max}",
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Коментари</strong> за файлове",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Бяхте споменат/а към “{file}”, в коментар от потребител, който вече е изтрит",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”",
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит"
"You were mentioned on “%s”, in a comment by a user that has since been deleted" : "Бяхте споменат/а на “%s”, в коментар от потребител, който вече е изтрит",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s те спомена в коментар за “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentaris</strong> per arxius",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s us ha nomenat en un comentari a “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -28,10 +28,7 @@ OC.L10N.register(
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
"Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s"
},
"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
+2 -5
View File
@@ -26,10 +26,7 @@
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} vás zmínil(a) v komentáři u „{file}“",
"Files app plugin to add comments to files" : "Zásuvný modul do aplikace Soubory pro přidávání komentářů k souborům",
"Unknown user" : "Neznámý uživatel",
"A (now) deleted user mentioned you in a comment on “%s”" : "(Nyní) už smazaný uživatel vás zmínil v komentáři na „%s“.",
"A (now) deleted user mentioned you in a comment on “{file}”" : "Nyní už smazaný uživatel vás zmínil v komentáři u „{file}“",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s vás zmínil(a) v komentáři u %2$s"
},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
}
+2 -5
View File
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"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",
"{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}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Kommentarer</strong> for filer",
"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",
"{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}\"",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s nævnte dig i en kommentarer på “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -28,10 +28,7 @@ OC.L10N.register(
"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",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt "
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -26,10 +26,7 @@
"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",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt ",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Dich in einem Kommentar zu “%2$s” erwähnt "
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -28,10 +28,7 @@ OC.L10N.register(
"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",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt."
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -26,10 +26,7 @@
"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",
"{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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt.",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s hat Sie in einem Kommentar zu “%2$s” erwähnt."
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
-3
View File
@@ -25,9 +25,6 @@ OC.L10N.register(
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
},
"nplurals=2; plural=(n != 1);");
-3
View File
@@ -23,9 +23,6 @@
"{author} commented on {file}" : "Ο {author} σχολίασε στο {file}",
"<strong>Comments</strong> for files" : "<strong>Σχόλια</strong> για αρχεία",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s σας ανέφερε σε σχόλιο στο “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comments</strong> for files",
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} mentioned you in a comment on “{file}”",
"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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s mentioned you in a comment on “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -28,10 +28,7 @@ OC.L10N.register(
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -26,10 +26,7 @@
"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",
"{user} mentioned you in a comment on “{file}”" : "{user} te mencionó en un comentario en “{file}”",
"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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+3 -3
View File
@@ -12,6 +12,7 @@ OC.L10N.register(
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while retrieving comment with ID {id}" : "Se produjo un error al recuperar 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 publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
@@ -24,10 +25,9 @@ OC.L10N.register(
"%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",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
"{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}”",
"Files app plugin to add comments to files" : "Complemento de aplicación de archivos para agregar comentarios a los archivos.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+3 -3
View File
@@ -10,6 +10,7 @@
"More comments …" : "Más comentarios ...",
"Save" : "Guardar",
"Allowed characters {count} of {max}" : "Caracteres permitidos {count} of {max}",
"Error occurred while retrieving comment with ID {id}" : "Se produjo un error al recuperar 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 publicar un comentario",
"_%n unread comment_::_%n unread comments_" : ["%n comentarios sin leer","%n comentarios sin leer"],
@@ -22,10 +23,9 @@
"%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",
"You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Usted fue mencionado en “{file}”, en un comentario de un usuario que ya ha sido eliminado",
"{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}”",
"Files app plugin to add comments to files" : "Complemento de aplicación de archivos para agregar comentarios a los archivos.",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te ha mencionado en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -27,10 +27,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -25,10 +25,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+2 -5
View File
@@ -26,10 +26,7 @@ OC.L10N.register(
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},
"nplurals=2; plural=(n != 1);");
+2 -5
View File
@@ -24,10 +24,7 @@
"<strong>Comments</strong> for files" : "<strong>Comentarios</strong> de los archivos",
"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",
"{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}”",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”",
"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 “%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",
"%1$s mentioned you in a comment on “%2$s”" : "%1$s te mencionó en un comentario en “%2$s”"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}

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