summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add recursive copy to local storage backendRobin Appelman2014-05-282-7/+84
|
* fix recursive rename for local storage backendRobin Appelman2014-05-282-2/+20
|
* remove unneeded delTreeRobin Appelman2014-05-281-25/+1
|
* aditional test cases for copy and renameRobin Appelman2014-05-281-0/+40
|
* Merge pull request #8768 from owncloud/scanner_visibilityicewind19912014-05-281-4/+4
|\ | | | | Change visibility of scanner internals
| * Change visibility of scanner internalsringmaster2014-05-281-4/+4
|/ | | | so that descendant classes can access them.
* Merge pull request #8755 from owncloud/fix-8737-masterVincent Petry2014-05-281-2/+2
|\ | | | | remove legacy OC_Filesystem being used in a hook callback
| * remove legacy OC_Filesystem being used in a hook callbackThomas Müller2014-05-281-2/+2
| |
* | Merge pull request #8750 from owncloud/l10n-add-title-propertyVolkan Gezer2014-05-281-2/+2
|\ \ | | | | | | add title property to share dialog will close #8638
| * | add title property to share dialogVolkan Gezer2014-05-271-2/+2
| | |
* | | Merge pull request #8732 from owncloud/fix-warning-textJan-Christoph Borchardt2014-05-282-9/+4
|\ \ \ | | | | | | | | fix warning text and margin. fixes #8715
| * | | fix warning text and marginVolkan Gezer2014-05-272-9/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-28404-3137/+5001
| |_|/ |/| |
* | | Merge pull request #8713 from owncloud/typo-files-encrThomas Müller2014-05-271-2/+2
|\ \ \ | | | | | | | | fix grammar
| * | | fix grammarVolkan Gezer2014-05-251-2/+2
| | | |
* | | | Merge pull request #8136 from owncloud/contactsmanager-registerBart Visscher2014-05-273-37/+71
|\ \ \ \ | | | | | | | | | | Implement the register function of OC\ContactsManager
| * | | | no return on register and unregisterThomas Müller2014-05-191-2/+2
| | | | |
| * | | | Merge branch 'master' into contactsmanager-registerThomas Müller2014-05-191822-48608/+102803
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/contactsmanager.php
| * | | | | Fix wrong var nameBart Visscher2014-04-261-1/+1
| | | | | |
| * | | | | Merge branch 'master' into contactsmanager-registerBart Visscher2014-04-261201-25369/+58821
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/contactsmanager.php
| * | | | | | camelCase vars in OC\ContactsManagerBart Visscher2014-04-171-34/+34
| | | | | | |
| * | | | | | Supply the contactsmanager object to the callbacksBart Visscher2014-04-101-1/+1
| | | | | | |
| * | | | | | $key is not needed for registering contactsmanager callbacksBart Visscher2014-04-102-5/+3
| | | | | | |
| * | | | | | Implement the register function of OC\ContactsManagerBart Visscher2014-04-091-12/+48
| | | | | | |
* | | | | | | Merge pull request #8744 from owncloud/l10n-whoops-user-ldapblizzz2014-05-271-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | forgotten infobox messages translations
| * | | | | | forgotten infobox messages translationsVolkan Gezer2014-05-271-4/+4
|/ / / / / /
* | | | | | Merge pull request #8740 from owncloud/l10n-forgotten-tagsVolkan Gezer2014-05-271-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | reverts 188c543
| * | | | | | reverts 188c543 and translates only mailVolkan Gezer2014-05-271-2/+2
| | | | | | |
* | | | | | | Merge pull request #8736 from owncloud/appinfo-newrequirefieldsVincent Petry2014-05-2711-103/+284
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | App info new fields "requiremin" and "requiremax"
| * | | | | | | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-278-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a few missing authors.
| * | | | | | | Added requiremin/requiremax fields for appsVincent Petry2014-05-273-91/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps can now specify a minimum and maximum version of ownCloud in which they are supported.
* | | | | | | | Merge pull request #8721 from owncloud/sharing_don_lose_filesizeVincent Petry2014-05-272-10/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | don't lose file size during rename
| * | | | | | | | don't lose file size during renameBjoern Schiessle2014-05-262-10/+46
| | | | | | | | |
* | | | | | | | | Merge pull request #8733 from owncloud/l10n-forgotten-tagsVincent Petry2014-05-271-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | unwrapped strings fix
| * | | | | | | unwrapped strings fixVolkan Gezer2014-05-271-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #8728 from owncloud/sharing_fix_reshareVincent Petry2014-05-272-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | allow resharing of files with only share permissions
| * | | | | | | allow resharing of files with only share permissionsBjoern Schiessle2014-05-262-11/+14
| |/ / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-05-27186-496/+708
|/ / / / / /
* | | | | | Merge pull request #8687 from owncloud/recursive-remove-smbVincent Petry2014-05-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the recursive delete more robust
| * | | | | | Make the recursive delete more robustRobin Appelman2014-05-231-1/+1
| | | | | | |
* | | | | | | Merge pull request #8674 from owncloud/watch-policyFrank Karlitschek2014-05-263-2/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add a config option for setting the filesystem watcher policy
| * | | | | | Add a config option fro setting the filesystem watcher policyRobin Appelman2014-05-232-1/+12
| | | | | | |
| * | | | | | Fix phpdocRobin Appelman2014-05-221-1/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-26327-3252/+7930
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #8711 from owncloud/l10n-fully-translatable-ldapVolkan Gezer2014-05-256-15/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | make user_ldap fully translatable
| * | | | | | make user_ldap fully translatableVolkan Gezer2014-05-256-15/+17
|/ / / / / /
* | | | | | Merge pull request #8705 from wakeup/masterThomas Müller2014-05-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix typo
| * | | | | | fix typoVolkan Gezer2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2564-379/+422
|/ / / / / /
* | | | | | Merge pull request #8688 from owncloud/public-image-positioningLukas Reschke2014-05-241-7/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show less whitespace above publicly shared images