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

8061 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
6602d3ac77 Merge pull request #12555 from owncloud/app_specific_search 
introduce inApps[] filter for search via ajax query
 2014-12-15 16:14:40 +01:00
Morris Jobke
9f30d3529a Implement method that reads vendor libs from core.json 
* includes them at the beginning of initTemplate()
 2014-12-15 14:30:03 +01:00
Morris Jobke
d367d1b06a Merge pull request #12839 from oparoz/ControllerMethodReflector 
\OCP\AppFramework\Utility\IControllerMethodReflector
 2014-12-15 14:20:26 +01:00
Bernhard Posselt
be45366013 Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands 
adding dependencies for command line tools and php libraries
 2014-12-15 12:34:46 +01:00
Thomas Müller
e58b9d3eb7 fixing owncloud version 2014-12-15 12:23:56 +01:00
Vincent Petry
c6be491a89 Return file info from Node API 2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6 Merge pull request #11991 from owncloud/bower-jquery-ui 
bower jquery-ui - exported changes to a separate css file
 2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16 [tx-robot] updated from transifex 2014-12-15 01:54:30 -05:00
Olivier Paroz
469fd3b3a3 Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector 2014-12-14 23:54:31 +01:00
Philipp Knechtges
768aea57d3 make regex in controllermethodreflector.php compatible with PCRE 6.x 
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
 2014-12-14 10:52:21 +01:00
Jenkins for ownCloud
6ae0217326 [tx-robot] updated from transifex 2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002 Merge pull request #12639 from owncloud/bad_mtime_format 
Fix formatting of bad dates from external storages
 2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706 bower jquery-ui - exported changes to a separate css file 2014-12-13 09:47:34 +01:00
Morris Jobke
efb495b09f Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index 
Add filter for backend to rest index
 2014-12-13 08:50:15 +01:00
Jenkins for ownCloud
416e21d902 [tx-robot] updated from transifex 2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3 Return ? if mtime is 0 or -1 
Tooltip contains 'Unable to determine date'. Fixes #6395
 2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e Merge pull request #12778 from owncloud/searchbytags2 
Added searchByTags to view, storage and cache
 2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233 Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager 
Add special parameterlist to manager
 2014-12-12 13:03:26 +01:00
Thomas Müller
dcb88e395b rework api of DependencyAnalyzer 2014-12-12 12:34:53 +01:00
Vincent Petry
b1bef5cc15 Merge pull request #12587 from owncloud/dav-logerrors 
Log exceptions in DAV storage
 2014-12-12 11:58:04 +01:00
Joas Schilling
7542883bf8 Merge pull request #12807 from owncloud/fix-timespan-language 
Correctly inject the language into the subcall
 2014-12-12 11:57:22 +01:00
Vincent Petry
3878c3782f Added searchByTag in cache jail wrapper 2014-12-12 11:48:42 +01:00
Vincent Petry
15ecb28d50 Make $userId mandatory for searchByTags 
$userId is now a mandatory parameter for searchByTags.

Also fixed some places in the code where the argument was missing (Node
API and View)
 2014-12-12 11:18:35 +01:00
Joas Schilling
811f9251d6 Correctly inject the language into the subcall 2014-12-12 11:00:07 +01:00
Jenkins for ownCloud
527dd8cdf4 [tx-robot] updated from transifex 2014-12-12 04:19:09 -05:00
Morris Jobke
e969fe6b12 Merge pull request #12698 from owncloud/handle_readonly_shared_files 
Handle readonly shared files
 2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd [tx-robot] updated from transifex 2014-12-12 01:55:24 -05:00
Morris Jobke
c56fa64801 Merge pull request #12786 from owncloud/userfolder-setup 
Ensure user mountpoints are setup when using getUserFolder
 2014-12-11 23:51:49 +01:00
Vincent Petry
25dde7e93b Added searchByTags to view, storage and cache 2014-12-11 17:38:50 +01:00
Thomas Müller
d94c1731d7 check app dependencies on installation as well 2014-12-11 17:02:07 +01:00
Thomas Müller
6566dc83e7 single dependencies will not be represented as an array + fix unit tests 2014-12-11 15:37:45 +01:00
Joas Schilling
1b18554aa7 Allow extensions to specify the list of special parameters 2014-12-11 14:56:46 +01:00
Robin Appelman
802c1b0b3a Ensure user mountpoints are setup when using getUserFolder 2014-12-11 14:34:30 +01:00
Morris Jobke
8fd90e04b6 Merge pull request #12781 from owncloud/jenkins-curl-open-basedir 
[Jenkins only] curl open basedir
 2014-12-11 14:15:24 +01:00
