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
Roeland Jago Douma
0a880e67cc
Update of composer
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-09 11:00:22 +01:00
Nextcloud bot
e059e1d9d5
[tx-robot] updated from transifex
2018-01-09 01:11:29 +00:00
Roeland Jago Douma
1f875eca3c
Merge pull request #7694 from nextcloud/stable12-7611
...
[stable12] Don't attempt to translate login names to uids when uids are provided
2018-01-08 21:10:11 +01:00
Roeland Jago Douma
87e99651f5
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-08 20:39:48 +01:00
Roeland Jago Douma
50b880edeb
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-08 20:39:39 +01:00
Daniel Calviño Sánchez
436ffaecb4
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-08 17:44:55 +01:00
Nextcloud bot
e23491dc42
[tx-robot] updated from transifex
2018-01-08 01:11:31 +00:00
Roeland Jago Douma
116e4e415e
Merge pull request #7717 from nextcloud/stable12-7662
...
[stable12] throw ServerNotAvailableException when LDAP is caught shutting down
2018-01-07 11:40:18 +01:00
Nextcloud bot
ea70bac9fb
[tx-robot] updated from transifex
2018-01-07 01:11:25 +00:00
Nextcloud bot
27a4a8247c
[tx-robot] updated from transifex
2018-01-06 01:11:22 +00:00
Arthur Schiwon
37c0352249
throw ServerNotAvailableException when LDAP is caught shutting down
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 20:36:30 +01:00
Morris Jobke
28d77efe80
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
...
[Stable12] fix scss webroot and url rewrite
2018-01-05 17:29:08 +01:00
John Molakvoæ (skjnldsv)
b95d18b85e
Revert rebaseurl function edit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:35:38 +01:00
John Molakvoæ (skjnldsv)
7a282dee89
Rollback caching fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-05 08:34:32 +01:00
Julius Härtl
7bc63f6135
Fix faulty path in theming scss generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 08:17:39 +01:00
Nextcloud bot
a3933b99fe
[tx-robot] updated from transifex
2018-01-05 01:11:32 +00:00
Arthur Schiwon
0941781d1e
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>
2018-01-05 00:29:22 +01:00
Arthur Schiwon
32597f8966
test adoption for stable12
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:10:10 +01:00
John Molakvoæ (skjnldsv)
1f2437e2c5
Fixup! Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:11:41 +01:00
John Molakvoæ (skjnldsv)
cf53560218
Proberly detect variable changes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 19:10:27 +01:00
John Molakvoæ (skjnldsv)
fa95733b0d
Fixed url rebase with theming
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 13:24:21 +01:00
Arthur Schiwon
7f0e4a5357
update autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 13:16:05 +01:00
Arthur Schiwon
e489a1a7c8
removes invalid tests, adapts another one
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:49:29 +01:00
Arthur Schiwon
776d9e6805
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-04 11:47:31 +01:00
Arthur Schiwon
c94c2c48a6
extend tests for status quo
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-04 11:47:21 +01:00
Nextcloud bot
233fd16049
[tx-robot] updated from transifex
2018-01-04 09:48:45 +00:00
John Molakvoæ (skjnldsv)
51cc76b80d
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-04 08:35:38 +01:00
John Molakvoæ (skjnldsv)
1ae126a781
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv)
9fa49c7f24
Correctly remove temp test directory tree
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:03 +01:00
John Molakvoæ (skjnldsv)
87b1839cd1
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>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
a46d45a652
Fixup! getWebdir return
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
89b6bc9424
Use OC_Util function for app web path
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
5008eb8f85
getWebDir function
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:05:02 +01:00
John Molakvoæ (skjnldsv)
00412d1c8c
Fixed webroot for scss files
...
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-01-03 22:04:59 +01:00