Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into home-storage | Thomas Müller | 2013-10-30 | 10 | -73/+169 |
|\ | |||||
| * | Merge pull request #5615 from owncloud/fixing-5614-master | Lukas Reschke | 2013-10-30 | 1 | -1/+2 |
| |\ | | | | | | | http header OCS-ApiRequest: true is required in case of session based OC... | ||||
| | * | Added missing HTTP prefix to the $_SERVER variable | Lukas Reschke | 2013-10-30 | 1 | -1/+1 |
| | | | |||||
| | * | http header OCS-ApiRequest: true is required in case of session based OCS ↵ | Thomas Müller | 2013-10-29 | 1 | -1/+2 |
| | | | | | | | | | | | | API calls | ||||
| * | | Merge branch 'master' into update-parent-storage-mtime | Robin Appelman | 2013-10-30 | 7 | -51/+121 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: lib/private/files/cache/updater.php | ||||
| | * \ | Merge pull request #5603 from owncloud/fix_file_cache_updater_master | Vincent Petry | 2013-10-30 | 1 | -12/+39 |
| | |\ \ | | | |/ | | |/| | Fix file cache updater (backport to master of #5513) | ||||
| | | * | Merge branch 'master' into fix_file_cache_updater_master | Bjoern Schiessle | 2013-10-29 | 6 | -39/+82 |
| | | |\ | |||||
| | | * | | make sure that also the storage etag gets changed | Bjoern Schiessle | 2013-10-29 | 1 | -4/+7 |
| | | | | | |||||
| | | * | | make getUidAndFilename() private | Bjoern Schiessle | 2013-10-29 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -12/+36 |
| | | | | | |||||
| | * | | | use getHome() to delete users data | Bjoern Schiessle | 2013-10-29 | 1 | -3/+3 |
| | | |/ | | |/| | |||||
| | * | | Merge pull request #5605 from owncloud/fix_delete_user | Björn Schießle | 2013-10-29 | 2 | -9/+30 |
| | |\ \ | | | | | | | | | | | remove user from cache if he was deleted successfully | ||||
| | | * | | remove user from cache if he was deleted successfully | Bjoern Schiessle | 2013-10-29 | 2 | -9/+30 |
| | | |/ | |||||
| | * | | Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath | Thomas Müller | 2013-10-29 | 1 | -5/+5 |
| | |\ \ | | | | | | | | | | | use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace | ||||
| | | * | | use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace | Jörn Friedrich Dreyer | 2013-10-28 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Merge pull request #5601 from owncloud/fix-mimetype-detection | Morris Jobke | 2013-10-29 | 2 | -2/+10 |
| | |\ \ \ | | | | | | | | | | | | | Fix mimetype detection | ||||
| | | * | | | Map empty mimetypes to octet-stream for Oracle DBMS. | Andreas Fischer | 2013-10-29 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | Return early if fileinfo is there. | Andreas Fischer | 2013-10-29 | 1 | -0/+1 |
| | | | | | | |||||
| | | * | | | Reset mimetype to application/octet-stream on empty reply from file command. | Andreas Fischer | 2013-10-29 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | Do not calculate $isWrapped if not needed. | Andreas Fischer | 2013-10-29 | 1 | -2/+1 |
| | | | |/ | | | |/| | |||||
| | * | | | Merge pull request #5396 from owncloud/fix-sharing-code | Morris Jobke | 2013-10-29 | 1 | -23/+37 |
| | |\ \ \ | | | |/ / | | |/| | | Fix sharing error message - id -> file name | ||||
| | | * | | pass the name of the item source from the browser to the server - no need to ↵ | Thomas Müller | 2013-10-23 | 1 | -24/+20 |
| | | | | | | | | | | | | | | | | | | | | get the data via complicated db queries | ||||
| | | * | | Merge branch 'master' into fix-sharing-code | Thomas Müller | 2013-10-23 | 64 | -80/+578 |
| | | |\ \ | |||||
| | | * | | | Fix sharing error message - id -> file name | Morris Jobke | 2013-10-17 | 1 | -11/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixe #2827 | ||||
| * | | | | | Update the parent folders storage_mtime on write and delete to prevent rescans | Robin Appelman | 2013-10-29 | 1 | -1/+21 |
| |/ / / / | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #5493 from owncloud/fix-language-detection | Thomas Müller | 2013-10-28 | 1 | -21/+25 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fix HTTP language detection | ||||
| | * | | | Merge branch 'master' into fix-language-detection | Thomas Müller | 2013-10-24 | 14 | -26/+328 |
| | |\ \ \ | |||||
| | * | | | | fixing PHPDoc & grammar | Thomas Müller | 2013-10-23 | 1 | -5/+5 |
| | | | | | | |||||
| | * | | | | Have to also strtolower() on available language name. Otherwise no match. | Andreas Fischer | 2013-10-23 | 1 | -4/+6 |
| | | | | | | |||||
| | * | | | | Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. | Andreas Fischer | 2013-10-23 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Apply substring on the correct value. | Andreas Fischer | 2013-10-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Better variable names. | Andreas Fischer | 2013-10-23 | 1 | -9/+9 |
| | | | | | | |||||
| | * | | | | Fix coding style for else. | Andreas Fischer | 2013-10-23 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | Correct indentation for default language. | Andreas Fischer | 2013-10-23 | 1 | -4/+4 |
| | | | | | | |||||
* | | | | | | dont use the home storage for non-existing users | Robin Appelman | 2013-10-29 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | use the new home storage backend when no existing local storage backend ↵ | Robin Appelman | 2013-10-29 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | exists for the user's home | ||||
* | | | | | | add specialized storage backend for home folders | Robin Appelman | 2013-10-29 | 1 | -0/+31 |
|/ / / / / | |||||
* | | | | | Merge pull request #5550 from owncloud/fix-4716-master | Morris Jobke | 2013-10-28 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | 'Update to' is shown when there is no update | ||||
| * | | | | | update documentation for app update | Morris Jobke | 2013-10-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | 'Update to' is shown when there is no update | Bart Visscher | 2013-10-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | See #4716 | ||||
* | | | | | | Merge pull request #3889 from owncloud/apps_preload | Morris Jobke | 2013-10-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't load the apps when we need to upgrade | ||||
| * | | | | | | Don't load the apps when we need to upgrade | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loading can call functions that require new tables, like oc_jobs | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 6 | -4/+25 |
| | | | | | | | |||||
* | | | | | | | local user backend shall search for both username and displayname, fixes #5401 | Arthur Schiwon | 2013-10-25 | 1 | -14/+3 |
| | | | | | | | |||||
* | | | | | | | Added comment for clarification about fseek() call in quota.php | Vincent Petry | 2013-10-25 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Fixed quota stream to not wrap read-only fopen calls | Vincent Petry | 2013-10-25 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Fixed quota stream's fseek method | Vincent Petry | 2013-10-25 | 1 | -2/+12 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524 | ||||
* | | | | | | Merge pull request #5528 from frisco82/changeUpadateNotification | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Changed update message to be more instructive |