summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8700 from owncloud/design-smallfixesLukas Reschke2014-05-295-13/+30
|\
| * Fix double "saved" message when changing email settingsJoas Schilling2014-05-281-1/+1
| * move saved notification for mail server, so it's smallerJan-Christoph Borchardt2014-05-231-2/+2
| * fix border-radius in settings to 3pxJan-Christoph Borchardt2014-05-231-3/+3
| * fix height of select boxes for OS XJan-Christoph Borchardt2014-05-231-0/+5
| * use user-select: none; on header, navigation and user menuJan-Christoph Borchardt2014-05-231-4/+10
| * darken scrollbar to distinguish from selected sidebar itemsJan-Christoph Borchardt2014-05-231-3/+9
* | Merge pull request #8759 from owncloud/fix-phpunitLukas Reschke2014-05-295-143/+143
|\ \
| * | fix assertionsBernhard Posselt2014-05-281-9/+14
| * | fix 8757, get rid of service locator antipatternBernhard Posselt2014-05-285-134/+129
* | | Merge pull request #8773 from owncloud/l10n-tipsy-deleteLukas Reschke2014-05-291-1/+1
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Fixed DOM elements, styling and code style issuesVincent Petry2014-05-283-27/+24
| * | | | 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 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 managerBjoern Schiessle2014-05-282-18/+9
* | | | | | Merge pull request #8780 from owncloud/remove-deprecated-functionsBernhard Posselt2014-05-291-33/+0
|\ \ \ \ \ \
| * | | | | | Remove deprecated functionsLukas Reschke2014-05-291-33/+0
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \ \ \ \