| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #8700 from owncloud/design-smallfixes | Lukas Reschke | 2014-05-29 | 5 | -13/+30 |
| |\ | | | | | Design detail fixes | ||||
| | * | Fix double "saved" message when changing email settings | Joas Schilling | 2014-05-28 | 1 | -1/+1 |
| | | | |||||
| | * | move saved notification for mail server, so it's smaller | Jan-Christoph Borchardt | 2014-05-23 | 1 | -2/+2 |
| | | | |||||
| | * | fix border-radius in settings to 3px | Jan-Christoph Borchardt | 2014-05-23 | 1 | -3/+3 |
| | | | |||||
| | * | fix height of select boxes for OS X | Jan-Christoph Borchardt | 2014-05-23 | 1 | -0/+5 |
| | | | |||||
| | * | use user-select: none; on header, navigation and user menu | Jan-Christoph Borchardt | 2014-05-23 | 1 | -4/+10 |
| | | | |||||
| | * | darken scrollbar to distinguish from selected sidebar items | Jan-Christoph Borchardt | 2014-05-23 | 1 | -3/+9 |
| | | | |||||
| * | | Merge pull request #8759 from owncloud/fix-phpunit | Lukas Reschke | 2014-05-29 | 5 | -143/+143 |
| |\ \ | | | | | | | fix 8757, get rid of service locator antipattern | ||||
| | * | | fix assertions | Bernhard Posselt | 2014-05-28 | 1 | -9/+14 |
| | | | | |||||
| | * | | fix 8757, get rid of service locator antipattern | Bernhard Posselt | 2014-05-28 | 5 | -134/+129 |
| | | | | |||||
| * | | | Merge pull request #8773 from owncloud/l10n-tipsy-delete | Lukas Reschke | 2014-05-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | show delete hint text on hovering trash | ||||
| | * | | | show delete hint text on hovering trash | Volkan Gezer | 2014-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #8727 from owncloud/upgrade-overview | Lukas Reschke | 2014-05-29 | 9 | -31/+163 |
| |\ \ \ \ | | | | | | | | | | | Added update overview page | ||||
| | * | | | | Fixed DOM elements, styling and code style issues | Vincent Petry | 2014-05-28 | 3 | -27/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Reduced number of DOM elements - Also added mention of "config" backup. | ||||
| | * | | | | Fixed styles in update overview page | Vincent Petry | 2014-05-27 | 2 | -9/+19 |
| | | | | | | |||||
| | * | | | | Now showing disabled apps as upgrade status line | Vincent Petry | 2014-05-27 | 6 | -4/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Added app id in update overview. - Added status message for disabled app for CLI upgrade and web upgrade | ||||
| | * | | | | Added update overview page | Vincent Petry | 2014-05-27 | 4 | -30/+133 |
| | | | | | | |||||
| * | | | | | Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager | Robin McCorkell | 2014-05-29 | 2 | -18/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | get mount point from mount manager | ||||
| | * | | | | | get mount point from mount manager | Bjoern Schiessle | 2014-05-28 | 2 | -18/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #8780 from owncloud/remove-deprecated-functions | Bernhard Posselt | 2014-05-29 | 1 | -33/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove deprecated functions | ||||
| | * | | | | | | Remove deprecated functions | Lukas Reschke | 2014-05-29 | 1 | -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_command | Andreas Fischer | 2014-05-29 | 2 | -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_command | Andreas Fischer | 2014-05-28 | 1712 | -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 Fischer | 2014-05-28 | 2 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Document type of user project. | Andreas Fischer | 2014-05-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Receive \OC\User\Manager as a constructor dependency. | Andreas Fischer | 2014-05-28 | 2 | -3/+11 |
| | | | | | | | | |||||
| | * | | | | | | Use userManager, color output, return 1 on error | kondou | 2014-05-24 | 1 | -8/+17 |
| | | | | | | | | |||||
| | * | | | | | | Add doc, check return-value, fix spacing, require interactive | kondou | 2014-05-13 | 1 | -6/+15 |
| | | | | | | | | |||||
| | * | | | | | | Back to the future | Lukas Reschke | 2014-05-12 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Make ResetAdminPass to ResetPassword | kondou | 2014-05-12 | 3 | -37/+53 |
| | | | | | | | | |||||
| | * | | | | | | Add a resetadminpass command to console - fix #8248 | kondou | 2014-05-12 | 2 | -0/+37 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #3908 from owncloud/storage-folder-copy-rename | icewind1991 | 2014-05-29 | 6 | -116/+290 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Recursive copy and remove for local storage backends | ||||
| | * | | | | | | | Remove code duplication | Robin Appelman | 2014-05-28 | 1 | -20/+21 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix LocalStorage->unlink to work on folder as expected | Robin Appelman | 2014-05-28 | 2 | -2/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | re-use rescursive copy from common storage | Robin Appelman | 2014-05-28 | 1 | -16/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | remove unneeded check | Robin Appelman | 2014-05-28 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | use \OC\Files\Filesystem::isIgnoredDir | Robin Appelman | 2014-05-28 | 3 | -62/+86 |
| | | | | | | | | | |||||
| | * | | | | | | | fix illegal usage of unlink in test case | Robin Appelman | 2014-05-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | fix recursive copy and rename for common storage backend | Robin Appelman | 2014-05-28 | 1 | -9/+38 |
| | | | | | | | | | |||||
| | * | | | | | | | fix recursive copy and rename for mapped local storage backend | Robin Appelman | 2014-05-28 | 1 | -10/+27 |
| | | | | | | | | | |||||
| | * | | | | | | | add recursive copy to local storage backend | Robin Appelman | 2014-05-28 | 2 | -7/+84 |
| | | | | | | | | | |||||
| | * | | | | | | | fix recursive rename for local storage backend | Robin Appelman | 2014-05-28 | 2 | -2/+20 |
| | | | | | | | | | |||||
| | * | | | | | | | remove unneeded delTree | Robin Appelman | 2014-05-28 | 1 | -25/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | aditional test cases for copy and rename | Robin Appelman | 2014-05-28 | 1 | -0/+40 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-29 | 77 | -296/+374 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #8748 from owncloud/cli_maintenance_mode | Andreas Fischer | 2014-05-29 | 2 | -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_Config | scolebrook | 2014-05-28 | 2 | -6/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Changed class name to mode | scolebrook | 2014-05-28 | 2 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add ability to enable/disable maintenance mode from cli. | scolebrook | 2014-05-27 | 2 | -0/+53 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #8547 from owncloud/path-length-master | Thomas Müller | 2014-05-29 | 4 | -5/+141 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Handling long paths properly in \OC\Files\View | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |