Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #3908 from owncloud/storage-folder-copy-rename | icewind1991 | 2014-05-29 | 4 | -115/+170 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove code duplication | Robin Appelman | 2014-05-28 | 1 | -20/+21 | |
| * | | | | | | Fix LocalStorage->unlink to work on folder as expected | Robin Appelman | 2014-05-28 | 2 | -2/+9 | |
| * | | | | | | re-use rescursive copy from common storage | Robin Appelman | 2014-05-28 | 1 | -16/+1 | |
| * | | | | | | remove unneeded check | Robin Appelman | 2014-05-28 | 1 | -2/+2 | |
| * | | | | | | use \OC\Files\Filesystem::isIgnoredDir | Robin Appelman | 2014-05-28 | 3 | -62/+86 | |
| * | | | | | | fix recursive copy and rename for common storage backend | Robin Appelman | 2014-05-28 | 1 | -9/+38 | |
| * | | | | | | fix recursive copy and rename for mapped local storage backend | Robin Appelman | 2014-05-28 | 1 | -10/+27 | |
| * | | | | | | add recursive copy to local storage backend | Robin Appelman | 2014-05-28 | 1 | -6/+20 | |
| * | | | | | | fix recursive rename for local storage backend | Robin Appelman | 2014-05-28 | 1 | -2/+4 | |
| * | | | | | | remove unneeded delTree | Robin Appelman | 2014-05-28 | 1 | -25/+1 | |
* | | | | | | | Merge pull request #8547 from owncloud/path-length-master | Thomas Müller | 2014-05-29 | 1 | -3/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | # This is a combination of 2 commits. | Thomas Müller | 2014-05-28 | 1 | -3/+18 | |
* | | | | | | | | Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer | Lukas Reschke | 2014-05-28 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | upgraded phpmailer into v5.2.8 via composer | Volkan Gezer | 2014-05-27 | 1 | -2/+0 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #8681 from owncloud/logintimestamp | Lukas Reschke | 2014-05-28 | 5 | -16/+87 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintim... | Arthur Schiwon | 2014-05-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Clarify comment | Lukas Reschke | 2014-05-24 | 1 | -1/+1 | |
| * | | | | | | | | drop superflous statement in phpdoc | Arthur Schiwon | 2014-05-26 | 1 | -2/+0 | |
| * | | | | | | | | add preRememberedLogin hook and document this and postRememberedLogin in clas... | Arthur Schiwon | 2014-05-26 | 1 | -1/+4 | |
| |/ / / / / / / | ||||||
| * | | | | | | | increase scrutinizer happyiness by removing minor/informational issues | Arthur Schiwon | 2014-05-23 | 1 | -1/+1 | |
| * | | | | | | | clean up tryRememberLogin and save the timestamp of users last login | Arthur Schiwon | 2014-05-21 | 5 | -15/+85 | |
* | | | | | | | | Change visibility of scanner internals | ringmaster | 2014-05-28 | 1 | -4/+4 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #8755 from owncloud/fix-8737-master | Vincent Petry | 2014-05-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove legacy OC_Filesystem being used in a hook callback | Thomas Müller | 2014-05-28 | 1 | -2/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
* / | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-28 | 3 | -1/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #8136 from owncloud/contactsmanager-register | Bart Visscher | 2014-05-27 | 3 | -37/+71 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | no return on register and unregister | Thomas Müller | 2014-05-19 | 1 | -2/+2 | |
| * | | | | | Merge branch 'master' into contactsmanager-register | Thomas Müller | 2014-05-19 | 212 | -2243/+3670 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| * | | | | | Fix wrong var name | Bart Visscher | 2014-04-26 | 1 | -1/+1 | |
| * | | | | | Merge branch 'master' into contactsmanager-register | Bart Visscher | 2014-04-26 | 131 | -1013/+1996 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | camelCase vars in OC\ContactsManager | Bart Visscher | 2014-04-17 | 1 | -34/+34 | |
| * | | | | | | Supply the contactsmanager object to the callbacks | Bart Visscher | 2014-04-10 | 1 | -1/+1 | |
| * | | | | | | $key is not needed for registering contactsmanager callbacks | Bart Visscher | 2014-04-10 | 2 | -5/+3 | |
| * | | | | | | Implement the register function of OC\ContactsManager | Bart Visscher | 2014-04-09 | 1 | -12/+48 | |
* | | | | | | | Added requiremin/requiremax fields for apps | Vincent Petry | 2014-05-27 | 2 | -26/+63 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-27 | 1 | -0/+1 | |
* | | | | | | | Merge pull request #8687 from owncloud/recursive-remove-smb | Vincent Petry | 2014-05-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make the recursive delete more robust | Robin Appelman | 2014-05-23 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #8674 from owncloud/watch-policy | Frank Karlitschek | 2014-05-26 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add a config option fro setting the filesystem watcher policy | Robin Appelman | 2014-05-23 | 1 | -0/+2 | |
| * | | | | | | | | Fix phpdoc | Robin Appelman | 2014-05-22 | 1 | -1/+1 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-26 | 4 | -2/+13 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-25 | 8 | -10/+20 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-24 | 4 | -2/+25 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #8599 from owncloud/sharing_disable_for_groups | Björn Schießle | 2014-05-22 | 5 | -4/+61 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 5 | -4/+61 | |
* | | | | | | | | Merge pull request #8659 from owncloud/get-preference-multiple-user | Vincent Petry | 2014-05-22 | 1 | -0/+37 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Correctly create list of placeholders | Joas Schilling | 2014-05-21 | 1 | -1/+1 | |
| * | | | | | | | Move return to new line | Joas Schilling | 2014-05-21 | 1 | -1/+3 |