upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 16:39:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
40264 commits 1001 branches 1208 tags 8.5 GiB
Commit graph

14341 commits

Author SHA1 Message Date
Nextcloud bot
ae0641fccc
[tx-robot] updated from transifex 2018-01-21 01:11:18 +00: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
5738662032
[tx-robot] updated from transifex 2018-01-11 01:11:50 +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
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
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
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
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
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
Roeland Jago Douma
0a880e67cc
Update of composer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-09 11:00:22 +01: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
Nextcloud bot
27a4a8247c
[tx-robot] updated from transifex 2018-01-06 01:11:22 +00: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
Nextcloud bot
a3933b99fe
[tx-robot] updated from transifex 2018-01-05 01:11:32 +00: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
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
Nextcloud bot
233fd16049
[tx-robot] updated from transifex 2018-01-04 09:48:45 +00: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)
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
John Molakvoæ (skjnldsv)
f13b3b6651
Fixed scss url rewriting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-01-03 22:04:08 +01:00
Julius Härtl
a3b6f05722
Invert app icons on IE11 as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-03 15:22:54 +01:00
Johannes Schlichenmaier
a7e67a6ce2
Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2018-01-03 10:46:04 +01:00
Christoph Wurst
85c18f5980
Fix duplicate session token after remembered login 
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-12-19 09:17:06 +01:00
Morris Jobke
6859e5a22a
Merge pull request #7558 from nextcloud/12-7427 
[stable12] Fix email buttons for white theme
 2017-12-18 21:19:51 +01:00
Morris Jobke
e726d191f1
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 17:03:01 +01:00
Morris Jobke
3a99ef5286
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12 
[12] Allow getting the filepath when getting cached mounts by fileid
 2017-12-13 13:28:25 +01:00
Bjoern Schiessle
003c709d25
allow 'Nextcloud' in the user agent string of Android 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 14:38:36 +01:00
Robin Appelman
3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-12 14:11:40 +01:00
Morris Jobke
d41971184b
Remove wrong entry in admin_settings that causes 500 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 21:04:56 +01:00
Nextcloud bot
e4bf23ce7b
[tx-robot] updated from transifex 2017-12-11 01:10:34 +00:00
Nextcloud bot
0ff717c600
[tx-robot] updated from transifex 2017-12-10 01:10:38 +00:00
Roeland Jago Douma
ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12 
[12]add retry wrapper when reading files from swift
 2017-12-08 09:26:41 +01:00
Morris Jobke
5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12 
[12]Use the correct root for shared jail when the source storage is also a jail
 2017-12-08 09:03:03 +01:00
Robin Appelman
0519ca5893
add retry wrapper when reading files from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-06 15:43:00 +01:00
Robin Appelman
4144580167
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:18:23 +01:00
Morris Jobke
1cd5ba3e90
Merge pull request #7144 from nextcloud/rename-locks-stable12 
Unlock files even if an exception occurs (stable12)
 2017-12-04 11:13:19 +01:00
Arthur Schiwon
17c13e4436
Allow to skip data dir permission checks by config 
Enables installation on services that don't allow/support permission
changes.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-12-01 11:55:29 +01:00
Morris Jobke
90feccf4be
Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss 
[stable12]  Only in case of $currentAccess the array uses the id as index
 2017-11-28 20:16:32 +01:00
Joas Schilling
76a2fb0231
Only in case of $currentAccess the array uses the id as index 
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.

Regression from 3820d6883d

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:24:19 +01:00