Joas Schilling
cbad5c998b Correctly fallback to english, if the plural case is not translated 2014-12-11 12:42:21 +01:00
Lukas Reschke
d0716d2c7d Use public interface 2014-12-11 12:29:58 +01:00
Vincent Petry
745d8706b9 Add user parameter to tag manager 2014-12-11 12:22:28 +01:00
Thomas Müller
5a03e0a5cf adding dependency to owncloud version - with fallback to requiremin and requiremax 2014-12-11 12:02:12 +01:00
Thomas Müller
ee46548f57 adding dependencies for supported platforms 2014-12-11 12:02:12 +01:00
Thomas Müller
770f987659 adding supported libraries - including min and max version 2014-12-11 12:02:11 +01:00
Thomas Müller
08f1db4451 adding dependencies for command line tools 2014-12-11 12:02:11 +01:00
Thomas Müller
c5e279e416 year go -> year ago 2014-12-11 11:30:00 +01:00
Jenkins for ownCloud
dc506dcfbf [tx-robot] updated from transifex 2014-12-11 01:55:27 -05:00
Lukas Reschke
9ea205dc3d Check if open_basedir is set 
The file:// protocol does not work with curl when an open_basedir is set.

This fixes https://github.com/owncloud/core/issues/12016
 2014-12-11 00:09:55 +01:00
Lukas Reschke
d84a1f6f3a Add IniGetWrapper to public interface 2014-12-11 00:09:55 +01:00
Morris Jobke
e2c51308df Merge pull request #12758 from owncloud/fix-config-doc-block 
Add type of the variables to the docs
 2014-12-10 17:22:36 +01:00
Thomas Müller
80ae311329 Merge pull request #11892 from owncloud/remove_triggerupdate 
Remove triggerupdate.php & add quiet option for CLI scanner
 2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c introduce inApps[] filter for search via ajax query, make file results show up in files app only 
use more flexible return type

check array with !empty instead of count
 2014-12-10 15:51:59 +01:00
Joas Schilling
bef7392c4c Add type of the variables to the docs 2014-12-10 15:18:06 +01:00
Robin Appelman
3898fbc0d2 Merge pull request #12750 from owncloud/cache-numericstorageidfix 
Fix numeric storage id for cache wrapper
 2014-12-10 15:03:41 +01:00
Joas Schilling
fd2599cfc2 Merge pull request #12485 from owncloud/jenkins-12383 
New DateTimeFormatter class for dates in other timezones and languages
 2014-12-10 14:48:59 +01:00
Vincent Petry
ebba54d490 Fix numeric storage id for cache wrapper 2014-12-10 13:05:31 +01:00
Jörn Friedrich Dreyer
363e9667ec Add Redis cache implementation, prefer over memcached, tests & config sample 2014-12-10 12:24:20 +01:00
Lukas Reschke
5dc6406b70 Add filter for 'backend' to user REST route 
This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620

For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well)

Depends upon https://github.com/owncloud/core/pull/12711
 2014-12-10 12:07:34 +01:00
Joas Schilling
67335ccddf Require the interface and return a string instead of private classes 2014-12-10 11:58:56 +01:00
Joas Schilling
4d232e536e Deprecate Util::formatDate() 
Make DateTimeFormatter a service and adjust tests that have been inaccurate
 2014-12-10 11:58:56 +01:00
Lukas Reschke
5398bbdc00 Merge pull request #12711 from owncloud/add-backend-to-rest-index 
Expose backend type via REST API
 2014-12-10 11:56:45 +01:00
Jörn Friedrich Dreyer
0f17486c1d make path absolute 2014-12-10 11:04:17 +01:00
Jenkins for ownCloud
ea95bb0189 [tx-robot] updated from transifex 2014-12-10 01:55:34 -05:00
Thomas Müller
7028c7150d Merge pull request #12664 from owncloud/fix-12164 
Use httphelper and cache response even when it is empty
 2014-12-10 05:42:08 +01:00
Victor Dubiniuk
c9fd3c9d29 Inject config 2014-12-10 01:13:38 +03:00
Morris Jobke
263e008d7b Merge pull request #12695 from owncloud/db-drop-table 
Add dropTable to IDBConnection
 2014-12-09 18:40:56 +01:00
