Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move \OC\Comments to PSR-4 | Roeland Jago Douma | 2016-04-15 | 3 | -0/+0 |
| | |||||
* | Move \OC\Command to PSR-4 | Roeland Jago Douma | 2016-04-15 | 6 | -0/+0 |
| | |||||
* | Move \OC\Cache to PSR-4 | Roeland Jago Douma | 2016-04-15 | 2 | -0/+0 |
| | |||||
* | Move \OC\Session to PSR-4 | Roeland Jago Douma | 2016-04-15 | 5 | -0/+0 |
| | |||||
* | Merge pull request #24007 from owncloud/security_psr4 | Thomas Müller | 2016-04-14 | 13 | -0/+0 |
|\ | | | | | Move \OC\Security to PSR-4 | ||||
| * | Move \OC\Security to PSR-4 | Roeland Jago Douma | 2016-04-14 | 13 | -0/+0 |
| | | |||||
* | | Merge pull request #23998 from owncloud/translate-birthday | Thomas Müller | 2016-04-14 | 1 | -1/+2 |
|\ \ | | | | | | | Translate contacts birthday | ||||
| * | | Translate contacts birthday - fixes #23982 | Thomas Müller | 2016-04-14 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-root | Thomas Müller | 2016-04-14 | 2 | -32/+8 |
|\ \ \ | | | | | | | | | Kill movable 3rdparty | ||||
| * | | | Kill movable 3rdparty | Thomas Müller | 2016-04-14 | 2 | -32/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #23561 from owncloud/background-scan-unscanned | C. Montero Luque | 2016-04-14 | 1 | -19/+31 |
|\ \ \ | |/ / |/| | | handle completely unscanned storages in the background scanner | ||||
| * | | Merge branch 'master' into background-scan-unscanned | C. Montero Luque | 2016-03-25 | 12 | -8/+50 |
| |\ \ | |||||
| * | | | handle completely unscanned storages in the background scanner | Robin Appelman | 2016-03-24 | 1 | -19/+31 |
| | | | | |||||
* | | | | Merge pull request #23991 from owncloud/handle-exceptions-in-templates | Thomas Müller | 2016-04-14 | 1 | -2/+7 |
|\ \ \ \ | |_|_|/ |/| | | | Properly handle exception within templates | ||||
| * | | | Properly handle exception within templates | Morris Jobke | 2016-04-14 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | * fixes partial printed templates when exception is thrown in between | ||||
* | | | | Scrutinizer Auto-Fixes (#23959) | Scrutinizer Auto-Fixer | 2016-04-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com * revert append() change | ||||
* | | | | Merge pull request #19615 from ↵ | Morris Jobke | 2016-04-14 | 1 | -4/+17 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles Fix Share::getUsersSharingFile() for mount points | ||||
| * | | | | Fix Share::getUsersSharingFile() for mount points | Joas Schilling | 2016-04-13 | 1 | -4/+17 |
| | | | | | |||||
* | | | | | Move \OC\Lock to PSR-4 | Roeland Jago Douma | 2016-04-14 | 4 | -0/+0 |
| |/ / / |/| | | | |||||
* | | | | Move \OC\App to PSR-4 | Roeland Jago Douma | 2016-04-13 | 14 | -0/+0 |
|/ / / | |||||
* | | | Merge pull request #23962 from owncloud/activity-psr4 | Thomas Müller | 2016-04-13 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | Move files in \OC\Activity to PSR-4 | ||||
| * | | | Move files in \OC\Activity to PSR-4 | Roeland Jago Douma | 2016-04-13 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #23963 from owncloud/lazyRoot | Joas Schilling | 2016-04-13 | 3 | -3/+494 |
|\ \ \ \ | | | | | | | | | | | Add LazyRootFolder | ||||
| * | | | | Make shareproviders use the lazy root folder | Roeland Jago Douma | 2016-04-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add lazyRootFolder | Roeland Jago Douma | 2016-04-13 | 2 | -1/+492 |
| |/ / / | |||||
* | | | | Merge pull request #23954 from stweil/master | Thomas Müller | 2016-04-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | misc: Fix some typos | ||||
| * | | | misc: Fix some typos | Stefan Weil | 2016-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Some of them were found by codespell. Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-13 | 2 | -2/+12 |
| | | | | |||||
* | | | | set $share to null if getShareByToken() failed | Björn Schießle | 2016-04-12 | 1 | -1/+1 |
|/ / / | |||||
* | | | Add unit testing capabilities for templates (#23708) | Thomas Müller | 2016-04-12 | 2 | -27/+39 |
| | | | | | | | | | | | | Add unit testing capabilities for templates | ||||
* | | | Migrate post_groupDelete hook to share manager (#23841) | Roeland Douma | 2016-04-12 | 7 | -14/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | The hook now calls the share manager that will call the responsible shareProvider to do the proper cleanup. * Unit tests added Again nothing should change it is just to cleanup old code | ||||
* | | | Don't calculate permissions twice (#23917) | Roeland Douma | 2016-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | There is no need to calculate the permissions twice. Saves some is_dir and file_exists calls. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-12 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks | Joas Schilling | 2016-04-11 | 2 | -120/+0 |
|\ \ \ | | | | | | | | | Remove pre/post_addToGroup hooks for shares | ||||
| * | | | Remove pre/post_addToGroup hooks for shares | Roeland Jago Douma | 2016-04-08 | 2 | -120/+0 |
| | | | | | | | | | | | | | | | | | | | | There is no need to perform the checks for unique targets on add to group as we have to do this all when mounting the shares anyway. | ||||
* | | | | Catch the AutoloadNotAllowedException also for legacy jobs (#23901) | Morris Jobke | 2016-04-11 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | * same as #18839 for legacy jobs * avoids spamming the log with useless entries | ||||
* | | | | To be safe don't unload until end (#23752) | Joshua Ruehlig | 2016-04-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * To be safe don't unload until end * unlink needs to be before return to actually do anything | ||||
* | | | | Merge pull request #23798 from owncloud/federated-unshare-background-job | Morris Jobke | 2016-04-11 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | re-try to send unshare notification if remote server is not available | ||||
| * | | | | re-try to send unshare notification if remote server is not available | Bjoern Schiessle | 2016-04-08 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #23860 from owncloud/followup-23304-opening-empty-file | Thomas Müller | 2016-04-11 | 1 | -3/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Correctly return an empty string for empty files | ||||
| * | | | | | Correctly return an empty string for empty files | Joas Schilling | 2016-04-08 | 1 | -3/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #23553 from owncloud/lock-ttl-execution-time | Thomas Müller | 2016-04-08 | 4 | -8/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Make lock ttl configurable | ||||
| * | | | | | Make lock ttl configurable | Robin Appelman | 2016-04-07 | 4 | -8/+15 |
| | | | | | | |||||
* | | | | | | Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager | Thomas Müller | 2016-04-08 | 1 | -1/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move public webdav auth to share manager | ||||
| * | | | | | | Set proper permissions on link share | Roeland Jago Douma | 2016-04-08 | 1 | -1/+19 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do not allow public upload we should limit the permissions on links shares upon retrieval. * Added unit test * Allow fetching federated shares by token as well | ||||
* / | | | | | lib: Fix typos (found by codespell) | Stefan Weil | 2016-04-07 | 29 | -36/+36 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | | | Merge pull request #23773 from owncloud/share_move_delete_user_hook | Joas Schilling | 2016-04-07 | 7 | -20/+125 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Migrate post_userDelete hook to share manager | ||||
| * | | | | Migrate post_userDelete hook to share manager | Roeland Jago Douma | 2016-04-04 | 7 | -20/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the post_userDelete hook call the sharemanager. This will cleanup to and from this user. * All shares owned by this user * All shares with this user (user) * All custom group shares * All link share initiated by this user (to avoid invisible link shares) Unit tests are added for the defaultshare provider as well as the federated share provider | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-07 | 2 | -0/+4 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #23766 from owncloud/replace-getid-3 | Lukas Reschke | 2016-04-06 | 1 | -6/+10 |
|\ \ \ \ | | | | | | | | | | | Replace getid3 with ID3Parser |