wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
42086 commits 157 branches 562 tags 714 MiB
Commit graph

14864 commits

Author SHA1 Message Date
Roeland Jago Douma
15bbf08774
Merge pull request #7816 from nextcloud/fix-strpos-for-current-app 
Fix strpos if needle is not found
 2018-01-12 16:55:27 +01:00
Roeland Jago Douma
9d508a022e
Merge pull request #7814 from nextcloud/base.php-strict-typing 
Fix strict typing issues in lib/base.php
 2018-01-12 16:32:23 +01:00
Morris Jobke
b356d0dfc4
Fix explode() call in legacy/helper.php to have correct types 
Found while enabling strict_typing for PHP7+.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 15:26:49 +01:00
Morris Jobke
e3c0fd6882
Fix strpos if needle is not found 
Found while testing strict_typing for PHP 7+. If `$script` does not contain a `/` then it should extract a string of the length 0.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 15:01:45 +01:00
Morris Jobke
6d95f90361
Raise PHP version number to PHP 7.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 14:26:10 +01:00
Morris Jobke
6bf1fca6f0
Fix strict typing issues in lib/base.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 14:22:31 +01:00
Morris Jobke
01040daf02
Fix call to clearstatcache to actually use the file path 
* found while adding the strict_typing for PHP 7+ migration
* first argument is a boolean - second one is the path
* see http://php.net/manual/en/function.clearstatcache.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 13:59:58 +01:00
Nextcloud bot
2a24f45b5f
[tx-robot] updated from transifex 2018-01-11 01:11:35 +00:00
Roeland Jago Douma
03a7d9bbfa
Merge pull request #7635 from Abijeet/bug-7106 
Fixes password input being prompted every time.
 2018-01-10 20:10:40 +01:00
Morris Jobke
4823ac969a
Merge pull request #7763 from nextcloud/pos_fix_7751 
Do not instantiate node when not needed
 2018-01-10 15:40:10 +01:00
Roeland Jago Douma
f6d84bdb23
Log a missing setting as INFO not as WARNING 
It can happen for all kinds of reasons that a setting is not available.
(A user removes a folder, a setting got deleted). So don't polute the
log on default settings.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-10 09:02:01 +01:00
Roeland Jago Douma
4596423b14
Do not instantiate node when not needed 
Use the lazy functions is possible. This avoids getting the node if not
required.

Possible fix for #7751

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-09 19:51:50 +01:00
Jan-Christoph Borchardt
9386b07ed8
Merge pull request #7731 from nextcloud/preview_size_inc 
Max preview size to 4096x4096
 2018-01-09 11:07:02 +01:00
Abijeet
de5467811a Fixes password input being prompted every time. 
Fixes #7106

- Echoing the current server time via a JS variable and storing the current time on page load in JS.
- Calculating the diff and taking it into account when deciding whether to show the password confirmation.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-01-08 23:47:52 +05:30
Roeland Jago Douma
e2352cc06f
Max preview size to 4096x4096 
With HiDPI screens. And even normal HD screens you want more detail from
your pictures. Or the ability to somewhat zoom on you previews. For this
we need somewhat larger previews.

Moving the default to 4096x4096 is a step up. Users that want the old
behavior can still set the values in config.php

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-08 15:35:55 +01:00
Roeland Jago Douma
faa68b28cb
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-07 14:36:37 +01:00
Roeland Jago Douma
5b21650097
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-07 11:41:54 +01:00
Nextcloud bot
2e683d3502
[tx-robot] updated from transifex 2018-01-06 01:11:09 +00:00
Morris Jobke
68e205e827
Merge pull request #7712 from nextcloud/jsconfig_l10n 
Use correct L10N files for jsconfig
 2018-01-05 15:22:10 +01:00
Roeland Jago Douma
30ac28f950
Use correct L10N files for jsconfig 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-05 14:33:03 +01:00
Nextcloud bot
1f8896d8c9
[tx-robot] updated from transifex 2018-01-05 01:11:18 +00:00
Morris Jobke
f87977ef2d
Merge pull request #7702 from nextcloud/composer_upd 
Composer updated
 2018-01-04 17:24:09 +01:00
Morris Jobke
e7aebcfd6b
Merge pull request #7699 from nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it 
Drop the ownCloud migration table instead of reusing it
 2018-01-04 16:52:52 +01:00
Roeland Jago Douma
0280cff66f
Composer updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-04 16:31:16 +01:00
Joas Schilling
7154050201
Drop the ownCloud migration table instead of reusing it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-04 14:58:01 +01:00
Morris Jobke
e655732458
Merge pull request #7570 from nextcloud/s3-legacy-auth 
add option to use legacy v2 auth with s3
 2018-01-04 13:17:58 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Morris Jobke
19280adc0d
Merge pull request #7611 from nextcloud/fix-7445 
Don't attempt to translate login names to uids when uids are provided
 2018-01-03 23:45:31 +01:00
Julius Härtl
8a226811dc
Invert app icons on IE11 as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-03 14:42:07 +01:00
Arthur Schiwon
4f3d52a364
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-03 13:25:00 +01:00
Roeland Jago Douma
57050146f6
Move passwordconfirmation to its own midleware 
Add tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-02 21:58:14 +01:00
Bjoern Schiessle
1bcbeb24bc
disable password confirmation with SSO 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-01-02 20:30:37 +01:00
Morris Jobke
d97341d986
Merge pull request #7660 from nextcloud/fix-7646 
Also log exception for failed appstore request
 2018-01-02 15:05:33 +01:00
Morris Jobke
aac9a1c41a
Merge pull request #7631 from nextcloud/fix-scss-webroot-and-url-rewrite 
Fix scss webroot and url rewrite
 2018-01-02 15:03:07 +01:00
Morris Jobke
c5f852d90c
Also log exception for failed appstore request 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-02 09:40:03 +01:00
John Molakvoæ (skjnldsv)
c0c4443ffc
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
02bfc867ef
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>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
88b72fd027
Fixup! getWebdir return 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
dc938628f7
Use OC_Util function for app web path 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
ad20af619f
getWebDir function 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
89ca9cb35c
Fixed webroot for scss files 
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
fb6c5cc416
Fixed scss url rewriting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:43 +01:00
Roeland Jago Douma
752055220f
Don't spam the log when we could not properly connect to the appstore 
If we can't connect to the appstore for some reason we don't have to log
the exception just an info entry is enough.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-29 15:55:05 +01:00
Roeland Jago Douma
735b9fb81a
Fixup code 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-22 13:08:00 +01:00
Julius Härtl
4c3eb80a91
Hide delete button if the avatar is a generated one 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-19 18:49:26 +01:00
Roeland Jago Douma
a4ca92f29a
Remove generated avatar on displayname change 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-19 18:49:26 +01:00
Robin Appelman
34ced4dd97
add option to use legacy v2 auth with s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-19 11:54:55 +01:00
Roeland Jago Douma
e550a3ddd8
Merge pull request #7562 from nextcloud/fix-wrongly-cached-result 
Cache final result of update check
 2017-12-19 10:12:33 +01:00
Roeland Jago Douma
e294323df2
Merge pull request #7517 from nextcloud/add-index-to-share-table 
Add index to share_with column in the share table
 2017-12-18 22:23:53 +01:00
Roeland Jago Douma
a84d11de7b
Merge pull request #7531 from nextcloud/ldap/createdistributed 
don't use deprecated method for requesting memcache
 2017-12-18 22:08:32 +01:00
Morris Jobke
1beffa058a
Cache final result of update check 
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.

Fixes #7442

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 21:48:58 +01:00
Bjoern Schiessle
21489d5f24
update autoloader 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 21:16:08 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Roeland Jago Douma
0b7136940e
Let DI handle the background job 
Fixes #7548

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 20:42:06 +01:00
Morris Jobke
913cb2b9c6
Merge pull request #7554 from nextcloud/fix-7546 
Fix default parameter of OC_DB::executeAudited()
 2017-12-18 15:24:11 +01:00
Robin Appelman
bdf4111013
Merge pull request #7555 from nextcloud/smb-copy-rename-log 
additional debug logging on smb copy/rename failures
 2017-12-18 15:02:18 +01:00
Morris Jobke
3da92a9a78
Merge pull request #7490 from nextcloud/fix_7428 
Respect sharing options when searching using MailPlugin #7428
 2017-12-18 14:08:52 +01:00
Robin Appelman
4f0d03e172
additional debug logging on smb copy/rename failures 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-18 13:59:58 +01:00
Morris Jobke
d19dcfd0eb
Fix default parameter of OC_DB::executeAudited() 
* fixes #7546

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 13:58:54 +01:00
Morris Jobke
97f80f5581
Merge pull request #7505 from nextcloud/do-not-update-if-app-comes-from-git 
Do not update apps if it comes from git
 2017-12-18 13:43:58 +01:00
Tobia De Koninck
9d60f7fc64 Don't show users which e-mail address match if they belong to a group we may share with 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-15 19:09:46 +01:00
Roeland Jago Douma
ca70694502
Also check for empty content lenth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 21:48:59 +01:00
John Molakvoæ (skjnldsv)
f2d5927ea3
Reduce length of md5 in scss caching 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 11:11:54 +01:00
John Molakvoæ (skjnldsv)
2dbd5052ff
Up check 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 10:00:34 +01:00
Morris Jobke
54c227b6c4
Use cached app list 
Followup to #7264

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-14 09:56:53 +01:00
John Molakvoæ (skjnldsv)
cca8744350
Do not update apps if it comes from git 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 09:50:31 +01:00
Roeland Jago Douma
ce12763ab7
Merge pull request #7485 from nextcloud/fix_7001 
Also cache invalid DiscoveryService response
 2017-12-14 07:47:13 +01:00