Robin Appelman
6984fa8a19 Quote identifiers for oracle 2014-12-09 17:26:53 +01:00
Robin Appelman
778d8dbafd Add tableExists to public db api 2014-12-09 17:26:53 +01:00
Robin Appelman
8af3991d0c Add dropTable to IDBConnection 2014-12-09 17:26:53 +01:00
Joas Schilling
d69ea30097 Add a DateTimeFormatter class which allows overwriting the language and timezone 
Fix #12227
 2014-12-09 16:10:24 +01:00
Joas Schilling
f53f25eafe Merge pull request #12409 from owncloud/tags-getTagsForObjectIds 
Add getTagsForObjects in ITags
 2014-12-09 13:27:38 +01:00
Joas Schilling
26861a98c5 Merge pull request #12568 from owncloud/autoload-encryption-classes 
Fix namespaces of encryption classes and encryption tests
 2014-12-09 12:56:57 +01:00
Lukas Reschke
4c13918bd8 Expose backend type via REST API 
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620.

For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
 2014-12-09 12:04:19 +01:00
Thomas Müller
5609d421cd Merge pull request #12672 from LEDfan/cm-per-unit 
Fix Contactsmanager permission + unit test
 2014-12-09 10:57:22 +01:00
Joas Schilling
78a307995c Fix namespace of Files_Encryption outside of the app 2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd Merge pull request #12406 from owncloud/drop-getApps-getUsers 
Config cleanup - OC_Preferences refactoring
 2014-12-09 09:36:38 +01:00
Lukas Reschke
25a87d4058 Merge pull request #12577 from owncloud/public-mount-api 
Add a public api for apps to add mounts
 2014-12-08 22:57:33 +01:00
Morris Jobke
9a7362dd0d drop unused isDebugMode and setDebugMode of OC_Config 2014-12-08 22:42:44 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Morris Jobke
2d5fc9c1a6 Workaround to fix the too early init dilemma 
* this needs to be properly fixed by a proper organisation of the base.php
* introduced fixDIInit() in AllConfig that moves the injection
  of DatabaseConnection to a later point in time
* problems mostly because of the autoconfig setup
 2014-12-08 22:33:36 +01:00
Morris Jobke
af91ee97c9 introduce preCondition for setUserValue to provide atomic check-and-update 2014-12-08 22:33:36 +01:00
Morris Jobke
f0b10324ca Refactoring of OC_Preferences to AllConfig 
* keep old static methods - mapped to new ones and deprecated
* removed deleteApp, getUsers, getApps because they are unused
* make AllConfig unit tests more robust against not cleaned up environments
 2014-12-08 22:33:29 +01:00
Morris Jobke
f164161f69 fix base.php for not installed systems 2014-12-08 22:29:43 +01:00
Morris Jobke
a9e411e076 migrate \OC\AllConfig to \OCP\IConfig 2014-12-08 22:29:43 +01:00
Morris Jobke
719008836d introduce deleteAllUserValues 2014-12-08 22:29:42 +01:00
Morris Jobke
985b15f770 introduce proper interface for deleteAppValue 2014-12-08 22:29:42 +01:00
Morris Jobke
b01c59b224 use old methods and redirect in deprecated methods 2014-12-08 22:29:42 +01:00
Morris Jobke
d6da627eb4 @deprecated messages for \OCP\Config and \OCP\AppConfig 2014-12-08 22:29:42 +01:00
Morris Jobke
50c2a819a0 Extract interaction with config.php into SystemConfig 
* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container
 2014-12-08 22:29:42 +01:00
Vincent Petry
cae600722e Add getTagsForObjects in ITags 
Returns the list of tags that are set on the given object ids.
 2014-12-08 22:02:00 +01:00
Lukas Reschke
f219f5a7a6 Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework 
Add REST route for managing groups and users
 2014-12-08 21:37:41 +01:00
Victor Dubiniuk
81d5712419 Fix tests. Add two more test cases 2014-12-08 22:16:47 +03:00
Jörn Friedrich Dreyer
85176ec072 return correct result 2014-12-08 15:25:21 +01:00
Morris Jobke
1362c0b67a Merge pull request #12452 from owncloud/server2server-ng-ocs 
OCS API for server-to-server sharing
 2014-12-08 14:12:03 +01:00
Lukas Reschke
fe7d9a7ca0 Add REST route for user & group management 
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
 2014-12-08 12:11:01 +01:00
Jenkins for ownCloud
2784d580bd [tx-robot] updated from transifex 2014-12-08 01:54:57 -05:00
Olivier Paroz
7917d3b068 Remove changes which were inadvertently pushed to master 2014-12-08 04:03:02 +01:00
Olivier Paroz
d9c0be8785 Dump Arrays, Objects and Exceptions to the log 
This is a first draft. It has only been tested with the ownlcloud logger.
Some internal fields are JSON encoded several times which makes it harder to read.

