| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #22337 from owncloud/new_reshare_no_initiator | Thomas Müller | 2016-02-15 | 1 | -4/+4 |
| |\ | | | | | On backend hickups don't crash OCS output | ||||
| | * | The owner and recipient can also be null | Roeland Jago Douma | 2016-02-12 | 1 | -3/+3 |
| | | | | | | | | | | | If we have backend hickups it can be that we are unable to retrive the owner and recipient user as well. In such cases just return the UID. | ||||
| | * | If the initiator no longer exists return UID | Roeland Jago Douma | 2016-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | It can happen that the share initiator is deleted. Because of the new resharing behaviour this share then still exists. We just can fetch the displayname properly. | ||||
| * | | Merge pull request #22358 from owncloud/fix-22278 | Thomas Müller | 2016-02-15 | 4 | -5/+32 |
| |\ \ | | | | | | | Fix race condition when switching filter mode. Fixes #22278 | ||||
| | * | | Fix race condition when switching filter mode. Fixes #22278 | Arthur Schiwon | 2016-02-12 | 4 | -5/+32 |
| | | | | |||||
| * | | | Merge pull request #22379 from owncloud/limit-scrutinizer-scope | Thomas Müller | 2016-02-15 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | Limit scope of scrutinizer to actual application code | ||||
| | * | | | Limit scope of scrutinizer to actual application code | Morris Jobke | 2016-02-14 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Merge pull request #22381 from owncloud/remove-not-needed-variable | Thomas Müller | 2016-02-15 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | Remove not needed variable | ||||
| | * | | | | Remove not needed variable | Morris Jobke | 2016-02-14 | 1 | -1/+0 |
| | |/ / / | |||||
| * | | | | Merge pull request #22383 from owncloud/better-sharee-translations | Thomas Müller | 2016-02-15 | 1 | -3/+10 |
| |\ \ \ \ | | | | | | | | | | | Do not use string concatination for translations | ||||
| | * | | | | Do not use string concatination for translations | Joas Schilling | 2016-02-15 | 1 | -3/+10 |
| | | | | | | |||||
| * | | | | | Merge pull request #22350 from owncloud/fix_22304 | Thomas Müller | 2016-02-15 | 3 | -8/+30 |
| |\ \ \ \ \ | |/ / / / |/| | | | | WebUI feedback when sharing | ||||
| | * | | | | Updated unit tests | Roeland Jago Douma | 2016-02-12 | 1 | -1/+15 |
| | | | | | | |||||
| | * | | | | Provide proper feedback when creating a share in the webUI | Roeland Jago Douma | 2016-02-12 | 2 | -7/+15 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #22304 Creating a share is not instant (especially not for federated shares) so we should show that something is happening in the webUI properly. | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-15 | 44 | -2/+318 |
| | | | | | |||||
| * | | | | Merge pull request #22380 from owncloud/make-scrutinizer-happy | Thomas Müller | 2016-02-15 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix typo in PHPDoc | ||||
| | * | | | | Fix typo in PHPDoc | Morris Jobke | 2016-02-14 | 2 | -2/+2 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #22375 from owncloud/fix_22352 | Thomas Müller | 2016-02-15 | 2 | -1/+55 |
| |\ \ \ \ | | | | | | | | | | | Search tags in UI case insensitive | ||||
| | * | | | | Search tags case insensitive | Roeland Jago Douma | 2016-02-14 | 2 | -1/+55 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | fixes: #22352 * Added unit tests | ||||
| * | | | | Merge pull request #22378 from owncloud/drop-unreachable-code | Thomas Müller | 2016-02-15 | 1 | -5/+0 |
| |\ \ \ \ | |/ / / |/| | | | Remove unreachable code in priavte/api.php | ||||
| | * | | | Remove unreachable code in priavte/api.php | Morris Jobke | 2016-02-14 | 1 | -5/+0 |
| |/ / / | |||||
| * | | | Merge pull request #22369 from owncloud/fix-bmp-support | Thomas Müller | 2016-02-14 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Fix BMP support | ||||
| | * | | | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | * fixes #16461 | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-14 | 136 | -0/+152 |
| | | | | |||||
| * | | | Merge pull request #22357 from owncloud/tags-hideonrename | Thomas Müller | 2016-02-13 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | Properly hide tag name on rename | ||||
| | * | | | Properly hide tag name on rename | Vincent Petry | 2016-02-12 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Merge pull request #22351 from owncloud/fix_22277 | Thomas Müller | 2016-02-13 | 3 | -5/+173 |
| |\ \ \ \ | | | | | | | | | | | show remote server on federated share auto-complete | ||||
| | * | | | | show remote server on auto complete | Bjoern Schiessle | 2016-02-12 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | add remote server to the result | Bjoern Schiessle | 2016-02-12 | 2 | -4/+168 |
| | | | | | | |||||
| * | | | | | Merge pull request #22345 from ↵ | Thomas Müller | 2016-02-13 | 3 | -2/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/make-note-if-appcodechecker-is-not-enabled Add note if integrity check is disabled | ||||
| | * | | | | | Add note if integrity check is disabled | Lukas Reschke | 2016-02-12 | 3 | -2/+23 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled. This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch) it displays now: `Appcode checker has been disabled. Integrity cannot be verified.` This is not displayed anywhere else in the UI except these URL used for us for debugging purposes. | ||||
| * | | | | | Merge pull request #22343 from owncloud/check-if-admin-user | Thomas Müller | 2016-02-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Check if admin user | ||||
| | * | | | | | Check if admin user | Lukas Reschke | 2016-02-12 | 1 | -1/+1 |
| | |/ / / / | | | | | | | | | | | | | | | | We should not add the JS for not admin users. | ||||
| * | | | | | Merge pull request #22331 from owncloud/dav-nonexisting-part | Thomas Müller | 2016-02-13 | 2 | -1/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix getNodeForPath for non existing part files | ||||
| | * | | | | | fix getNodeForPath for non existing part files | Robin Appelman | 2016-02-11 | 2 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-13 | 28 | -6/+226 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge pull request #22354 from owncloud/only-register-when-available | Thomas Müller | 2016-02-12 | 1 | -2/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Only register admin page when update is available | ||||
| | * | | | | | Only register admin page when update is available | Lukas Reschke | 2016-02-12 | 1 | -2/+1 |
| |/ / / / / | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22353 | ||||
| * | | | | | Merge pull request #21832 from owncloud/reduce-user-object-issues | Thomas Müller | 2016-02-12 | 1 | -15/+10 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Always set up a config object within the user object | ||||
| | * | | | | Always set up a config object within the user object | Morris Jobke | 2016-02-12 | 1 | -15/+10 |
| |/ / / / | | | | | | | | | | | | | * the new getEmailAddress and setEmailAddress relies on this anyway | ||||
| * | | | | Merge pull request #22349 from owncloud/icon-updates | Thomas Müller | 2016-02-12 | 5 | -2/+13 |
| |\ \ \ \ | | | | | | | | | | | icon fixes: comments, delete | ||||
| | * | | | | add proper comment icon and add it to icons.css | Jan-Christoph Borchardt | 2016-02-12 | 3 | -2/+6 |
| | | | | | | |||||
| | * | | | | add white delete icon | Jan-Christoph Borchardt | 2016-02-12 | 3 | -0/+7 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #21837 from owncloud/recipients-error-message | Thomas Müller | 2016-02-12 | 1 | -2/+28 |
| |\ \ \ \ | | | | | | | | | | | First try for shareWithField error message | ||||
| | * | | | | Clear error when removing text | Roeland Jago Douma | 2016-02-12 | 1 | -1/+16 |
| | | | | | | |||||
| | * | | | | Update tooltip on new search | Roeland Jago Douma | 2016-02-12 | 1 | -8/+12 |
| | | | | | | |||||
| | * | | | | First try for shareWithField error message | Julian Müller | 2016-02-12 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | Second try for ShareWithField error message | ||||
| * | | | | | Merge pull request #22292 from owncloud/smb-handle-forbidden | Thomas Müller | 2016-02-12 | 1 | -1/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | handle forbidden exceptions in smb backend | ||||
| | * | | | | | handle forbidden exceptions in smb backend | Robin Appelman | 2016-02-10 | 1 | -1/+18 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22294 from owncloud/carddav-report-list-groups-2 | Thomas Müller | 2016-02-12 | 5 | -2/+119 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding a custom webdav property which holds the list of contacts groups | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |