Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Allow the script to run for different git roots | Joas Schilling | 2016-02-17 | 1 | -8/+25 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #16783 from owncloud/handle-redirects-global | Thomas Müller | 2016-02-17 | 9 | -20/+130 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding global error handler for ajax calls which run into redirection… | |||||
| * | | | | | | Send 401 header for OC_JSON::checkLoggedIn() | Lukas Reschke | 2016-02-16 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Catch auth coming from JS in OCS | Lukas Reschke | 2016-02-15 | 1 | -2/+9 | |
| | | | | | | | ||||||
| * | | | | | | Add handler for global ajax errors | Vincent Petry | 2016-02-15 | 7 | -22/+117 | |
| | | | | | | | ||||||
| * | | | | | | Adding global error handler for ajax calls which run into redirections or ↵ | Thomas Müller | 2016-02-15 | 1 | -0/+7 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | unauthorized responses | |||||
* | | | | | | Merge pull request #22468 from owncloud/files_external-global | Thomas Müller | 2016-02-17 | 9 | -272/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove global credentials | |||||
| * | | | | | | remove global credentials | Robin Appelman | 2016-02-17 | 9 | -272/+3 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #22470 from owncloud/minimum-phpunit-4.4 | Thomas Müller | 2016-02-17 | 3 | -173/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Minimum phpunit 4.4 | |||||
| * | | | | | Kill no longer used autotest.cmd | Thomas Müller | 2016-02-17 | 1 | -169/+0 | |
| | | | | | | ||||||
| * | | | | | We require minimum PHPUnit 4.4 | Thomas Müller | 2016-02-17 | 2 | -4/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #22445 from owncloud/files-client-sendpropfindheaders | Thomas Müller | 2016-02-17 | 2 | -17/+14 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Files DAV client send propfind headers | |||||
| * | | | | Fix redundant headers in files dav client | Vincent Petry | 2016-02-16 | 1 | -12/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | The defaultHeaders are already injected with the xhrProvider, so no need to pass them again a second time. | |||||
| * | | | | Update davclient library for propfind headers | Vincent Petry | 2016-02-16 | 1 | -5/+7 | |
| | | | | | ||||||
* | | | | | Merge pull request #22452 from owncloud/fix_22441 | Thomas Müller | 2016-02-17 | 2 | -0/+43 | |
|\ \ \ \ \ | | | | | | | | | | | | | Unlock sharee input field when sharing fails | |||||
| * | | | | | Do not clear sharee input on failed share | Roeland Jago Douma | 2016-02-17 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Unlock sharee input field when sharing fails | Roeland Jago Douma | 2016-02-17 | 2 | -0/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22441 When addShares fails (for whatever reason) we should unlock the sharee input field so the user does not have to reload the page. | |||||
* | | | | | | Merge pull request #22451 from owncloud/use-proper-user-folder | Thomas Müller | 2016-02-17 | 2 | -7/+11 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Handles null as return code and uses proper UserFolder in trashbin | |||||
| * | | | | | | Handles null as return code and uses proper UserFolder in trashbin | Morris Jobke | 2016-02-16 | 2 | -7/+11 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #22437 from owncloud/fix_14095 | Thomas Müller | 2016-02-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow searching for single character users to share with | |||||
| * | | | | | | Allow searching for single user | Roeland Jago Douma | 2016-02-16 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #22435 from owncloud/trashbin-hook-nouser | Thomas Müller | 2016-02-17 | 1 | -2/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't resize trash when no user | |||||
| * | | | | | | Don't resize trash when no user | Vincent Petry | 2016-02-16 | 1 | -2/+5 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | Happens when overwriting files on federated shares. | |||||
* | | | | | | Merge pull request #22419 from ↵ | Thomas Müller | 2016-02-17 | 1 | -1/+10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-20663-console-add-user-group-with-shares Make sure to init the users Filesystem so we can add group shares | |||||
| * | | | | | | Make sure to init the users Filesystem so we can add group shares | Joas Schilling | 2016-02-16 | 1 | -1/+10 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #22299 from owncloud/erikpel-css-fix | Thomas Müller | 2016-02-17 | 1 | -1/+4 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | App navigation scrolling (Possible fix for #22158) | |||||
| * | | | | | Fixes #22158 | Erik Pellikka | 2016-02-16 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | changed 620px to calc(100vh - 100px); | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-17 | 374 | -74/+2840 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | 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 |