Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14954 from owncloud/cache-image-path | Robin McCorkell | 2015-03-17 | 2 | -18/+38 |
|\ | | | | | Cache \OC\URLGenerator::imagePath | ||||
| * | Reuse cache result | Lukas Reschke | 2015-03-17 | 1 | -2/+2 |
| | | |||||
| * | Read theme only if required | Lukas Reschke | 2015-03-17 | 1 | -3/+3 |
| | | |||||
| * | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 2 | -18/+38 |
| | | | | | | | | \OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching. | ||||
* | | Merge pull request #14948 from owncloud/prefix-memcache | Thomas Müller | 2015-03-17 | 2 | -1/+9 |
|\ \ | | | | | | | Add version and path to cache prefix | ||||
| * | | Add version and path to cache prefix | Lukas Reschke | 2015-03-17 | 2 | -1/+9 |
| |/ | | | | | | | | | | | 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. | ||||
* / | Use a closure for the files app entry and deprecate old methods | Joas Schilling | 2015-03-17 | 2 | -28/+16 |
|/ | |||||
* | Merge pull request #14927 from oparoz/raw-mimetypes | Thomas Müller | 2015-03-17 | 3 | -1/+47 |
|\ | | | | | Introducing the Raw media types | ||||
| * | Introducing the Raw mimetypes | Olivier Paroz | 2015-03-16 | 3 | -1/+47 |
| | | |||||
* | | Merge pull request #14931 from ↵ | Lukas Reschke | 2015-03-17 | 2 | -4/+22 |
|\ \ | | | | | | | | | | | | | owncloud/issue/14881-closures-for-navigation-entries Issue/14881 closures for navigation entries | ||||
| * | | Allow registering closures for navigation entries | Joas Schilling | 2015-03-16 | 2 | -4/+22 |
| | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #12085 from owncloud/add-swift-mailer | Lukas Reschke | 2015-03-17 | 7 | -159/+513 |
|\ \ \ | | | | | | | | | Migrate OC_Mail to SwiftMailer | ||||
| * | | | Don't fallback to Plaintext per default for legacy class | Lukas Reschke | 2015-03-16 | 1 | -6/+15 |
| | | | | |||||
| * | | | Add debug log message back | Lukas Reschke | 2015-03-16 | 2 | -4/+17 |
| | | | | |||||
| * | | | Show more detailed error message | Lukas Reschke | 2015-03-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Incorporate review changes | Lukas Reschke | 2015-03-16 | 5 | -73/+39 |
| | | | | |||||
| * | | | Migrate to SwiftMail | Lukas Reschke | 2015-03-16 | 9 | -158/+523 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-17 | 66 | -216/+12 |
| | | | | |||||
* | | | | Fix setup config | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #14923 from owncloud/fix-preference-key-definition | Vincent Petry | 2015-03-16 | 6 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Fix user preference key definition for insertIfNotExists() | ||||
| * | | | | Also add a note that clob does not work in the compare array | Joas Schilling | 2015-03-16 | 5 | -0/+5 |
| | | | | | |||||
| * | | | | The key is over configkey, user and app, not the value | Joas Schilling | 2015-03-16 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | | | | | stupid me :( | ||||
* | | | | Merge pull request #13733 from ↵ | Thomas Müller | 2015-03-16 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | mmattel/Try_to_write_logtimezone_during_installation Write the parameter 'logtimezone' into config.php during setup | ||||
| * | | | Write the parameter 'logtimezone' into config.php during setup | Martin | 2015-01-28 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #14883 from owncloud/imagepng_expects_resource_issue | Thomas Müller | 2015-03-16 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | validate resource's integrity before using it | ||||
| * | | | | validate resource's integrity before using it | Georg Ehrke | 2015-03-16 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-poc | Morris Jobke | 2015-03-16 | 11 | -124/+110 |
|\ \ \ \ | | | | | | | | | | | Allow specifying the compare-array for insertIfNotExists() | ||||
| * | | | | Also use all keys for an empty array, just in case | Joas Schilling | 2015-03-12 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Throw a RuntimeException in the cache aswell | Joas Schilling | 2015-03-11 | 2 | -4/+9 |
| | | | | | |||||
| * | | | | Fix doc blocks of insertIfNotExists() method | Joas Schilling | 2015-03-11 | 6 | -62/+48 |
| | | | | | |||||
| * | | | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵ | Thomas Müller | 2015-03-09 | 7 | -52/+20 |
| | | | | | | | | | | | | | | | | | | | | real exception | ||||
| * | | | | Get the id before using it | Joas Schilling | 2015-03-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Better save then sorry | Joas Schilling | 2015-03-09 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | insertIfNotExists() for storage insertion | Joas Schilling | 2015-03-09 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Only check unique keys for the comparison on filecache insert & update otherwise | Joas Schilling | 2015-03-09 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Allow specifying the compare-array for insertIfNotExists() | Joas Schilling | 2015-03-09 | 8 | -21/+34 |
| | | | | | |||||
* | | | | | Merge pull request #14644 from owncloud/trash-expire-command | Thomas Müller | 2015-03-16 | 1 | -0/+53 |
|\ \ \ \ \ | | | | | | | | | | | | | Expire files from the trash in the background | ||||
| * | | | | | Allow running the async commands from unit tests | Robin Appelman | 2015-03-02 | 1 | -0/+53 |
| | | | | | | |||||
* | | | | | | Merge pull request #14776 from owncloud/fix-14629-master | Thomas Müller | 2015-03-16 | 3 | -0/+44 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | verify the file name length not to exceed 255 characters + verify path d... | ||||
| * | | | | | | verify the file name length not to exceed 255 characters + verify path ↵ | Thomas Müller | 2015-03-12 | 3 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | during rename | ||||
* | | | | | | | Merge pull request #14848 from owncloud/kill-curl-fallback-master | Thomas Müller | 2015-03-16 | 4 | -112/+61 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | drop any fallback code related to curl | ||||
| * | | | | | | | drop any fallback code related to curl - refs ↵ | Thomas Müller | 2015-03-12 | 4 | -112/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/14838#issuecomment-78586447 | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-16 | 4 | -0/+34 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-15 | 4 | -8/+12 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #14871 from owncloud/use-proper-error-type | Thomas Müller | 2015-03-13 | 1 | -18/+24 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use proper error type and clean-up code | ||||
| * | | | | | | | | Use proper error type and clean-up code | Lukas Reschke | 2015-03-13 | 1 | -18/+24 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Remove outdated comment | Lukas Reschke | 2015-03-13 | 1 | -2/+0 |
| | | | | | | | | |||||
* | | | | | | | | Drop example user backend | Lukas Reschke | 2015-03-13 | 1 | -70/+0 |
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | Merge pull request #14867 from owncloud/drop-OC_User_HTTP | Morris Jobke | 2015-03-13 | 1 | -120/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove OC_User_HTTP | ||||
| * | | | | | | | Remove OC_User_HTTP | Lukas Reschke | 2015-03-13 | 1 | -120/+0 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Addresses No. 1 from https://github.com/owncloud/core/issues/14847 |