Commit Graph

39593 Commits

Author SHA1 Message Date
Morris Jobke fd25265849 Merge pull request #5807 from nextcloud/12-backport-5790
[stable12] Fix config.sample.php documentation
2017-07-20 22:38:15 +02:00
Björn Schießle c9624d2695 Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-stable12
[stable12] Add recovery key on public upload
2017-07-20 14:27:57 +02:00
Roeland Jago Douma 07ebc7b1c3 Merge pull request #5759 from nextcloud/backport-translations-stuff-12
[stable12] Backport translation fixes
2017-07-20 14:25:11 +02:00
Morris Jobke ad1c6a0fc2 Merge pull request #5804 from nextcloud/12-backport-5800
[stable12] Enable acceptance tests again on Drone 0.7
2017-07-20 13:07:59 +02:00
Morris Jobke bf79293e13 Fix config.sample.php documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-20 12:32:46 +02:00
Bjoern Schiessle fff804c39e
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:43:39 +02:00
Bjoern Schiessle f7a2b96507
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

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

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

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

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

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-20 11:32:50 +02:00
Lukas Reschke cd6afb6957 Merge pull request #5796 from nextcloud/backport-allow-to-theme-emails
[stable12] Backport allow to theme emails
2017-07-20 10:20:30 +02:00
Nextcloud bot 9cbdca60d2
[tx-robot] updated from transifex 2017-07-20 00:08:13 +00:00
Joas Schilling c6f57fe22d
Allow to overwrite the email template again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-19 17:59:12 +02:00
Joas Schilling 336ce139ae Merge pull request #5777 from nextcloud/app-menu-ellipsis-stable12
[stable 12] Add ellipsis for app titles in the app menu popover
2017-07-19 16:21:30 +02:00
Joas Schilling fef3c61378 Merge pull request #5784 from nextcloud/backport-5745-12
[stable12] Fix emitting of legacy hook post_unshare
2017-07-19 15:06:16 +02:00
Morris Jobke 3e4685b851 Merge pull request #5782 from nextcloud/backport-5781-stable12
[stable12] Allow overwriting of IOS theming values
2017-07-19 12:37:29 +02:00
Pauli Järvinen 22b29943ed Fix emitting of legacy hook post_unshare
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

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

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

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 13:02:16 +02:00
blizzz b9d7c48acf Merge pull request #5711 from nextcloud/null-user-exist-12
[12] null users dont exist
2017-07-14 12:38:27 +02:00
Nextcloud bot 281e5eb8bc
[tx-robot] updated from transifex 2017-07-14 00:08:47 +00:00
Morris Jobke 9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke 90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Robin Appelman ce45f87699
null users dont exist
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 15:54:16 +02:00
Morris Jobke 61bac5637f Merge pull request #5697 from nextcloud/stable12-4984
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00
Robin Appelman 5804dfc078
Fix scan permissions with nested permissions masks
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:37:09 +02:00