Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13480 from owncloud/mysql-autocommit | Lukas Reschke | 2015-01-19 | 1 | -4/+9 |
|\ | | | | | set MySQL autocommit on connection setup | ||||
| * | set MySQL autocommit on connection setup | Thomas Müller | 2015-01-19 | 1 | -4/+9 |
| | | |||||
* | | Fix chunked query for tags + unit test | Vincent Petry | 2015-01-19 | 1 | -1/+1 |
|/ | |||||
* | check is mimetype is set - fixed #13452 | Thomas Müller | 2015-01-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #13423 from ↵ | Thomas Müller | 2015-01-19 | 1 | -9/+18 |
|\ | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups | ||||
| * | Fix getItemSharedWithUser for groups | Vincent Petry | 2015-01-16 | 1 | -9/+18 |
| | | | | | | | | | | | | Fixed SQL query for whenever a user has more than one group. Added missing $owner where clause for group lookup. Added unit tests for the group cases. | ||||
* | | Merge pull request #13438 from owncloud/cache-the-array | Thomas Müller | 2015-01-19 | 1 | -70/+71 |
|\ \ | | | | | | | Reuse the array key of mimetypes | ||||
| * | | Reuse the array key of mimetypes | Lukas Reschke | 2015-01-18 | 1 | -70/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | This function is called a lot of times and was really slow before due to not reusing the same array. Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine. Ref https://github.com/owncloud/core/issues/13434 | ||||
* | | | Fix exif orientation for flipped images | Morris Jobke | 2015-01-18 | 1 | -5/+12 |
|/ / | | | | | | | | | | | | | | | fixes #13363 Links: * http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ * Example data: https://github.com/recurser/exif-orientation-examples | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-17 | 2 | -38/+168 |
| | | |||||
* | | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description | Lukas Reschke | 2015-01-17 | 1 | -1/+38 |
|\ \ | | | | | | | replace line breaks in the app description by spaces - fixes #13315 | ||||
| * | | OC_App::parseAppInfo | Morris Jobke | 2015-01-14 | 1 | -1/+38 |
| | | | | | | | | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests | ||||
* | | | Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfile | Morris Jobke | 2015-01-16 | 1 | -27/+59 |
|\ \ \ | |_|/ |/| | | Disable part files for OC ext storage backend + s2s backend | ||||
| * | | remove unused variable and fix undefined variable | Thomas Müller | 2015-01-08 | 1 | -5/+4 |
| | | | |||||
| * | | Disable part files for OC ext storage backend + s2s backend | Vincent Petry | 2015-01-07 | 1 | -28/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files to an OC ext storage backend or when using server to server sharing storage, part files aren't needed because the backend already has its own part files and takes care of the final atomic rename operation. This also fixes issues when using two encrypted ownCloud instances where one mounts the other either as external storage (ownCloud backend) or through server to server sharing. | ||||
* | | | Merge pull request #13406 from owncloud/fix-php-doc | Frank Karlitschek | 2015-01-15 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Fix PHPDoc | ||||
| * | | | Fix PHPDoc | Lukas Reschke | 2015-01-15 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkins | Thomas Müller | 2015-01-15 | 1 | -11/+29 |
|\ \ \ \ | |/ / / |/| | | | Mask table and column names with backticks and add lastInsertID() workar... | ||||
| * | | | Mask table and column names with backticks and add lastInsertID() workaround | Joas Schilling | 2015-01-15 | 1 | -11/+29 |
| | | | | |||||
* | | | | Remove children from the cache in one query | Robin Appelman | 2015-01-15 | 1 | -24/+36 |
| | | | | |||||
* | | | | Merge pull request #13388 from owncloud/type-hint-url-params | Morris Jobke | 2015-01-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add PHPDoc for `urlParams` | ||||
| * | | | | Add PHPDoc for `urlParams` | Lukas Reschke | 2015-01-15 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | always set url parameters when they are available in the app dispatch | Bernhard Posselt | 2015-01-15 | 3 | -9/+18 |
|/ / / | | | | | | | | | | | | | | | | prefer url parameters passed into the main method. If they are not present, use the containers urlParameters add space | ||||
* | | | Merge pull request #13317 from owncloud/partfile-fileinfo | Thomas Müller | 2015-01-14 | 1 | -0/+31 |
|\ \ \ | | | | | | | | | Return valid fileinfo objects for part files | ||||
| * | | | Return valid fileinfo objects for part files | Robin Appelman | 2015-01-13 | 1 | -0/+31 |
| | | | | |||||
* | | | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstep | Morris Jobke | 2015-01-14 | 2 | -1/+117 |
|\ \ \ \ | | | | | | | | | | | Add a repair step to clean up orphan tags and tag entries | ||||
| * | | | | Add a repair step to clean up orphan tags and tag entries | Joas Schilling | 2015-01-14 | 2 | -1/+117 |
| | | | | | |||||
* | | | | | Merge pull request #13367 from owncloud/type-hint-server-method-from-request | Morris Jobke | 2015-01-14 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add PHPDoc for magic property 'server' | ||||
| * | | | | | Add PHPDoc for magic property 'server' | Lukas Reschke | 2015-01-14 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #13350 from owncloud/autoload-translations | Morris Jobke | 2015-01-14 | 1 | -0/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Autoload app's js translations | ||||
| * | | | | | ignore core | Bernhard Posselt | 2015-01-14 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | move check into addTranslation method | Bernhard Posselt | 2015-01-14 | 1 | -11/+1 |
| | | | | | | |||||
| * | | | | | dont load core scritps | Bernhard Posselt | 2015-01-14 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | only load translsations for apps | Bernhard Posselt | 2015-01-14 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | make translation lookup faster (O(n) -> O(1)) | Bernhard Posselt | 2015-01-14 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | autoload app's js translations | Bernhard Posselt | 2015-01-14 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | Check new and old ways of required oC version for app compatibility | Joas Schilling | 2015-01-14 | 2 | -2/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #13311 from owncloud/fix_restore_keys | Björn Schießle | 2015-01-14 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | adapt decrypt all to the new folder structure | ||||
| * | | | | adapt decrypt all and restore/delete key backups to the new folder structure ↵ | Bjoern Schiessle | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | for encryption key introduced with OC8 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-14 | 2 | -0/+18 |
| | | | | | |||||
* | | | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-view | Morris Jobke | 2015-01-13 | 1 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix annotations in file view | ||||
| * | | | | | drop unused parameter | Morris Jobke | 2015-01-13 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Fix annotations in file view | Lukas Reschke | 2015-01-13 | 1 | -0/+11 |
| | |_|_|/ | |/| | | | |||||
* / | | | | drop dead code - ref #13301 | Morris Jobke | 2015-01-13 | 1 | -4/+0 |
|/ / / / | |||||
* | | | | Merge pull request #13217 from owncloud/make-basic-auth-work-again | Bernhard Posselt | 2015-01-13 | 1 | -13/+15 |
|\ \ \ \ | | | | | | | | | | | Fix Basic Auth in master for applications | ||||
| * | | | | Add some more sanity checks for maintenance mode | Lukas Reschke | 2015-01-09 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Verify authentication before initializing apps and routing | Lukas Reschke | 2015-01-09 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work. Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in. This can be reproduced by installing apps such as the News app and issuing the following command: `curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds` The following parts needs to get throughly tested: - [ ] OCS - [ ] remote.php's DAV features - [ ] Regular login features This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice. Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare. Fixes itself. | ||||
* | | | | | Merge pull request #13291 from owncloud/node-searchcommonbasepathfix | Thomas Müller | 2015-01-13 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix searchCommon to properly match path name | ||||
| * | | | | Fix searchCommon to properly match path name | Vincent Petry | 2015-01-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal path was matched without the last "/" which caused "files_trashbin" to also match when the internal path was "files". This adds the missing slash for the comparison. | ||||
* | | | | | Merge pull request #13301 from owncloud/drop-etag-message | Vincent Petry | 2015-01-13 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | drop useless "!!! No reuse of etag" - fixes #13187 |