| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Handles null as return code and uses proper UserFolder in trashbin | Morris Jobke | 2016-02-16 | 2 | -7/+11 |
| | | |||||
| * | Merge pull request #22432 from owncloud/files_external-backends | Thomas Müller | 2016-02-16 | 4 | -185/+4 |
| |\ | | | | | remove login credentails and user provided backends | ||||
| | * | remove login credentails and user provided backends | Robin Appelman | 2016-02-16 | 4 | -185/+4 |
| | | | |||||
| * | | Merge pull request #22429 from owncloud/fix-coverage-reporting | Thomas Müller | 2016-02-16 | 1 | -11/+12 |
| |\ \ | | | | | | | Fix coverage reporting | ||||
| | * | | Fix coverage reporting | Thomas Müller | 2016-02-16 | 1 | -11/+12 |
| | | | | |||||
| * | | | Merge pull request #22430 from owncloud/add-new-apps-to-transifex | Thomas Müller | 2016-02-16 | 194 | -0/+1172 |
| |\ \ \ | |/ / |/| | | Adding transifex to new core apps | ||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-16 | 188 | -0/+1142 |
| | | | | |||||
| | * | | Adding transifex to new core apps | Thomas Müller | 2016-02-16 | 6 | -0/+30 |
| |/ / | |||||
| * | | Merge pull request #22413 from owncloud/kill-coverage-on-scrutinizer | Thomas Müller | 2016-02-16 | 2 | -4/+59 |
| |\ \ | | | | | | | No more code coverage on scrutinizer | ||||
| | * | | Add script to generate coverage badges | Thomas Müller | 2016-02-16 | 1 | -0/+59 |
| | | | | |||||
| | * | | No more code coverage on scrutinizer | Thomas Müller | 2016-02-16 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge pull request #22416 from owncloud/fix_22402 | Thomas Müller | 2016-02-16 | 2 | -42/+15 |
| |\ \ \ | | | | | | | | | Return proper error string if sharing for this user is disabled | ||||
| | * | | | Return proper error string if sharing for this user is disabled | Roeland Jago Douma | 2016-02-16 | 2 | -42/+15 |
| | | | | | | | | | | | | | | | | | Fixes #22402 | ||||
| * | | | | Merge pull request #22338 from owncloud/fix_22247 | Thomas Müller | 2016-02-16 | 2 | -9/+10 |
| |\ \ \ \ | | | | | | | | | | | Allow more characters in filenames | ||||
| | * | | | | Fix unit tests | Roeland Jago Douma | 2016-02-12 | 1 | -7/+7 |
| | | | | | | |||||
| | * | | | | More characters are allowed on POSIX systems | Roeland Jago Douma | 2016-02-12 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #22417 from owncloud/issue-22389-duplicate-output-message | Morris Jobke | 2016-02-16 | 1 | -4/+0 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Remove inaccurate "is already enabled" message | ||||
| | * | | | | Remove inaccurate "is already enabled" message | Joas Schilling | 2016-02-16 | 1 | -4/+0 |
| |/ / / / | |||||
| * | | | | Merge pull request #22398 from owncloud/fix-card-properties | Thomas Müller | 2016-02-16 | 4 | -15/+18 |
| |\ \ \ \ | | | | | | | | | | | Queries on the cards table by uri require the addressbook as well | ||||
| | * | | | | Queries on the cards table by uri require the addressbook as well - fixes #22284 | Thomas Müller | 2016-02-15 | 4 | -15/+18 |
| | | | | | | |||||
| * | | | | | Merge pull request #22390 from owncloud/update-tarstreamer | Thomas Müller | 2016-02-16 | 1 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Update TarStreamer to v0.1.0 | ||||
| | * | | | | | Update TarStreamer to v0.1.0 | Thomas Müller | 2016-02-15 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22400 from owncloud/files-select-closesidebar | Thomas Müller | 2016-02-16 | 2 | -9/+36 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Close file detail sidebar when selecting/unselecting files | ||||
| | * | | | | | Close file detail sidebar when selecting/unselecting files | Vincent Petry | 2016-02-15 | 2 | -9/+36 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Interacting with the checkboxes, also "Select all" will automatically close the sidebar now. | ||||
| * | | | | | Merge pull request #22377 from owncloud/remove-unneeded-code | Thomas Müller | 2016-02-16 | 1 | -5/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove unneeded parameter from OC_App::getEnabledApps | ||||
| | * | | | | | Remove unneeded parameter from OC_App::getEnabledApps | Morris Jobke | 2016-02-15 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22385 from ↵ | Thomas Müller | 2016-02-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-22384-invalid-content-location-on-commenting Posting a comment replies with invalid location URL | ||||
| | * | | | | | | Deduplicate slashes | Joas Schilling | 2016-02-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #22392 from owncloud/create-default-calendar-and-addressbook | Thomas Müller | 2016-02-16 | 2 | -2/+44 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | On login we create a default calendar and a default addressbook for t… | ||||
| | * | | | | | | | On login we create a default calendar and a default addressbook for the user ↵ | Thomas Müller | 2016-02-15 | 2 | -2/+44 |
| | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | - fixes #22360 | ||||
| * | | | | | | | Merge pull request #22403 from owncloud/improved-error-handling | Thomas Müller | 2016-02-16 | 5 | -9/+41 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove background job if the server accepted to ask for the shared secret | ||||
| | * | | | | | | | forbidden (403) is a valid return status, don't log the whole exception in ↵ | Bjoern Schiessle | 2016-02-15 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this case | ||||
| | * | | | | | | | throw exception if we don't find a token for a given server | Bjoern Schiessle | 2016-02-15 | 1 | -0/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove background job if the server accepted to ask for the shared secret | Bjoern Schiessle | 2016-02-15 | 2 | -5/+23 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't remove it the server will later ask the remote server to ask for the shared secret which will result in a error log message on the remote server and in some circumstances maybe even to a failure | ||||
| * | | | | | | | Merge pull request #22407 from fancycode/untrusted_domain | Thomas Müller | 2016-02-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Pass checked host as "domain" variable to "untrustedDomain" template. | ||||
| | * | | | | | | Pass checked host as "domain" variable to "untrustedDomain" template. | Joachim Bauch | 2016-02-15 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty). | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-16 | 138 | -130/+48 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22406 from pierreozoux/patch-1 | Thomas Müller | 2016-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | typo | ||||
| | * | | | | | | typo | Pierre Ozoux | 2016-02-15 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #22376 from owncloud/fix-return-code-getAppPath | Thomas Müller | 2016-02-15 | 1 | -14/+29 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Properly handle return code of OC_App::getAppPath | ||||
| | * | | | | | Properly handle return code of OC_App::getAppPath | Morris Jobke | 2016-02-14 | 1 | -14/+29 |
| | | |/ / / | |/| | | | | | | | | | | | | | | | | | | * fixes #20128 * getAppPath could return false, but it was not handled everywhere | ||||
| * | | | | | 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 |
| | |/ / / / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |