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

3849 commits

Author SHA1 Message Date
Morris Jobke
a1232f46ca
Remove unused methods and constants from legacy OC_API 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:03:25 +01:00
Morris Jobke
2b335fd607
Use insertIfNotExist of the new interface 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 17:45:49 +01:00
Morris Jobke
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper 
Remove unused and deprecated class and interface AppHelper
 2018-03-12 16:33:46 +01:00
Morris Jobke
f5c5c5181f
Remove unused and deprecated class and interface AppHelper 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:27:10 +01:00
Morris Jobke
44289ff134
Use proper method to format absolute timestamp 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 15:16:52 +01:00
blizzz
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination 
Tests for email collaborators pagination
 2018-03-09 11:21:21 +01:00
Roeland Jago Douma
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing 
Remove base url from global cache prefix
 2018-03-08 21:12:54 +01:00
John Molakvoæ (skjnldsv)
720e64ba55
Fixed caldav tests and metadata 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-08 17:13:50 +01:00
John Molakvoæ (skjnldsv)
d80f13ef99
Fix Metadata tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-08 17:13:50 +01:00
Joas Schilling
882096653e
Fix calculation if there are more results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 16:22:16 +01:00
Joas Schilling
3d7ae4aa97
Add tests for finding own email and user results pagination 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 13:26:26 +01:00
Morris Jobke
a2db959f5c
Merge pull request #8593 from eneiluj/master 
Allow public page access to apps with group restrictions
 2018-03-08 11:27:52 +01:00
Roeland Jago Douma
3ad7daeda5
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-08 11:05:18 +01:00
Julius Härtl
95366bbd1f
Fix tests to use ICacheFactory 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Morris Jobke
8d865483f4
Merge pull request #8714 from nextcloud/8705 
Check if the cached js file exists
 2018-03-07 14:45:43 +01:00
Roeland Jago Douma
448a5e574e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-07 14:04:21 +01:00
Morris Jobke
de56915605
Merge pull request #7419 from Abijeet/feature-7175 
Fixes #7175 - Allow to search for email address in user management
 2018-03-06 21:53:37 +01:00
Roeland Jago Douma
d179186430
Remove testcase 
Since a token now always requires a string we don't need to test for
null

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 16:14:46 +01:00
Roeland Jago Douma
0c500e460f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Joas Schilling
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening 
AppData hardening
 2018-03-02 11:26:36 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Roeland Jago Douma
8b5997483c
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 13:35:09 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template 
Public page template response
 2018-02-27 13:33:19 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
5a4aa2b7dd
Add test for PublicTemplateResponse 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Roeland Jago Douma
6994bce951
Loglevel is an int 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:45:35 +01:00
Roeland Jago Douma
4077f16aec
Make ILogger strict 
* Make implementations strict
* Add scalar typehints

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:41:46 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page 
Provide translated error message for permission error
 2018-02-26 17:50:21 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:00:29 +01:00
Roeland Jago Douma
0ee45d3d20
Fix proper types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck 
Make OC\IntegrityCheck strict
 2018-02-22 10:01:50 +01:00
Roeland Jago Douma
72e745be26
Handle strict typing in Checker and fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 21:09:08 +01:00
Roeland Jago Douma
ca9f364fd4
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:52 +01:00
blizzz
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size 
Better result handling of email search
 2018-02-20 23:02:53 +01:00
Joas Schilling
b30e035e25
Better result handling of email search 
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-20 17:38:32 +01:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 
Add strict types to OC_App
 2018-02-17 21:34:20 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:13 +01:00
Joas Schilling
211212f4b3
App manager is not needed anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 17:13:36 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:23:51 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities 
Expose navigation entries as API endpoint
 2018-02-15 16:55:12 +01:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6 
update guzzlehttp/guzzle to 6.3.0
 2018-02-14 22:26:19 +01:00
Julius Härtl
f9dbaf6f2a
Make sure we test the proper order in the NavigationManagerTest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Robin Appelman
9b25ff9fcb
adjust httpclient to guzzle6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:21 +01:00
Robin Appelman
df6e23c98c
add ci for swift primary storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:25 +01:00
Morris Jobke
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader 
Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:30:02 +01:00
Roeland Jago Douma
047fb6d2c5
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-03 22:16:09 +01:00
Julius Härtl
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
5460166ff5
Add tests and class mapping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
372e06d742
Add all parameters to returnValueMap 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-31 14:15:12 +01:00
Roeland Jago Douma
1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore 
Do not cache the settings/sections in the database anymore
 2018-01-31 12:49:45 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Joas Schilling
d971b104ed
Do not cache the settings/sections in the database anymore 
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-29 15:47:37 +01:00
Roeland Jago Douma
7405dfb544
Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 14:37:18 +01:00
Julius Härtl
5ec7296f6d
Add tests for URL rewriting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:56:13 +01:00
Morris Jobke
b9bbb894f8
Merge pull request #7916 from nextcloud/2fa_log 
Add 2FA to logfile
 2018-01-25 15:57:32 +01:00
Roeland Jago Douma
8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6 
Require PHPUnit 6.5 or higher
 2018-01-25 14:50:46 +01:00
Roeland Jago Douma
c92eff919e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Joas Schilling
3917a54113
Class "ProgressBar" is declared "final" and cannot be mocked. 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:26 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Joas Schilling
c3424df1f0
Require PHPUnit 6.5 or higher 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 17:23:59 +01:00
Robin Appelman
3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-24 17:22:05 +01:00
Morris Jobke
1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin 
Dont polute the log on DAV emaillogin
 2018-01-24 14:00:01 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Roeland Jago Douma
