summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8748 from owncloud/cli_maintenance_modeAndreas Fischer2014-05-292-0/+62
|\
| * Use OC\Config instead of OC_Configscolebrook2014-05-282-6/+15
| * Changed class name to modescolebrook2014-05-282-3/+3
| * Add ability to enable/disable maintenance mode from cli.scolebrook2014-05-272-0/+53
* | Merge pull request #8547 from owncloud/path-length-masterThomas Müller2014-05-294-5/+141
|\ \
| * | # This is a combination of 2 commits.Thomas Müller2014-05-284-5/+141
* | | Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailerLukas Reschke2014-05-283-3/+1
|\ \ \
| * | | Update 3rdparty submodule after mergeThomas Müller2014-05-281-0/+0
| * | | updating unit test expectationsThomas Müller2014-05-281-1/+1
| * | | upgraded phpmailer into v5.2.8 via composerVolkan Gezer2014-05-272-2/+0
* | | | Merge pull request #8681 from owncloud/logintimestampLukas Reschke2014-05-288-19/+314
|\ \ \ \
| * \ \ \ Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintim...Arthur Schiwon2014-05-261-1/+1
| |\ \ \ \
| | * | | | Clarify commentLukas Reschke2014-05-241-1/+1
| * | | | | drop superflous statement in phpdocArthur Schiwon2014-05-261-2/+0
| * | | | | add preRememberedLogin hook and document this and postRememberedLogin in clas...Arthur Schiwon2014-05-261-1/+4
| |/ / / /
| * | | | print time in 24h formatArthur Schiwon2014-05-231-1/+1
| * | | | increase scrutinizer happyiness by removing minor/informational issuesArthur Schiwon2014-05-232-3/+1
| * | | | save a whitespaceArthur Schiwon2014-05-231-2/+2
| * | | | add cli command to check a users last loginArthur Schiwon2014-05-232-0/+48
| * | | | clean up here is superflous, will already be removed by user sessionArthur Schiwon2014-05-231-6/+0
| * | | | test hooks also on loginArthur Schiwon2014-05-231-3/+39
| * | | | also test whether hooks workArthur Schiwon2014-05-231-5/+39
| * | | | unit tests for loginWithCookie()Arthur Schiwon2014-05-231-0/+114
| * | | | clean up tryRememberLogin and save the timestamp of users last loginArthur Schiwon2014-05-215-15/+85
* | | | | Merge pull request #8768 from owncloud/scanner_visibilityicewind19912014-05-281-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change visibility of scanner internalsringmaster2014-05-281-4/+4
|/ / / /
* | | | Merge pull request #8755 from owncloud/fix-8737-masterVincent Petry2014-05-281-2/+2
|\ \ \ \
| * | | | 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 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 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 grammarVolkan Gezer2014-05-251-2/+2
* | | | | Merge pull request #8136 from owncloud/contactsmanager-registerBart Visscher2014-05-273-37/+71
|\ \ \ \ \
| * | | | | no return on register and unregisterThomas Müller2014-05-191-2/+2
| * | | | | Merge branch 'master' into contactsmanager-registerThomas Müller2014-05-191822-48608/+102803
| |\ \ \ \ \
| * | | | | | Fix wrong var nameBart Visscher2014-04-261-1/+1
| * | | | | | Merge branch 'master' into contactsmanager-registerBart Visscher2014-04-261201-25369/+58821
| |\ \ \ \ \ \
| * | | | | | | 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 translationsVolkan Gezer2014-05-271-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #8740 from owncloud/l10n-forgotten-tagsVolkan Gezer2014-05-271-2/+2
|\ \ \ \ \ \ \
| * | | | | | | reverts 188c543 and translates only mailVolkan Gezer2014-05-271-2/+2
* | | | | | | | Merge pull request #8736 from owncloud/appinfo-newrequirefieldsVincent Petry2014-05-2711-103/+284
|\ \ \ \ \ \ \ \
| * | | | | | | | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-278-12/+12