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

14931 commits

Author SHA1 Message Date
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
Robin Appelman
8b01176f60
add more typehints 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
5133a31d3c
Add public api for remote api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:37:14 +01:00
Robin Appelman
74b5ce8fd4
Some tests for the remote cloud api 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:34:33 +01:00
Robin Appelman
ac2c26ffcb
Add api clients for talking to remote clouds 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-08 16:34:33 +01:00
Morris Jobke
66f523e13f
Better center the letter and use semibold font type 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-08 16:24:31 +01:00
Morris Jobke
8ffd4428bb
Fallback to "default" and check if directory exists 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-08 12:28:41 +01:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root 
delay calculating the shared cache root until it's used
 2017-12-06 15:14:48 +01:00
Roeland Jago Douma
6e45034745
Merge pull request #7351 from nextcloud/change-default-german-language 
use formal version of German by default
 2017-12-06 08:30:14 +01:00
Robin Appelman
046eb0c635
add retry wrapper when reading files from swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 16:34:53 +01:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:16:39 +01:00
Morris Jobke
72bb7c3074
Fix PHP doc for API docs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-03 12:02:29 +01:00
Bjoern Schiessle
2c3d97cc8f
check if $defaultLanguage is a valid string before we move on 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-01 16:14:51 +01:00
Bjoern Schiessle
8b734347b1
use formal version of German if default_language is set to 'de_DE' 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-30 17:29:08 +01:00
Morris Jobke
0f35ef3727
Reuse systemconfig 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-30 16:04:07 +01:00
Morris Jobke
f22e02cd79
Refactor method to check if update is needed 
There was only one call, that actually needed the parameter to be set to true. So this change moved the print of the page to that location and replaces all other occurences with a direct call to the underlying OCP API.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-30 16:04:07 +01:00
Arthur Schiwon
1b7dfd73af
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-11-30 11:16:00 +01:00
Roeland Jago Douma
d5496dc435
Since we update the avatar in the sync service remove the generated file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
03d9e7e963
Sinc we use AppData the regex is not needed anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
ba648eecdf
Move avatar code to Avatar Class 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Joas Schilling
8e684f76e5
Allow {lang} as a placeholder in the skeleton directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-29 10:04:53 +01:00
Joas Schilling
80b34f5f7d
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:17:51 +01:00
Morris Jobke
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending 
Pass log level to log reporters
 2017-11-27 17:49:46 +01:00
Morris Jobke
132764bff5
Pass log level to log reporters 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:46:47 +01:00
Morris Jobke
4a63727ed9
Merge pull request #7210 from nextcloud/pg10 
add postgresql 10 compatibility to dbal
 2017-11-27 16:40:58 +01:00
Lukas Reschke
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method 
Remove unused mimetype detection method in OC_Image
 2017-11-27 11:55:20 +01:00
Lukas Reschke
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps 
Cache fetched apps in update check
 2017-11-27 11:48:59 +01:00
Morris Jobke
4b73ddc9ce
Merge pull request #6437 from nextcloud/support-mail-send-in-share 
Add support for `\OCP\Share\IShare::getMailSend` back
 2017-11-27 11:29:38 +01:00
