| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-27 | 48 | -40/+206 |
| | | |||||
| * | Merge pull request #24246 from owncloud/local-invalid | Lukas Reschke | 2016-04-26 | 2 | -0/+17 |
| |\ | | | | | error out if a local storage isn't setup correctly | ||||
| | * | add tests | Robin Appelman | 2016-04-26 | 1 | -0/+14 |
| | | | |||||
| | * | error out if a local storage isn't setup correctly | Robin Appelman | 2016-04-25 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #24027 from owncloud/translate_ocs_share | Thomas Müller | 2016-04-26 | 4 | -63/+94 |
| |\ \ | | | | | | | Translate OCS Share API error messages | ||||
| | * | | Translate OCS Share API error messages | Roeland Jago Douma | 2016-04-25 | 4 | -63/+94 |
| | | | | | | | | | | | | | For https://github.com/owncloud/core/issues/22209 | ||||
| * | | | Merge pull request #24277 from owncloud/more-sanity | Thomas Müller | 2016-04-26 | 1 | -1/+9 |
| |\ \ \ | | | | | | | | | Don't write empty RewriteBase | ||||
| | * | | | Don't write empty RewriteBase | Lukas Reschke | 2016-04-26 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud may be configured to live at the root folder without a trailing slash being specified. In this case manually set the rewrite base to `/` | ||||
| * | | | | Merge pull request #24269 from owncloud/backgroundjob_psr4 | Thomas Müller | 2016-04-26 | 6 | -0/+0 |
| |\ \ \ \ | |/ / / |/| | | | Move \OC\BackgroundJob to PSR-4 | ||||
| | * | | | Move \OC\BackgroundJob to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-26 | 204 | -1114/+1230 |
| | | | | | |||||
| * | | | | Merge pull request #24256 from owncloud/scanner-propagate | Morris Jobke | 2016-04-26 | 2 | -0/+40 |
| |\ \ \ \ | | | | | | | | | | | triger the propagator from the command line scanner | ||||
| | * | | | | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 2 | -0/+40 |
| | | | | | | |||||
| * | | | | | Merge pull request #24262 from owncloud/fix-24228 | Morris Jobke | 2016-04-26 | 1 | -1/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | check whether index is set before using it | ||||
| | * | | | | | check whether index is set before using it | Arthur Schiwon | 2016-04-25 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #24199 from owncloud/ocp-repair | Morris Jobke | 2016-04-26 | 35 | -199/+369 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to thi… | ||||
| | * | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new ↵ | Thomas Müller | 2016-04-25 | 35 | -199/+369 |
| | | | | | | | | | | | | | | | | | | | | | | | | | interface - refs #24198 | ||||
| * | | | | | | Merge pull request #24268 from owncloud/search_psr4 | Thomas Müller | 2016-04-26 | 5 | -0/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Move \OC\Search to PSR-4 | ||||
| | * | | | | | | Move \OC\Search to PSR-4 | Roeland Jago Douma | 2016-04-26 | 5 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #24266 from owncloud/mimetypealiases | Roeland Douma | 2016-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | correct occ command for mimetypealiases | ||||
| | * | | | | | | correct occ command for mimetypealiases | Carla Schroder | 2016-04-25 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator | Thomas Müller | 2016-04-25 | 1 | -0/+11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | LDAP Wizard: reset connection status indicator when switching LDAP co… | ||||
| | * | | | | | | LDAP Wizard: reset connection status indicator when switching LDAP config | Arthur Schiwon | 2016-04-25 | 1 | -0/+11 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge pull request #22783 from patelfenil/bugfix-issue-17320 | Thomas Müller | 2016-04-25 | 1 | -2/+9 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove image now not coming when user changes fullname. Fixes #17320 | ||||
| | * | | | | | | Remove image now not coming when user changes fullname. Fixes #17320 | patelfenil | 2016-03-07 | 1 | -2/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #22648 from owncloud/propagate-single | Thomas Müller | 2016-04-25 | 8 | -29/+56 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | do propagation in a single query | ||||
| | * | | | | | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 8 | -29/+56 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #24264 from owncloud/route_psr4 | Lukas Reschke | 2016-04-25 | 3 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move \OC\Route to PSR-4 | ||||
| | * | | | | | | | Move \OC\Route to PSR-4 | Roeland Jago Douma | 2016-04-25 | 3 | -0/+0 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge pull request #24251 from owncloud/fix-mailer | Roeland Douma | 2016-04-25 | 2 | -3/+8 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Allow automatic dependency injection for OCP\Mail\Mailer | ||||
| | * | | | | | | Fix the syntax and methods in the sample | Joas Schilling | 2016-04-25 | 1 | -3/+4 |
| | | | | | | | | |||||
| | * | | | | | | Allow automatic dependency injection for OCP\Mail\Mailer | Joas Schilling | 2016-04-25 | 1 | -0/+4 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge pull request #24244 from owncloud/mount-unique | Vincent Petry | 2016-04-25 | 2 | -2/+22 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | don't get the config for the same mount multiple times | ||||
| | * | | | | | add test | Robin Appelman | 2016-04-25 | 1 | -0/+11 |
| | | | | | | | |||||
| | * | | | | | don't get the config for the same mount multiple times | Robin Appelman | 2016-04-25 | 1 | -2/+11 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions | Thomas Müller | 2016-04-25 | 6 | -48/+32 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix LDAP race conditions | ||||
| | * | | | | | Fix LDAP race conditions | Morris Jobke | 2016-04-20 | 6 | -48/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values | ||||
| * | | | | | | Merge pull request #24248 from owncloud/d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | D j master | ||||
| | * \ \ \ \ \ | Merge branch 'master' of https://github.com/d--j/core into d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Call private cache methods only for `OC\Files\Cache\Cache` | Daniel Jagszent | 2016-04-15 | 5 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two implementation detail methods `correctFolderSize` and `calculateFolderSize` should only be called for instances of `OC\Files\Cache\Cache`. This commit adds guarding checks whenever they are called. | ||||
| * | | | | | | | | Merge pull request #24247 from owncloud/weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Weits patch 1 | ||||
| | * | | | | | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
| |/| | | | | | | | |||||
| | * | | | | | | | solves problem with moving files via WebDAV | Petr Svoboda | 2016-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving files via WebDAV I sometimes got PHP Fatal error: Nesting level too deep - recursive dependency? in /var/www/owncloud/lib/private/files/view.php on line 729 This small change has fixed the problem for me | ||||
| * | | | | | | | | Merge pull request #24205 from owncloud/scanner-locking | Thomas Müller | 2016-04-25 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add locks in the scanner to prevent multiple scanners running on the … | ||||
| | * | | | | | | | | add locks in the scanner to prevent multiple scanners running on the same files | Robin Appelman | 2016-04-25 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement | Thomas Müller | 2016-04-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add missing use statement | ||||
| | * | | | | | | | | | Add missing use statement | Joas Schilling | 2016-04-25 | 1 | -0/+1 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #24231 from owncloud/updater_psr4 | Thomas Müller | 2016-04-25 | 1 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move \OC\Updater to PSR-4 | ||||
| | * | | | | | | | | | Move \OC\Updater to PSR-4 | Roeland Jago Douma | 2016-04-25 | 1 | -0/+0 |
| | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #24230 from owncloud/you-form-of-activities | Lukas Reschke | 2016-04-25 | 1 | -0/+35 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Translate the current user with "You ..." | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |