f5851cda80
Fix typo in config.sample.php
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-10-01 10:21:42 +02:00
48b48fad16
Merge pull request #11436 from nextcloud/assemblystream-eof-14
...
[14] AssemblyStream is also eof if we have no more source stream
2018-09-28 16:56:34 +02:00
e3dab24a2a
AssemblyStream is also eof if we have no more source stream
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-28 15:41:25 +02:00
3894e59e9c
Merge pull request #11418 from nextcloud/stable14-11411-fix-checkWellKnownUrl-not-being-executed
...
[stable14] Fix "checkWellKnownUrl" not being run
2018-09-28 15:30:32 +02:00
ae163ee42d
Merge pull request #11421 from nextcloud/backport/11262/stable14
...
[stable14] use a dummy database name for the default postgres database name
2018-09-28 15:30:11 +02:00
72abd625b4
Merge pull request #11425 from nextcloud/stable14-hover-quota-used-space-regression
...
[stable14] Add back the total used space per user
2018-09-28 15:28:22 +02:00
d29b996072
Merge pull request #11430 from nextcloud/stable14-history-icon-center-fix
...
[stable14] Center back the history icon
2018-09-28 15:22:21 +02:00
fccd9c3c09
Cleanup
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-28 14:11:29 +02:00
a8a4d79a14
Center back the history icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-28 14:11:25 +02:00
a646dba992
Merge pull request #11426 from nextcloud/stable14-inline-input-error-fix
...
[stable14] Fix invalid inline input confirm border
2018-09-28 11:32:31 +02:00
79f1650e69
Fix invalid inline input confirm border
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-28 10:12:50 +02:00
c12689be8b
Merge pull request #11422 from nextcloud/fix/acceptance-apps
...
Fix acceptance tests as app title changed
2018-09-28 09:16:09 +02:00
1e5bcd0496
Add back the total used space per user
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-28 09:03:04 +02:00
947f3b41be
Fix acceptance tests as app title changed
...
The redundant app was removed. So we need to update the tests to make it
green.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-27 21:58:49 +02:00
0d626809f5
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-09-27 20:41:40 +02:00
79643ab4a2
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:13:57 +02:00
c2a9899656
Merge pull request #11385 from nextcloud/11372/fix/14-logo-height
...
[14] Fixes the logo height
2018-09-27 15:41:49 +02:00
5d84475e11
Merge pull request #11399 from nextcloud/stable14-11112-do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled
...
[stable14] Do not hide the progress bar while the chunked upload is being assembled
2018-09-27 14:05:48 +02:00
6eab0d0ece
Merge pull request #11389 from nextcloud/backport/11383/stable14
...
[stable14] do not explode when getting permissions from a FailedStorage
2018-09-27 10:51:43 +02:00
1b493b783d
Merge pull request #11350 from nextcloud/stable14-11258-fix-contacts-menu-on-mentions
...
[stable14] Fix contacts menu on mentions
2018-09-26 15:30:36 +02:00
5a20ac9863
do not explode when getting permissions from a FailedStorage
...
for instance if a user of an external user backend is not available
currently, the whole Files UI would be frozen.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-09-26 13:33:59 +02:00
2ece32b028
Fixes the logo height
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-26 12:38:48 +02:00
e82fe088c8
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 12:35:50 +02:00
6c4f3ac1d6
Merge pull request #11373 from nextcloud/gs-and-saml-stable14
...
[stable14] make the server ready to use global scale with SAML as auth back-end
2018-09-26 11:04:54 +02:00
7bdf3f1a94
Merge pull request #11374 from nextcloud/stable14-content-list-flex-fixes
...
[stable14] Fix default flex shrink on list
2018-09-26 10:11:32 +02:00
8f9571bc3b
Fix default flex shrink on list
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-25 14:33:03 +02:00
28d60274ce
add back-end as parameter to the pre-login hook
...
This is needed for the Global Scale setup to allow the master
node to perform different operations during login, depending
on the user management. Because in case of SAML, the authentication
at the idp happens at the master node.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-09-25 14:17:10 +02:00
d96adc01b7
Merge pull request #11361 from nextcloud/rel-14.0.1
...
Increase version for 14.0.1
2018-09-25 08:33:42 +02:00
884ac1e117
Increase version for 14.0.1
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-25 08:19:39 +02:00
c35401110a
Merge pull request #11340 from nextcloud/stable14-add-unit-test-findlanguagefromlocale
...
[14] Add unit test for findLanguageFromLocale
2018-09-24 12:20:31 +02:00
c274344160
Fix position of contacts menu shown on mentions
...
There are no default CSS rules for the contacts menu, as its position
depends on the element on which it is shown. Note, however, that if no
explicit rules are provided the contacts menu on mentions is affected by
the rules for the contacts menu on shares from the sharing tab.
The contacts menu is now positioned to show the tip of the arrow
horizontally aligned with the center of the avatar, and with the top of
the menu slightly below the bottom border of the mention.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-24 09:58:23 +02:00
d0c3b45f0f
Fix contacts menu not triggered on certain areas of a mention
...
The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-24 09:58:23 +02:00
62b9ae21fe
Add simple unit test for findLanguageFromLocale
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-23 23:15:05 +02:00
1f714124bb
Merge pull request #11259 from nextcloud/fix/11144/backport14
...
[14] Fixes empty favorite names for trailing slashes
2018-09-20 13:43:24 +02:00
4d8f69f7a4
Merge pull request #11173 from nextcloud/update-version-14.0.1
...
Prepare 14.0.1 release
2018-09-20 12:48:49 +02:00
e77bd8a894
Prepare 14.0.1 release
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 10:58:49 +02:00
ea73f30d77
Merge pull request #11302 from nextcloud/backport/11297/this-database-dude
...
[stable14] Fix expiration code of tokens
2018-09-20 10:52:15 +02:00
0c85cb1ea9
Merge pull request #11077 from nextcloud/stable14-11064-fix-markup-and-style-of-mentions-in-comments
...
[stable14] Fix markup and style of mentions in comments
2018-09-20 10:37:23 +02:00
a0f2bd8d28
Merge pull request #11294 from nextcloud/stable14-locale-template-fix
...
[stable14] Use user locale as default in the template
2018-09-20 10:37:00 +02:00
e5176960ce
Merge pull request #11288 from nextcloud/backport/11171/shared-by-info-for-room-shares-without-names
...
[stable14] Shared by info for room shares without names
2018-09-20 10:26:18 +02:00
9a4ad9cd17
Merge pull request #11287 from nextcloud/backport/11041/get_permission_of_storage_for_shares
...
[stable14] Get permission of storage for shares
2018-09-20 10:25:34 +02:00
2153bcfea8
Merge pull request #11293 from nextcloud/backport/11292/do-not-apcu-cache-the-autoloader
...
[stable14] Revert "Use APCu caching of composer"
2018-09-20 10:08:02 +02:00
6718bfb83d
Also adjust the expiration of PublicKeyTokenProvider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 10:00:08 +02:00
3a179b2519
Copy the expiration from 480864b3e3 to getTokenById
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 09:59:53 +02:00
8dff9460b8
Merge pull request #11291 from nextcloud/stable14-fix-icons-cacher
...
[stable14] Fix icons cacher regex for compressed output
2018-09-19 22:40:15 +02:00
43889d1a49
Fixes empty favorite names for trailing slashes
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-09-19 17:44:54 +02:00
fcda1f7124
Fix since tag
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:26 +02:00
efbd98183d
Fallback to $lang if no $locale match
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:22 +02:00
d69ddd94de
Typehint
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:19 +02:00
ccb8838854
Since requirement
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-19 16:13:14 +02:00
Marius Blüm
Roeland Jago Douma
Robin Appelman
Morris Jobke
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Daniel Calviño Sánchez
blizzz
Michael Weimann
Bjoern Schiessle
Joas Schilling
Joas Schilling
Daniel Kesselberg