Lukas Reschke
1c25919cf1
Proper handle null cases and default to true 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Lukas Reschke
56a2512581
Add support for \OCP\Share\IShare::getMailSend back 
This adds back the support for `\OCP\Share\IShare::getMailSend`, one example is creating bulk shares via API which where previously blocking due to the share notification emails.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Flávio Gomes da Silva Lisboa
5ca9a7d6bc
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:22:44 +01:00
Morris Jobke
dbb034f903
Remove unused mimetype detection method in OC_Image 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 07:46:32 +01:00
Morris Jobke
df61d43529
Make isUpdateAvailable non-static 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-25 12:01:02 +01:00
Morris Jobke
0e2f00ec59
Get the Installer via DI 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-25 12:00:57 +01:00
Morris Jobke
a97a290fd5
Cache fetched apps in update check 
The code tried to find the apps with updates and thus was called for every available app. This caused to get the full appstore content as often as apps are available. The appstore request itself was cached nevertheless in an appdata dir, but with an object storage this is still a lot of round trips to read this cached result. Thus the instantiated list is now cached in a static variable (because it's a static method call).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-25 12:00:56 +01:00
Lukas Reschke
ee4262f567
Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-success 
Reset bruteforce attempt table on successful login
 2017-11-24 15:53:08 +01:00
Morris Jobke
5a270c2715
Reset bruteforce attempt table on successful login 
* only clear the entries that come from the same subnet, same action and same metadata

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-24 14:58:57 +01:00
Morris Jobke
05abb9ea66
Remove unused checkCode method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-24 10:50:50 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +01:00
blizzz
98cdd9885f
Merge pull request #7168 from nextcloud/fix-user-list 
Fix accesslist when a user has an ID only containting 0-9
 2017-11-23 12:17:11 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root 
Use the correct root for shared jail when the source storage is also a jail
 2017-11-23 12:03:36 +01:00
Robin Appelman
da3004b8f5
add postgresql10 compatibility to dbal 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-22 17:57:17 +01:00
Morris Jobke
6fd51426bf
Remove wrong entry in admin_settings that causes 500 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-20 20:49:03 +01:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Roeland Jago Douma
2eb2b6e437
If there is no internet connection don't try to contact appstore 
Fixes #7119

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-17 20:35:04 +01:00
Bjoern Schiessle
1ade6b0817
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-17 12:45:46 +01:00
Morris Jobke
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api 
Calendar API for apps
 2017-11-16 21:10:35 +01:00
Nextcloud bot
b2e9cb6a00
[tx-robot] updated from transifex 2017-11-16 01:09:50 +00:00
Morris Jobke
82502b10db
Merge pull request #7169 from nextcloud/fix-user-search 
Fix search in user managent when no group is selected
 2017-11-14 23:30:02 +01:00
Morris Jobke
80e527d21e
Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cleanup 
check if the user still exists before we try to cleanup the previews
 2017-11-14 23:29:28 +01:00
Björn Schießle
c225bbd021
Merge pull request #7113 from nextcloud/s3-download-stream-fix 
Fix s3 download and touch
 2017-11-14 20:38:50 +01:00
Bjoern Schiessle
a923e755e6
check if the user still exists before we try to cleanup the previews 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-14 20:26:18 +01:00
Morris Jobke
eb0f3ebf75
Fix search in user managent when no group is selected 
* also allows to search by displayname

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-14 17:32:03 +01:00
Joas Schilling
3820d6883d
Fix accesslist when a user has an ID only containting 0-9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-14 17:21:16 +01:00
Morris Jobke
16549ae5fb
Merge pull request #7166 from nextcloud/enhancement/crash-report-context 
Pass the exception context to the crash reporter
 2017-11-14 15:07:33 +01:00
Morris Jobke
f6ef3b6464
add proper type hinting 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-14 14:49:24 +01:00
Christoph Wurst
ad757805ca Pass the exception context to the crash reporter 
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-11-14 14:28:04 +01:00
Morris Jobke
ab0a3fbbbc
Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath 
{J,CS}SResourceLocator: account for symlinks in app path
 2017-11-14 13:58:02 +01:00
Christoph Wurst
4c5593998a Add a mechanism to register crach reporters 
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-11-14 12:20:05 +01:00
Kyle Fazzari
d2a2793073
JSResourceLocator: re-use $app_path 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-12 08:08:38 -08:00
Nextcloud bot
8e3861563b
[tx-robot] updated from transifex 2017-11-12 01:10:00 +00:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-10 17:03:27 +01:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Georg Ehrke
f06fc67e8e
update autoloader to included added classes and interface 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-09 15:14:58 +01:00
Georg Ehrke
556b2a2b6f
implement CalendarManager 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-09 15:14:50 +01:00
Georg Ehrke
5d206eec69
Public interfaces for calendar API 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-09 13:00:26 +01:00
Morris Jobke
e6ad00b33d
Merge pull request #7117 from nextcloud/fix-welcome-string 
Fix welcome text for better grammar in themed instances
 2017-11-09 10:03:59 +01:00
Morris Jobke
5d8421135e
Merge pull request #7014 from nextcloud/rename-locks 
Unlock files even if an exception occurs while renaming
 2017-11-09 09:47:36 +01:00
Morris Jobke
eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1 
Rello patch 1
 2017-11-09 09:41:01 +01:00
Morris Jobke
a0aef6ab1b
Fix welcome text for better grammar in themed instances 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-09 09:27:38 +01:00
Nextcloud bot
aa525d89e8
[tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Lukas Reschke
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath 
Allow getting the filepath when getting cached mounts by fileid
 2017-11-09 00:04:25 +01:00
Morris Jobke
e0784c66ed
Merge pull request #7109 from nextcloud/fix_6898 
If for some reason the json can't be decoded it is not cached
 2017-11-08 23:33:02 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master 
Prevent XSS in links which open a new browser window
 2017-11-08 18:55:35 +01:00
Robin Appelman
c566b2854b
Use non empty files for object store touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:50:46 +01:00
Roeland Jago Douma
448fa4f59e
If for some reason the json can't be decoded it is not cached 
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-08 12:37:35 +01:00
Morris Jobke
732c951ae1
Revert "Only allow colons in db host for IPv6 addresses" 
This reverts commit 1287d6ddb3.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-08 10:47:35 +01:00
Kyle Fazzari
06ba1a8a02
JSResourceLocator: account for symlinks in app path 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-07 14:54:21 -08:00
Morris Jobke
0913bc2157
Merge pull request #6552 from nextcloud/notifications-add-highlight-definition 
Notifications: Add highlight type definition
 2017-11-07 20:34:05 +01:00
Morris Jobke
19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance 
Improve performance of UserMountCache with external storage folders
 2017-11-07 17:32:06 +01:00
Roeland Jago Douma
f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-11-07 16:18:40 +01:00
Morris Jobke
4866314ce0
Run updated license header updater 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-07 13:47:42 +01:00
Morris Jobke
f9e70c2ab6
Merge pull request #7020 from Fiech/master 
Extended list of sensitive configuration values (2)
 2017-11-07 10:27:53 +01:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke
31c5c2a592
Change @georgehrke's email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 20:38:59 +01:00
Morris Jobke
da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers 
Update license headers
 2017-11-06 18:48:04 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
5ed05219d7
Merge pull request #7076 from nextcloud/s3-valid-bucket-name 
Better error message for invalid bucket names
 2017-11-06 16:16:28 +01:00
Morris Jobke
5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure 
Implement plugins infrastructure in User_LDAP
 2017-11-06 16:07:31 +01:00
Morris Jobke
6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization 
Enhance calendar invitation emails
 2017-11-06 15:14:49 +01:00
Morris Jobke
8b763ea0f7
Better error message for invalid bucket names 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 09:48:41 +01:00
Morris Jobke
5445b1ff17
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 09:43:45 +01:00
Nextcloud bot
81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Kyle Fazzari
b0d296639c
CSSResourceLocator: account for symlinks in app path 
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.

Use realpath when retrieving app path, and these issues go away.

Fix #6028

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-03 23:52:09 -07:00
korelstar
c7482402b8 Unlock files even if an exception occurs 
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
 2017-11-03 18:29:04 +01:00
Vinicius Cubas Brand
fa565750d1 User_LDAP plugins: smaller fixes 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2017-11-03 11:42:59 -02:00
Vinicius Cubas Brand
10ca793452 Plugins infrastructure in User_LDAP 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2017-11-03 11:41:40 -02:00
Georg Ehrke
e111da777a
Make L10N->l provide weekdayName 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-03 11:20:04 +01:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Roeland Jago Douma
687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage 
Fix seeking on object storage
 2017-11-02 14:56:51 +01:00
Roeland Jago Douma
a4ba4544de
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-02 10:30:41 +01:00
Dariusz Olszewski
07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Arthur Schiwon
e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Joas Schilling
3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage 
Improve mimetype detection for object storages
 2017-11-01 11:04:15 +01:00
Joas Schilling
defc4bf6a8
Merge pull request #6975 from nextcloud/s3-read-object-fopen 
use fopen directly when reading objects from s3
 2017-11-01 10:57:56 +01:00
Nextcloud bot
cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Joas Schilling
6ddda3d7d4
Merge pull request #6952 from nextcloud/correctly-search-for-results 
Correctly search for existing collaboration results
 2017-10-31 14:49:01 +01:00
Joas Schilling
ba6e5bcc05
Add the return which is being used 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-31 14:06:21 +01:00
Rello
c5f76785ba
Mapping of m3u, m3u8, pls to audio streams 
Signed-Off-By: Rello <Rello@users.noreply.github.com>
 2017-10-31 14:05:24 +01:00
Joas Schilling
a0dab90fd5
Merge pull request #7021 from nextcloud/fix-oracle-indexes 
Fix oracle indexes
 2017-10-31 13:55:14 +01:00
Arthur Schiwon
bcfac75b06
simplify registration of manager in server container 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-31 13:55:03 +01:00
Nextcloud bot
299ef9aa78
[tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Johannes S
936486413d
Merge branch 'master' into master 2017-10-31 01:34:46 +01:00
Johannes Schlichenmaier
84cc13f57b Extended list of sensitive configuration values 
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-31 01:30:50 +01:00
Roeland Jago Douma
5672f14fd1
Merge pull request #7004 from Fiech/master 
Extended list of sensitive configuration values
 2017-10-30 20:01:42 +01:00
Joas Schilling
218e2357c8
Rebuild autoloader 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-30 18:59:52 +01:00
Victor Dubiniuk
9f16468789
Die NoCheckMigrator 2017-10-30 18:59:24 +01:00
Piotr Mrowczynski
6a51c1bc4f
Add foreign key support to OC 2017-10-30 18:57:19 +01:00
Jörn Friedrich Dreyer
d081a1a5ad
quote index columns on oracle, handle all index changes, minor phpdoc cleanup 2017-10-30 18:54:31 +01:00
Georg Ehrke
c8323f822d
Merge pull request #6867 from nextcloud/imessage-attachments 
Add attachment support to emails
 2017-10-30 18:33:50 +01:00
Roeland Jago Douma
73aef992c6
Merge pull request #6932 from nextcloud/constants-for-talk-useragents 
Define constants for the talk user agents
 2017-10-30 17:57:28 +01:00
Morris Jobke
d18a60de39
Merge pull request #6992 from nextcloud/2-lines-for-better-code 
Use ::class and fix missing doc
 2017-10-30 16:18:28 +01:00
Arthur Schiwon
d5f1cef642
fix comment sorter 
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-30 15:59:43 +01:00
Johannes Schlichenmaier
bde78decc2 Extended list of sensitive configuration values 
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-29 23:46:59 +01:00
Nextcloud bot
267991b154
[tx-robot] updated from transifex 2017-10-29 00:08:31 +00:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Morris Jobke
de912385e0
Fix seeking on object storage 
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-27 12:16:28 +02:00
Joas Schilling
7a4c0c668b Merge pull request #6977 from Fiech/master 
Added additional methods for removal of sensitive info
 2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier
4ae7275aeb Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-27 10:36:58 +02:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Morris Jobke
405bbc1c61
Improve mimetype detection for object storages 
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 16:31:59 +02:00
Arthur Schiwon
7f58c41015
fix sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-26 16:23:41 +02:00