summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a warning to the configuration fileLukas Reschke2014-05-291-0/+6
* Merge pull request #8554 from owncloud/add_resetadminpass_commandAndreas Fischer2014-05-292-0/+80
|\
| * Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_commandAndreas Fischer2014-05-281712-41983/+77500
| |\
| * | Move resetpassword into user: command space.Andreas Fischer2014-05-282-3/+3
| * | Document type of user project.Andreas Fischer2014-05-281-0/+1
| * | Receive \OC\User\Manager as a constructor dependency.Andreas Fischer2014-05-282-3/+11
| * | Use userManager, color output, return 1 on errorkondou2014-05-241-8/+17
| * | Add doc, check return-value, fix spacing, require interactivekondou2014-05-131-6/+15
| * | Back to the futureLukas Reschke2014-05-121-1/+1
| * | Make ResetAdminPass to ResetPasswordkondou2014-05-123-37/+53
| * | Add a resetadminpass command to console - fix #8248kondou2014-05-122-0/+37
* | | Merge pull request #3908 from owncloud/storage-folder-copy-renameicewind19912014-05-296-116/+290
|\ \ \
| * | | Remove code duplicationRobin Appelman2014-05-281-20/+21
| * | | Fix LocalStorage->unlink to work on folder as expectedRobin Appelman2014-05-282-2/+9
| * | | re-use rescursive copy from common storageRobin Appelman2014-05-281-16/+1
| * | | remove unneeded checkRobin Appelman2014-05-281-2/+2
| * | | use \OC\Files\Filesystem::isIgnoredDirRobin Appelman2014-05-283-62/+86
| * | | fix illegal usage of unlink in test caseRobin Appelman2014-05-281-1/+1
| * | | fix recursive copy and rename for common storage backendRobin Appelman2014-05-281-9/+38
| * | | fix recursive copy and rename for mapped local storage backendRobin Appelman2014-05-281-10/+27
| * | | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2977-296/+374
* | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |