Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | Roeland Jago Douma | 2016-02-16 | 2 | -42/+15 |
* | | Merge pull request #22338 from owncloud/fix_22247 | Thomas Müller | 2016-02-16 | 2 | -9/+10 |
|\ \ | |||||
| * | | 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 | 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 - 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 | 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 | Vincent Petry | 2016-02-15 | 2 | -9/+36 |
| | |/ / | |/| | | |||||
* | | | | 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 | Morris Jobke | 2016-02-15 | 1 | -5/+5 |
* | | | | | Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-... | Thomas Müller | 2016-02-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | 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 the user ... | Thomas Müller | 2016-02-15 | 2 | -2/+44 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22403 from owncloud/improved-error-handling | Thomas Müller | 2016-02-16 | 5 | -9/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | forbidden (403) is a valid return status, don't log the whole exception in th... | Bjoern Schiessle | 2016-02-15 | 2 | -4/+12 |
| * | | | | | | 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 |
| |/ / / / / | |||||
* | | | | | | 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. | Joachim Bauch | 2016-02-15 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | [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 | 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 | Morris Jobke | 2016-02-14 | 1 | -14/+29 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22337 from owncloud/new_reshare_no_initiator | Thomas Müller | 2016-02-15 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | The owner and recipient can also be null | Roeland Jago Douma | 2016-02-12 | 1 | -3/+3 |
| * | | | | | If the initiator no longer exists return UID | Roeland Jago Douma | 2016-02-12 | 1 | -1/+1 |
* | | | | | | 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 | 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 | 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 | 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 | 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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | [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 | 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 case insensitive | Roeland Jago Douma | 2016-02-14 | 2 | -1/+55 |
| |/ / / / | |||||
* | | | | | Merge pull request #22378 from owncloud/drop-unreachable-code | Thomas Müller | 2016-02-15 | 1 | -5/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | |