Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user | Thomas Müller | 2016-04-19 | 1 | -0/+19 |
|\ | |||||
| * | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-15 | 1 | -0/+19 |
* | | Merge pull request #24074 from owncloud/integritycheck_psr4 | Thomas Müller | 2016-04-19 | 7 | -1/+1 |
|\ \ | |||||
| * | | Fix use statement | Roeland Jago Douma | 2016-04-18 | 1 | -1/+1 |
| * | | Move OC\IntegrityCheck to PSR-4 | Roeland Jago Douma | 2016-04-18 | 7 | -0/+0 |
* | | | Merge pull request #23903 from owncloud/fix-user-data-folder-creation-for-apa... | Thomas Müller | 2016-04-19 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | Fixes #23899 | Thomas Müller | 2016-04-11 | 1 | -0/+4 |
* | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook | Thomas Müller | 2016-04-19 | 4 | -46/+50 |
|\ \ \ \ | |||||
| * | | | | Move post_removeFromGroup to shareManager | Roeland Jago Douma | 2016-04-13 | 4 | -46/+50 |
* | | | | | Move logout to controller | Lukas Reschke | 2016-04-18 | 3 | -12/+10 |
* | | | | | Remove deprecated HTTPHelper | Thomas Müller | 2016-04-18 | 1 | -8/+22 |
* | | | | | Move version check code out of class Updater | Thomas Müller | 2016-04-18 | 2 | -65/+120 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #23947 from owncloud/login-to-ctrl | Lukas Reschke | 2016-04-18 | 2 | -42/+8 |
|\ \ \ \ | |||||
| * | | | | Move login form into controller | Lukas Reschke | 2016-04-15 | 2 | -42/+8 |
* | | | | | Move \OC\Notification to PSR-4 | Roeland Jago Douma | 2016-04-18 | 3 | -0/+0 |
* | | | | | Move \OC\Memcache to PSR-4 | Roeland Jago Douma | 2016-04-18 | 11 | -0/+0 |
* | | | | | Move \OC\DB to PSR-4 | Roeland Jago Douma | 2016-04-15 | 31 | -0/+0 |
* | | | | | 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 | 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 - 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 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Kill movable 3rdparty | Thomas Müller | 2016-04-14 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #23561 from owncloud/background-scan-unscanned | C. Montero Luque | 2016-04-14 | 1 | -19/+31 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'master' into background-scan-unscanned | C. Montero Luque | 2016-03-25 | 4 | -6/+28 |
| |\ \ \ \ | |||||
| * | | | | | 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 | Morris Jobke | 2016-04-14 | 1 | -2/+7 |
* | | | | | | Scrutinizer Auto-Fixes (#23959) | Scrutinizer Auto-Fixer | 2016-04-14 | 1 | -2/+2 |
* | | | | | | Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong... | Morris Jobke | 2016-04-14 | 1 | -4/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 | Roeland Jago Douma | 2016-04-13 | 1 | -0/+0 |
* | | | | | Merge pull request #23963 from owncloud/lazyRoot | Joas Schilling | 2016-04-13 | 3 | -3/+494 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Stefan Weil | 2016-04-12 | 1 | -1/+1 |
* | | | | | 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 |
* | | | | Migrate post_groupDelete hook to share manager (#23841) | Roeland Douma | 2016-04-12 | 4 | -13/+55 |
* | | | | Don't calculate permissions twice (#23917) | Roeland Douma | 2016-04-12 | 1 | -1/+1 |
* | | | | Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks | Joas Schilling | 2016-04-11 | 1 | -118/+0 |
|\ \ \ \ | |||||
| * | | | | Remove pre/post_addToGroup hooks for shares | Roeland Jago Douma | 2016-04-08 | 1 | -118/+0 |