Most of the normalizer is borrowed from Monolog
https://github.com/Seldaek/monolog/blob/master/src/Monolog/Formatter/NormalizerFormatter.php
 2014-12-08 03:53:07 +01:00
Lukas Reschke
e4255e9d54 Merge pull request #12644 from owncloud/add-hack-for-config 
Create config if it does not exists
 2014-12-07 22:33:16 +01:00
Jenkins for ownCloud
8ee9ee29ea [tx-robot] updated from transifex 2014-12-07 01:54:32 -05:00
Victor Dubiniuk
303fce44f4 Use httphelper and cache response even when it empty 2014-12-06 20:17:47 +03:00
Lukas Reschke
bd520d2e53 Create config if it does not exists 
The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.

When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.

To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)

Fixes itself.
 2014-12-06 14:00:14 +01:00
LEDfan
b412e59c26 Fix permissions 2014-12-06 13:58:10 +01:00
Jenkins for ownCloud
94eb2e782f [tx-robot] updated from transifex 2014-12-06 01:54:56 -05:00
Lukas Reschke
ddcf2b84ec Remove checks for safe mode and magic quotes 
Both are removed from 5.4.0

Safe Mode: http://php.net/manual/en/features.safe-mode.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.

Magic Quotes: http://php.net/manual/en/security.magicquotes.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
 2014-12-05 19:14:47 +01:00
Morris Jobke
5f66cb3250 Merge pull request #12561 from oparoz/vectoricon 
Improve the bitmap and vector mime icons
 2014-12-05 14:51:03 +01:00
Morris Jobke
4ec1da3014 Merge pull request #12583 from owncloud/trim-port 
Trim port from domain
 2014-12-05 11:27:20 +01:00
Jenkins for ownCloud
4d53f163fd [tx-robot] updated from transifex 2014-12-05 01:55:52 -05:00
Morris Jobke
b6975143ff Merge pull request #12619 from owncloud/use-also-original-hea 
Merge headers
 2014-12-04 16:59:42 +01:00
Robin Appelman
f4701d7721 Add public api for mount configurations 2014-12-04 16:47:27 +01:00
Morris Jobke
f3213571bb Merge pull request #12616 from owncloud/node-fileinfo 
make \OC\Files\Node\Node implement the FileInfo interface
 2014-12-04 16:34:30 +01:00
Clark Tomlinson
b8a2fdaa21 Merge pull request #12607 from owncloud/this-is-an-awesome-day 
PHP 5.4 is now required for master
 2014-12-04 10:33:04 -05:00
Lukas Reschke
db9765b4d5 Merge headers 
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
 2014-12-04 14:45:15 +01:00
Thomas Müller
e9f0b30023 Merge pull request #12609 from owncloud/remove-53-fixme 
Remove workaround for 5.3
 2014-12-04 14:25:47 +01:00
Jörn Friedrich Dreyer
7ef6df04da remove triggerupdate, ref #11872 2014-12-04 13:44:30 +01:00
Robin Appelman
672495a1a3 make \OC\Files\Node\Node implement the FileInfo interface 2014-12-04 13:27:08 +01:00
Bjoern Schiessle
698ecbf308 OCS API for server-to-server sharing 2014-12-04 13:18:13 +01:00
Thomas Müller
b55ac514ac no nested xml tags on dependencies 2014-12-04 11:40:33 +01:00
Thomas Müller
eb81c52b95 fix an issue where the types tag holds an empty string 2014-12-04 11:40:33 +01:00
Thomas Müller
b028a6afac adjust dependency analyzer to use attributes properly 2014-12-04 11:40:33 +01:00
Thomas Müller
c80ec91f28 switch to different parsing implementation to get xml attributes properly handled 2014-12-04 11:40:33 +01:00
Thomas Müller
ba52c996cf adding supported databases 2014-12-04 11:40:33 +01:00
Thomas Müller
b469e9f6fb introduce dependency analyzer to take care of app dependencies 
some more unit tests on xml info parser
 2014-12-04 11:40:33 +01:00
Thomas Müller
40e03ba314 adding default key value pair for 'types' 2014-12-04 11:40:33 +01:00
Thomas Müller
1354cee18e translate labels properly 2014-12-04 11:40:33 +01:00
Lukas Reschke
ee1f8b0242 Remove workaround for 5.3 
Function is natively available with 5.4
 2014-12-04 11:17:33 +01:00
