summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8773 from owncloud/l10n-tipsy-deleteLukas Reschke2014-05-291-1/+1
|\ | | | | show delete hint text on hovering trash
| * show delete hint text on hovering trashVolkan Gezer2014-05-281-1/+1
| |
* | Merge pull request #8727 from owncloud/upgrade-overviewLukas Reschke2014-05-299-31/+163
|\ \ | | | | | | Added update overview page
| * | Fixed DOM elements, styling and code style issuesVincent Petry2014-05-283-27/+24
| | | | | | | | | | | | | | | - Reduced number of DOM elements - Also added mention of "config" backup.
| * | Fixed styles in update overview pageVincent Petry2014-05-272-9/+19
| | |
| * | Now showing disabled apps as upgrade status lineVincent Petry2014-05-276-4/+26
| | | | | | | | | | | | | | | - Added app id in update overview. - Added status message for disabled app for CLI upgrade and web upgrade
| * | Added update overview pageVincent Petry2014-05-274-30/+133
| | |
* | | Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanagerRobin McCorkell2014-05-292-18/+9
|\ \ \ | | | | | | | | get mount point from mount manager
| * | | get mount point from mount managerBjoern Schiessle2014-05-282-18/+9
| | | |
* | | | Merge pull request #8780 from owncloud/remove-deprecated-functionsBernhard Posselt2014-05-291-33/+0
|\ \ \ \ | | | | | | | | | | Remove deprecated functions
| * | | | Remove deprecated functionsLukas Reschke2014-05-291-33/+0
|/ / / / | | | | | | | | | | | | | | | | This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7. Ref https://github.com/owncloud/core/commit/c4b8bb10411a4d601b7f4c8758980005f14850ab
* | | | Merge pull request #8554 from owncloud/add_resetadminpass_commandAndreas Fischer2014-05-292-0/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a resetadminpass command to console * owncloud/add_resetadminpass_command: Move resetpassword into user: command space. Document type of user project. Receive \OC\User\Manager as a constructor dependency. Use userManager, color output, return 1 on error Add doc, check return-value, fix spacing, require interactive Back to the future Make ResetAdminPass to ResetPassword Add a resetadminpass command to console - fix #8248
| * \ \ \ Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_commandAndreas Fischer2014-05-281712-41983/+77500
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (238 commits) Change visibility of scanner internals [tx-robot] updated from transifex remove legacy OC_Filesystem being used in a hook callback add title property to share dialog forgotten infobox messages translations reverts 188c543 and translates only mail fix warning text and margin Adjust core apps to use "requiremin" instead of "require" Added requiremin/requiremax fields for apps [tx-robot] updated from transifex unwrapped strings fix allow resharing of files with only share permissions don't lose file size during rename drop superflous statement in phpdoc add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook [tx-robot] updated from transifex fix grammar make user_ldap fully translatable [tx-robot] updated from transifex fix typo ... Conflicts: core/register_command.php
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Recursive copy and remove for local storage backends
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to enable/disable maintenance mode from cli. * owncloud/cli_maintenance_mode: Use OC\Config instead of OC_Config Changed class name to mode Add ability to enable/disable maintenance mode from cli.
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Handling long paths properly in \OC\Files\View
| * | | | | | | # This is a combination of 2 commits.Thomas Müller2014-05-284-5/+141
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # The first commit's message is: adding tests for long paths increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096) increment version to trigger database migration adding unit test for too long path # This is the 2nd commit message: fix too long path
* | | | | | | Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailerLukas Reschke2014-05-283-3/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | upgraded phpmailer into v5.2.8 via composer
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Record login timestamp per user. Required for new user managament.
| * | | | | | Merge branch 'logintimestamp' of git://github.com/owncloud/core into ↵Arthur Schiwon2014-05-261-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | logintimestamp
| | * | | | | | 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 ↵Arthur Schiwon2014-05-261-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | class descripttion. Also fixes documentation of postLogin hook