Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle | Thomas Müller | 2016-02-18 | 2 | -0/+20 |
|\ | |||||
| * | Make sure our index names fit in oracle | Joas Schilling | 2016-02-16 | 1 | -0/+11 |
| * | Add index names so Doctrine does not use a too long random string | Joas Schilling | 2016-02-15 | 1 | -0/+9 |
* | | Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares | Thomas Müller | 2016-02-18 | 2 | -7/+356 |
|\ \ | |||||
| * | | Add unit tests for formatShare | Roeland Jago Douma | 2016-02-17 | 1 | -0/+325 |
| * | | OCS Share API should not return invalid shares | Roeland Jago Douma | 2016-02-17 | 2 | -7/+31 |
* | | | Merge pull request #22478 from owncloud/external-missing-auth | Thomas Müller | 2016-02-18 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | dont die when missing an auth backend | Robin Appelman | 2016-02-17 | 1 | -0/+7 |
* | | | | Merge pull request #22475 from owncloud/fix-js-issues | Thomas Müller | 2016-02-18 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fixes code analysis issues | Morris Jobke | 2016-02-17 | 1 | -2/+2 |
* | | | | | Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-othe... | Thomas Müller | 2016-02-18 | 2 | -9/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Show the comments and tags on the share filters | Joas Schilling | 2016-02-16 | 2 | -9/+8 |
* | | | | | | Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection | Thomas Müller | 2016-02-18 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix GDrive mime type detection with encryption | Vincent Petry | 2016-02-15 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #22491 from pra85/patch-1 | Thomas Müller | 2016-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix a typo in Readme | Prayag Verma | 2016-02-18 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #22446 from owncloud/3rdparty-adjustment | Thomas Müller | 2016-02-17 | 1 | -0/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add new patchwork references | Lukas Reschke | 2016-02-17 | 1 | -0/+0 |
* | | | | | Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswell | Thomas Müller | 2016-02-17 | 1 | -9/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Check the mailmap file of core as well | Joas Schilling | 2016-02-17 | 1 | -1/+28 |
| * | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 una... | Thomas Müller | 2016-02-15 | 1 | -0/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22468 from owncloud/files_external-global | Thomas Müller | 2016-02-17 | 9 | -272/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix redundant headers in files dav client | Vincent Petry | 2016-02-16 | 1 | -12/+7 |
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
* | | | | | | 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 | 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 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 | Vincent Petry | 2016-02-16 | 1 | -2/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22419 from owncloud/issue-20663-console-add-user-group-wi... | Thomas Müller | 2016-02-17 | 1 | -1/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fixes #22158 | Erik Pellikka | 2016-02-16 | 1 | -1/+4 |
* | | | | | | [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 | Robin Appelman | 2016-02-16 | 4 | -185/+4 |
| | |/ / | |/| | |