Commit Graph

39828 Commits

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
2017-07-19 11:42:23 +02:00