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

3089 commits

Author SHA1 Message Date
Thomas Müller
c69cd28a73 Merge pull request #14968 from owncloud/files-reallowsinglequote 
Reallow single quote in file names
 2015-03-17 23:50:16 +01:00
Thomas Müller
a4d2c7810e Merge pull request #14975 from owncloud/add-smtp-debug-mode 
Add debug mode back to mailer
 2015-03-17 23:49:19 +01:00
Lukas Reschke
f13216d275 Use FILTER_UNSAFE_RAW instead of FILTER_SANITIZE_STRING 
`FILTER_SANITIZE_STRING` will still encode everything else.
 2015-03-17 21:56:16 +01:00
Bernhard Posselt
087117d87d Merge pull request #14961 from owncloud/onlyrequireinfo 
Only hard depend on the info.xml and not the app.php
 2015-03-17 21:27:51 +01:00
Robin McCorkell
760f5fc5e5 Merge pull request #14954 from owncloud/cache-image-path 
Cache \OC\URLGenerator::imagePath
 2015-03-17 19:36:23 +00:00
Lukas Reschke
aea4b3166b Add debug mode back to mailer 
This re-adds the debug mode for the mailer which will log the whole SMTP traffic within the log file if enabled.
 2015-03-17 19:41:13 +01:00
Bernhard Posselt
57ceed590a only hard depend on the info.xml and not the app.php 
fix comment
 2015-03-17 15:43:48 +01:00
Thomas Müller
6d5f52484e Merge pull request #14948 from owncloud/prefix-memcache 
Add version and path to cache prefix
 2015-03-17 13:39:22 +01:00
Lukas Reschke
1f4aa5350a Reuse cache result 2015-03-17 13:15:52 +01:00
Lukas Reschke
4f9b76d821 Read theme only if required 2015-03-17 12:47:46 +01:00
Lukas Reschke
c233f2c90b Add version and path to cache prefix 
Prevents to have the cache reused by other instances on the server which have possible the same instance ID and also invalidates older cache entries after an upgrade which can cause unwanted side-effects.

Impact for deployment: The same cache will only get used if ownCloud is installed with the same version and under the same path. But this should be a basic requirement anyways.
 2015-03-17 12:39:49 +01:00
Lukas Reschke
9e2ebf2dce Cache \OC\URLGenerator::imagePath 
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
 2015-03-17 12:35:47 +01:00
Joas Schilling
9c45ab49a1 Use a closure for the files app entry and deprecate old methods 2015-03-17 12:17:09 +01:00
Thomas Müller
98a42dbccc Merge pull request #14927 from oparoz/raw-mimetypes 
Introducing the Raw media types
 2015-03-17 11:32:09 +01:00
Lukas Reschke
e4c6b0abf5 Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries 
Issue/14881 closures for navigation entries
 2015-03-17 11:28:27 +01:00
Lukas Reschke
b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer 
Migrate OC_Mail to SwiftMailer
 2015-03-17 11:15:39 +01:00
Vincent Petry
7bc09f8f06 Fix setup config 2015-03-16 17:57:34 +01:00
Vincent Petry
6f687fa6ae Merge pull request #14923 from owncloud/fix-preference-key-definition 
Fix user preference key definition for insertIfNotExists()
 2015-03-16 17:14:09 +01:00
Thomas Müller
54e1edbf03 Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation 
Write the parameter 'logtimezone' into config.php during setup
 2015-03-16 17:04:06 +01:00
Olivier Paroz
bef12488c3 Introducing the Raw mimetypes 2015-03-16 16:25:04 +01:00
Joas Schilling
970846624f Allow registering closures for navigation entries 
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
 2015-03-16 16:17:43 +01:00