ef127a30ec
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 10:35:37 +01:00
Morris Jobke
d9b1492e03
Remove old repair steps that aren't executed anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:51:02 +01:00
Morris Jobke
c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-19 14:00:27 +01:00
Julius Härtl
f0b7b2dedf
Merge pull request #7911 from nextcloud/improve-oc_image 
Improve OC_Image code to not guess the type of input
 2018-01-18 14:39:08 +01:00
Morris Jobke
3d4c698f44
Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called 
Followup to #7836

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 13:40:55 +01:00
Roeland Jago Douma
1e7b20f615
Remove IAppConfig::setValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:57 +01:00
Roeland Jago Douma
09f8a755ec
Remove IAppConfig::getValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:56 +01:00
Roeland Jago Douma
6e29b8731e
Merge pull request #7914 from nextcloud/fix-7254 
format self-mentions, but don't offer them
 2018-01-17 14:59:46 +01:00
Arthur Schiwon
6fdd686111
do not offer the handle of the current user for auto completion 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:49:18 +01:00
Arthur Schiwon
3784fa2074
comments should compile mentions also if done by author 
it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:48:43 +01:00
Morris Jobke
24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints 
Fix the type hints of migrations and correctly inject the wrapped sch…
 2018-01-17 13:47:58 +01:00
Roeland Jago Douma
f8756d96bc
Merge pull request #7847 from nextcloud/avatarmanager_strict 
Fixes for avatarmanager
 2018-01-17 13:46:18 +01:00
Joas Schilling
4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-17 11:37:36 +01:00
Morris Jobke
4ef302c0be
Request->getHeader() should always return a string 
PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant.

Found while enabling the strict_typing for lib/private for the PHP7+ migration.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-17 09:51:31 +01:00
Morris Jobke
cb0dbfa987
Merge pull request #7900 from nextcloud/strict_security 
Make OCP\Security stricter
 2018-01-17 09:29:32 +01:00
Roeland Jago Douma
d1420ef481
Merge pull request #7901 from nextcloud/strict_cache_factory 
Made the cache factory strict
 2018-01-17 06:51:04 +01:00
Morris Jobke
0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user 
Cleanup OC_User and OCP\User
 2018-01-17 05:33:07 +01:00
Roeland Jago Douma
0e0db37658
Make OCP\Security stricter 
* Add typehints
* Add return types
* Opcode opts from phpstorm
* Made strict
* Fixed tests: No need to test bogus values anymore strict typing fixes
this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 22:01:19 +01:00
Roeland Jago Douma
c5fcfb0709
Made the cache factory strict 
* Return types
* Typehints
* made strict
* fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 21:58:20 +01:00
Morris Jobke
55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Robin Appelman
326d55db81
Support arbitrary number of arguments for d:or and d:and in search queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-16 13:22:28 +01:00
Joas Schilling
7bc9a69c3f
Remove deprecated core API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-15 17:54:50 +01:00
Roeland Jago Douma
419de27b6d
Merge pull request #7840 from nextcloud/dep_config 
Remove deprecated \OCP\Config
 2018-01-14 22:21:37 +01:00
Roeland Jago Douma
48ea7251d7
Use \OC\User\Manager internally in the avatarmanager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:32:54 +01:00
Roeland Jago Douma
cf0a339997
Make OC\Security\RateLimiting strict 
* Add return types
* Add scalar argument types
* Made strict
* Cleaned up phpstorm inspections

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 21:08:23 +01:00
Roeland Jago Douma
8a41d05761
Remove deprecated \OCP\Config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-13 14:25:04 +01:00
Robin Appelman
42b3aa3a0a
reuse query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-12 13:57:55 +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
Arthur Schiwon
e9eccf34f9
removes invalid tests, adapts another one 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-03 21:44:30 +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
Arthur Schiwon
2fde21e318
extend tests for status quo 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-03 13:24:56 +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
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)
b71c9205ef
Correctly remove temp test directory tree 
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)
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
Robin Appelman
aad01894e3
refactor user searching 
add additional user searching tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-20 15:51:37 +01:00
Julius Härtl
0ff3c81fc1
Fix failing AvatarTest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-12-19 18:49:27 +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
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
Roeland Jago Douma
094d41937a
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 21:06:52 +01:00
Abijeet
ec28c54dbc Adds search by email function on the users screen. 
Fixes #7175.

- Updated the query to fetch the users in users > everyone tab.
- Updated the query to fetch the users in users > admin tab.
- Tested to ensure that the disabled users are also being fetched.
- Added test cases.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2017-12-16 17:18:05 +05:30
Tobia De Koninck
e8a4f83000 Fix and tests for MailPlugin 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-12-16 08:46:03 +01:00
John Molakvoæ (skjnldsv)
b8778b0d85
Test fixes 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 11:32:53 +01:00
John Molakvoæ (skjnldsv)
158f442f4f
Test fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 11:28:59 +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
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
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
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
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
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar 
Always generate avatar
 2017-12-08 23:58:17 +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
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
Roeland Jago Douma
8e8fe6b8eb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Joas Schilling
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:17:34 +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
Lukas Reschke
9ac878b6cb
Adjust tests for added lastCheck time 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:25:03 +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
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +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
Roeland Jago Douma
6bbda28881
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-17 20:41:58 +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
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
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
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
Georg Ehrke
556b2a2b6f
implement CalendarManager 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-09 15:14:50 +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
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
Kyle Fazzari
9c24b7be2d
tests: change helper scope 
This seems to be the only way to have the same helpers used between
tests in a manner that works for both standalone phpunit and
autotest.sh.

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-08 12:44:54 -08: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
6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization 
Enhance calendar invitation emails
 2017-11-06 15:14:49 +01: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
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