Lukas Reschke
1b0bc2e099 PHP 5.4 is now required for master 
🍻
 2014-12-04 10:46:38 +01:00
Vincent Petry
bc12d28f23 Log exceptions in DAV storage 
In some cases a "NotFound" might be expected, so just return false as
before. But for other exceptions, the exception is now logged.
 2014-12-03 22:20:00 +01:00
Lukas Reschke
b3515a98e9 Add workaround for older instances 
To be removed with oCAdd workaround for older instances

To be removed with oC99
 2014-12-03 21:13:27 +01:00
Lukas Reschke
69f5f6649e Trim port from domain 
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)

To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
 2014-12-03 19:59:50 +01:00
Lukas Reschke
8700ffe698 Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood 
Stop flooding the log, when previews are disabled
 2014-12-03 14:51:03 +01:00
Thomas Müller
7291b915b8 Merge pull request #12553 from owncloud/default-iosid 
add missing public interface for iOS client app id
 2014-12-03 14:05:27 +01:00
Joas Schilling
69a5a0c1a0 Stop flooding the log, when previews are disabled 2014-12-03 12:52:42 +01:00
Robin Appelman
2bbb11fb63 Merge pull request #10881 from owncloud/touch-statcache 
Clear statcache before getting the mtime from local storage backends
 2014-12-02 23:29:24 +01:00
Olivier Paroz
5990293331 Improve the bitmap and vector mime icons 
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
 2014-12-02 21:11:56 +01:00
Robin Appelman
1bbb18fe87 also clear statcache in mapped local 2014-12-02 16:39:03 +01:00
Morris Jobke
a16d1a85ef Merge pull request #11975 from owncloud/Combustible-combustible_dev 
Check imagecreate*() return before using and use logger in \OC_Image
 2014-12-02 16:18:00 +01:00
Morris Jobke
5b3dbb4ef8 add missing public interface for iOS client app id 2014-12-02 16:10:07 +01:00
Robin Appelman
db3f7238dd Clear statcache before getting the mtime from local storage backends 2014-12-02 14:25:49 +01:00
Thomas Müller
e9029f94cb Merge pull request #12310 from kampka/master 
Implement a logger to log to error_log
 2014-12-02 09:19:12 +01:00
Christian Kampka
553ce946d3 Implement a logger to log to error_log 2014-12-01 21:20:57 +01:00
Thomas Müller
0769556989 Merge pull request #12419 from owncloud/read-only-config 
Allow read-only configuration
 2014-12-01 16:37:29 +01:00
Thomas Müller
b2175f0e25 Use \OCP\ILogger 2014-12-01 16:21:54 +01:00
Byron Marohn
fa9b36b726 Added error check to lib/private/image.php 
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
 2014-12-01 16:20:17 +01:00
Vincent Petry
8db4dd7585 Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped 
Issue/12460 port local changes2mapped
 2014-12-01 10:42:39 +01:00
Lukas Reschke
ffd1fc42e7 Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions 
Depcrate namespaced functions, since they can not be autoloaded
 2014-12-01 09:38:15 +01:00
Morris Jobke
6fa748621f Merge pull request #12398 from oparoz/patch-5 
You can only change the oritentation of a JPEG
 2014-11-30 10:32:51 +01:00
Jenkins for ownCloud
83d097c524 [tx-robot] updated from transifex 2014-11-29 01:54:28 -05:00
Lukas Reschke
ebb243344a Merge pull request #12499 from owncloud/disableMSSQL 
Disable MSSQL and OCI for new CE installations
 2014-11-28 18:38:34 +01:00
Lukas Reschke
f0e6876f2e Merge pull request #12488 from owncloud/activity_group_multiple_conditions 
activitymanager: concatenate queries with 'or'
 2014-11-28 17:35:05 +01:00
Lukas Reschke
9a8dc4a832 Disable OCI as it is unsupported by most CE apps 2014-11-28 16:23:03 +01:00
Lukas Reschke
f3e75c085c Disable MSSQL for new CE installations 
Since automatic schema migrations are not yet possible let's disable this for now.
 2014-11-28 16:08:38 +01:00
Bjoern Schiessle
bf2c9be066 concatenate queries with 'or' 2014-11-28 14:46:27 +01:00
Lukas Reschke
2c157da1c2 Merge pull request #12486 from owncloud/activity_priorities 
add activity priorities to core so that other apps can reuse it
 2014-11-28 14:40:27 +01:00