Commit Graph

40255 Commits

Author SHA1 Message Date
Robin Appelman 4803bd1f3f
update icewind/smb to 2.0.4
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-19 16:30:26 +01:00
Nextcloud bot 8b8c796a31
[tx-robot] updated from transifex 2018-01-19 01:11:20 +00:00
Morris Jobke 533e59f1d5
Merge pull request #7937 from nextcloud/12.0.5-rc2-prep
12.0.5 RC2
2018-01-18 17:31:29 +01:00
Morris Jobke 4b707b5512
12.0.5 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 14:25:26 +01:00
Nextcloud bot 49aa99de7f
[tx-robot] updated from transifex 2018-01-18 01:11:05 +00:00
Nextcloud bot 1e8a1a9400
[tx-robot] updated from transifex 2018-01-17 01:11:24 +00:00
Roeland Jago Douma 60fa75d2ec
Merge pull request #7888 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors-12
[stable12] Keep all shipped apps enabled because they should be okay
2018-01-16 20:19:32 +01:00
Roeland Jago Douma 7a7e756b0e
Merge pull request #7817 from nextcloud/stable12-7767
[stable12] Fix preview when theming changes invertion of icons
2018-01-16 19:18:56 +01:00
Joas Schilling c7485fa1ad
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-16 13:41:33 +01:00
Nextcloud bot a3059d0f1f
[tx-robot] updated from transifex 2018-01-16 01:11:18 +00:00
Nextcloud bot cdbf584d37
[tx-robot] updated from transifex 2018-01-15 01:10:56 +00:00
Nextcloud bot 5e1d580010
[tx-robot] updated from transifex 2018-01-14 01:10:56 +00:00
Roeland Jago Douma 392cdd8cad
Merge pull request #7821 from nextcloud/12-7818
[stable12] Log full exception in cron instead of only the message
2018-01-12 22:40:05 +01:00
Morris Jobke b61b357196
Log full exception in cron instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 15:34:16 +01:00
Julius Härtl 394f1d89d3
Fix appmenu svg double invert
This fixes a regression caused by 9b668d0, where the css filters to
preview color inversion of the app menu was applied by default. This
commit makes the css filters sensitive on what the current state of the
app menu is.

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

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

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

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

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

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

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

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-09 15:57:27 +01:00
Daniel Calviño Sánchez 41a52064c0
Fix typo in callback name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-01-09 15:57:23 +01:00
Morris Jobke f5a5be201c
12.0.5 RC1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-09 11:47:44 +01:00
Morris Jobke 1b43184aeb
Merge pull request #7747 from nextcloud/composer_up_12
Update of composer
2018-01-09 11:45:37 +01:00
Morris Jobke 607f699259
Properly catch InvalidTokenException for better error response
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-09 11:44:52 +01:00
Morris Jobke db6b9fdb6a
Merge pull request #7745 from nextcloud/7692_12
[stable12] Don't lie about preview types
2018-01-09 11:27:53 +01:00
Morris Jobke b089199141
Merge pull request #7708 from nextcloud/stable12-7599
[stable12] don't show recurring msg when pages result was turned off
2018-01-09 11:23:36 +01:00
Morris Jobke 25ba9cbe71
Merge pull request #7684 from nextcloud/backport-ie-fix-invert
[stable12] Fix inverted app icons on IE11
2018-01-09 11:22:54 +01:00
Morris Jobke 2f9d59535d
Merge pull request #7674 from nextcloud/12_7644
[stable12] Do no run SyncJob in cron
2018-01-09 11:14:16 +01:00
Morris Jobke bbaa765d51
Merge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen
[stable12] Fix drag shadow not visible when dragging a file on a narrow screen
2018-01-09 11:12:15 +01:00
Morris Jobke 2df3864878
Merge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available
[stable12] Hide favourite icon in details view if favourite action is not available
2018-01-09 11:08:53 +01:00