Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Throw exception on `getPath` if file does not exist | Lukas Reschke | 2015-10-25 | 14 | -54/+121 | |
|/ / / | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-25 | 24 | -26/+100 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-24 | 142 | -150/+124 | |
* | | | Merge pull request #20013 from owncloud/guzzlehttp-guzzle-5.3.0 | Thomas Müller | 2015-10-23 | 1 | -0/+0 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Bump 3rdparty for guzzlehttp/http to 5.3.0 | Roeland Jago Douma | 2015-10-23 | 1 | -0/+0 | |
|/ / | ||||||
* | | Merge pull request #20004 from owncloud/dont-lock-user-files | Thomas Müller | 2015-10-23 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Dont lock /$user/files | Robin Appelman | 2015-10-23 | 1 | -1/+1 | |
* | | | Merge pull request #19987 from owncloud/full_sabre_2.1.7 | Thomas Müller | 2015-10-23 | 1 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Bump 3rdparty to have full sabre/dav-2.1.7 | Roeland Jago Douma | 2015-10-23 | 1 | -0/+0 | |
|/ / / | ||||||
* | | | Merge pull request #19977 from owncloud/provisioning_api_integration_tests_ap... | Thomas Müller | 2015-10-23 | 2 | -11/+118 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | added tests for apps | Sergio Bertolin | 2015-10-22 | 2 | -0/+94 | |
| * | | added test for getting users of a group being subadmin | Sergio Bertolin | 2015-10-22 | 2 | -11/+24 | |
* | | | Merge pull request #19957 from owncloud/volter-master | Thomas Müller | 2015-10-23 | 2 | -1/+9 | |
|\ \ \ | ||||||
| * | | | Add syslog_tag docu to sample config | Steffen Lindner | 2015-10-23 | 1 | -0/+8 | |
| * | | | Expose syslog tag in the configuration | Volker Fröhlich | 2015-10-22 | 1 | -1/+1 | |
* | | | | Merge pull request #19970 from owncloud/encryption-getuidonboolean | Thomas Müller | 2015-10-23 | 1 | -4/+4 | |
|\ \ \ \ | ||||||
| * | | | | Fix "Call to a member function getUID() on boolean" in Crypt | Joas Schilling | 2015-10-22 | 1 | -4/+4 | |
* | | | | | Merge pull request #19990 from owncloud/stay-logged-in-wording | Thomas Müller | 2015-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | change wording from 'remember' to more understandable 'Stay logged in' | Jan-Christoph Borchardt | 2015-10-23 | 1 | -1/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-23 | 30 | -8/+202 | |
* | | | | | | Merge pull request #19980 from owncloud/fix-deleted-ldap-user-sharing | Thomas Müller | 2015-10-22 | 1 | -1/+7 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | handle NoUserException in sharing code | Morris Jobke | 2015-10-22 | 1 | -1/+7 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #19973 from owncloud/pear_archive_tar-1.4.1 | Thomas Müller | 2015-10-22 | 1 | -0/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Bump 3rdparty for pear/archive_tar-1.4.1 | Roeland Jago Douma | 2015-10-22 | 1 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #19967 from owncloud/assetic_1.3.1 | Thomas Müller | 2015-10-22 | 1 | -0/+0 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | 3rdparty bump for assetic-1.3.1 | Roeland Jago Douma | 2015-10-22 | 1 | -0/+0 | |
* | | | | Merge pull request #19890 from owncloud/db-keep-shared-locks | Thomas Müller | 2015-10-22 | 2 | -18/+107 | |
|\ \ \ \ | ||||||
| * | | | | add phpdoc | Robin Appelman | 2015-10-21 | 2 | -0/+13 | |
| * | | | | Keep shared locks until the end of the request so we can reuse them | Robin Appelman | 2015-10-21 | 2 | -18/+94 | |
* | | | | | Merge pull request #19937 from owncloud/detailsview-donotopenonrename | Thomas Müller | 2015-10-22 | 1 | -3/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do not display details bar after rename | Vincent Petry | 2015-10-21 | 1 | -3/+6 | |
* | | | | | | Merge pull request #19935 from owncloud/issue-19916-settings-menu-hide-on-fil... | Thomas Müller | 2015-10-22 | 1 | -18/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use the normal OC.menu JS for handling the Settings menu | Joas Schilling | 2015-10-21 | 1 | -18/+1 | |
* | | | | | | | Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts | Thomas Müller | 2015-10-22 | 2 | -11/+129 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Fix file upload, conflict dialog, also in public link | Vincent Petry | 2015-10-21 | 2 | -11/+129 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #19791 from owncloud/provisioning_api_adding_integration_t... | Thomas Müller | 2015-10-22 | 3 | -106/+361 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | using canonize in assertEquals for arrays | Sergio Bertolin | 2015-10-21 | 1 | -15/+5 | |
| * | | | | | | Added more tests and fixed a problem with asort which was returning false pos... | Sergio Bertolin | 2015-10-20 | 3 | -106/+371 | |
* | | | | | | | Merge pull request #19952 from owncloud/share-dialogue-tests | Thomas Müller | 2015-10-22 | 1 | -0/+78 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix line lengths in share dialog unit tests | Tom Needham | 2015-10-21 | 1 | -2/+8 | |
| * | | | | | | | Add JS tests for share autocompletion handling | Tom Needham | 2015-10-21 | 1 | -0/+56 | |
| * | | | | | | | Add test for remote share info tooltop | Tom Needham | 2015-10-21 | 1 | -0/+16 | |
* | | | | | | | | Merge pull request #19960 from owncloud/bump_pimple_3.0.2 | Thomas Müller | 2015-10-22 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | 3rdparty bump for pimple-3.0.2 | Roeland Jago Douma | 2015-10-22 | 1 | -0/+0 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-22 | 88 | -80/+74 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #19930 from owncloud/sort_usernames | Thomas Müller | 2015-10-21 | 1 | -1/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [provisioning api] losen test | Roeland Jago Douma | 2015-10-21 | 1 | -1/+14 | |
* | | | | | | | | Merge pull request #19920 from owncloud/pear-core-minimal-1.0.1 | Thomas Müller | 2015-10-21 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 3rdparty bump of pear-core-minimal | Roeland Jago Douma | 2015-10-21 | 1 | -0/+0 | |
* | | | | | | | | | Merge pull request #19954 from owncloud/remote-unrequired-dependencies | Thomas Müller | 2015-10-21 | 16 | -128/+35 | |
|\ \ \ \ \ \ \ \ \ |