Joas Schilling
c2a5bd6a01 Also add a note that clob does not work in the compare array 2015-03-16 15:41:00 +01:00
Joas Schilling
06b2446269 The key is over configkey, user and app, not the value 
stupid me :(
 2015-03-16 15:37:12 +01:00
Lukas Reschke
d7c7808a5e Add debug log message back 2015-03-16 13:01:17 +01:00
Lukas Reschke
e32f1582c7 Show more detailed error message 2015-03-16 12:47:06 +01:00
Lukas Reschke
f92f3a1a6e Incorporate review changes 2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada Migrate to SwiftMail 
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
 2015-03-16 12:47:05 +01:00
Thomas Müller
1075914f8a Merge pull request #14883 from owncloud/imagepng_expects_resource_issue 
validate resource's integrity before using it
 2015-03-16 12:22:27 +01:00
Georg Ehrke
09b05373ed validate resource's integrity before using it 2015-03-16 10:57:01 +01:00
Morris Jobke
997a7a2668 Merge pull request #14766 from owncloud/fix-insertifnotexists-poc 
Allow specifying the compare-array for insertIfNotExists()
 2015-03-16 10:31:36 +01:00
Thomas Müller
bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command 
Expire files from the trash in the background
 2015-03-16 10:04:05 +01:00
Thomas Müller
6927773648 Merge pull request #14776 from owncloud/fix-14629-master 
verify the file name length not to exceed 255 characters + verify path d...
 2015-03-16 09:58:41 +01:00
Thomas Müller
b159c7f274 Merge pull request #14848 from owncloud/kill-curl-fallback-master 
drop any fallback code related to curl
 2015-03-16 09:56:31 +01:00
Thomas Müller
918b86a5bc Merge pull request #14871 from owncloud/use-proper-error-type 
Use proper error type and clean-up code
 2015-03-13 23:30:49 +01:00
Lukas Reschke
e77d2ff2b4 Remove outdated comment 2015-03-13 16:19:52 +01:00
Lukas Reschke
bf9030e874 Drop example user backend 
We already provide an interface for application developers, this file is outdated and thus should get removed.

Addresses No. 3 from https://github.com/owncloud/core/issues/14847
 2015-03-13 16:12:32 +01:00
Morris Jobke
0d9f149dd9 Merge pull request #14867 from owncloud/drop-OC_User_HTTP 
Remove OC_User_HTTP
 2015-03-13 15:53:22 +01:00
Lukas Reschke
38fec9b095 Can also be null 
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
 2015-03-13 14:01:24 +01:00
Lukas Reschke
4eb118dd33 Use proper error type and clean-up code 2015-03-13 13:21:09 +01:00
Lukas Reschke
93a303970f Remove OC_User_HTTP 
Addresses No. 1 from https://github.com/owncloud/core/issues/14847
 2015-03-13 12:26:33 +01:00
Thomas Müller
5855108e9b drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447 2015-03-12 21:43:41 +01:00
Lukas Reschke
00f5025ff1 Add cURL as hard-dependency 
It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it.
 2015-03-12 18:39:54 +01:00
Thomas Müller
80ef53eff0 verify the file name length not to exceed 255 characters + verify path during rename 2015-03-12 10:47:47 +01:00
Joas Schilling
fefcbb966b Also use all keys for an empty array, just in case 2015-03-12 09:18:43 +01:00
Morris Jobke
dbd2bb66e9 Merge pull request #14357 from owncloud/fix/1373 
Run `updateDataDirectory` after Update
 2015-03-11 18:33:51 +01:00
Lukas Reschke
f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller 
Move AvatarController to AppFramework
 2015-03-11 17:15:42 +01:00
Morris Jobke
82254ad5ef Merge pull request #13893 from owncloud/create-cachedir-on-user 
Only make sure the cache directory exists when we use it
 2015-03-11 16:49:24 +01:00
Roeland Jago Douma
1a0f9c375b Avatar controller moved to AppFrameWork 
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
 2015-03-11 16:37:42 +01:00
Lukas Reschke
73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master 
Setting oci as supported database
 2015-03-11 16:14:54 +01:00
Morris Jobke
04eef93b25 Merge pull request #13648 from oparoz/sfnt-fonts-preview 
Add support for font previews
 2015-03-11 15:56:32 +01:00