Roeland Jago Douma
3b343e287f
Also cache invalid DiscoveryService response 
* Cache it for a day so we will retry eventually
* Cache the status.php response as well so we will try it once a day as
well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-13 15:50:53 +01:00
Arthur Schiwon
099a340bf5
The user displayNameResolver is specific to users, not the comments app 
Other apps like spreed rely on it, and only can resolver per type can
be registered anyhow.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-12-12 17:36:31 +01:00
Morris Jobke
2943b54f98
Merge pull request #7466 from nextcloud/fix-php7.2-session-init 
Fix error log on PHP 7.2
 2017-12-12 15:45:25 +01:00
Morris Jobke
175e1a5442
Merge pull request #7465 from nextcloud/filename-typo 
Fix filename typo
 2017-12-12 15:12:20 +01:00
Morris Jobke
b19fae2629
Fix error log on PHP 7.2 
Fixes following error in the logs: "ini_set(): A session is active. You cannot change the session module's ini settings at this time"

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-12 14:33:30 +01:00
Robin Appelman
1066faa8ba
Fix filename typo 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-12 14:18:49 +01:00
Bjoern Schiessle
f0202245ee
allow 'Nextcloud' in the user agent string of Android 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-12 12:16:01 +01:00
Roeland Jago Douma
b8af7ee9bc
Nextcloud 13 is not compatible with newer than php 7.2 
Just to avoid users from trying this with a to new (untested) php version

* Moved the check logic to 1 place
* All directly callable scripts just require this on top
* exit hard (-1) so we know scripts won't continue
* Return status 500 so no sync clients will try fancy stuff

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-12 10:55:09 +01:00
Roeland Jago Douma
53400a1972
Properly detect if fopen fails for txt previews 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 20:37:18 +01:00
Tobia De Koninck
cecfc28ebd
Register ContactsStore using alias + run autoloaderchecker.sh 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:19:24 +01:00
Tobia De Koninck
78049af02c
Add @since annotation and add missing new line 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:18:58 +01:00
Tobia De Koninck
f6ef779f97
Make ContactsStore a public API 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-11 18:18:58 +01:00
Morris Jobke
45971879f5
Merge pull request #6668 from nextcloud/fix_6621 
Remove avatar on user deletion
 2017-12-11 18:16:14 +01:00
Robin Appelman
05d2f61a59
handle not found mounts when cleaning avatars 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-11 16:56:10 +01:00
Roeland Jago Douma
10aa287463
Remove avatar on user deletion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 16:07:06 +01:00
Roeland Jago Douma
949fc50cc5
Dispatch event on User predelete 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-11 16:05:38 +01:00
Morris Jobke
07e6387b31
Merge pull request #7449 from nextcloud/fix-setup 
Fix 500 on setup page
 2017-12-11 16:00:11 +01:00
Roeland Jago Douma
e8acf448eb
Merge pull request #6651 from nextcloud/remote-cloud-client 
Add api clients for talking to remote clouds
 2017-12-11 15:28:39 +01:00
Roeland Jago Douma
e47137c7d4
Merge pull request #6682 from nextcloud/dav-mimetype-fallback 
Fallback to filename based detection if the remote dav server doesn't…
 2017-12-11 15:28:05 +01:00
Morris Jobke
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails 
Fix email buttons for white theme
 2017-12-11 15:16:28 +01:00
Morris Jobke
ce69d9ec71
Fix 500 on setup page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 15:03:55 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:33:54 +01:00
Morris Jobke
52e7d05163
Fix syntax error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
1ac31260ac
Fixed phpdoc and function type 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
f018bfc7de
Fixed md5 generation and added fallback for scss requests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 14:24:23 +01:00
John Molakvoæ (skjnldsv)
820e7b5aba
Use apps versions to generate suffix when possible 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-11 14:24:23 +01:00
Nextcloud bot
8ed728c1a2
[tx-robot] updated from transifex 2017-12-11 01:10:20 +00:00
Nextcloud bot
a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Morris Jobke
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar 
Always generate avatar
 2017-12-08 23:58:17 +01:00
blizzz
83509b0fd3
Merge pull request #7334 from nextcloud/feature/noid/language-depending-skeleton-directory 
Allow `{lang}` as a placeholder in the skeleton directory
 2017-12-08 18:19:01 +01:00
Robin Appelman
5ce69e7c42
Add some more tests for ocs remote api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
f1eb55fad7
refuse to use http if we know a remote has https 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
78a24e3b81
validate user response 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00