Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20026 from owncloud/LukasReschke-patch-1 | Lukas Reschke | 2015-10-25 | 1 | -1/+1 |
|\ | | | | | Add HackerOne page to CONTRIBUTING.md | ||||
| * | Add HackerOne page to CONTRIBUTING.md | Lukas Reschke | 2015-10-25 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #20024 from owncloud/optimized-autoloader | Lukas Reschke | 2015-10-25 | 1 | -0/+0 |
|\ | | | | | Use optimized autoloader for 3rdparty | ||||
| * | Use optimized autoloader for 3rdparty | Lukas Reschke | 2015-10-25 | 1 | -0/+0 |
|/ | |||||
* | Merge pull request #16957 from owncloud/throw-exception-if-file-does-not-exist | Lukas Reschke | 2015-10-25 | 14 | -54/+121 |
|\ | | | | | Throw exception on `getPath` if file does not exist | ||||
| * | Throw exception on `getPath` if file does not exist | Lukas Reschke | 2015-10-25 | 14 | -54/+121 |
|/ | | | | | | | | | | Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened. This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs. While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page. I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail. | ||||
* | [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 | ||||
| * | Bump 3rdparty for guzzlehttp/http to 5.3.0 | Roeland Jago Douma | 2015-10-23 | 1 | -0/+0 |
|/ | | | | Includes bump of react/promise to 2.2.1 | ||||
* | Merge pull request #20004 from owncloud/dont-lock-user-files | Thomas Müller | 2015-10-23 | 1 | -1/+1 |
|\ | | | | | Dont lock /$user/files | ||||
| * | 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 | ||||
| * | | Bump 3rdparty to have full sabre/dav-2.1.7 | Roeland Jago Douma | 2015-10-23 | 1 | -0/+0 |
|/ / | |||||
* | | Merge pull request #19977 from ↵ | Thomas Müller | 2015-10-23 | 2 | -11/+118 |
|\ \ | |/ |/| | | | | | owncloud/provisioning_api_integration_tests_apps_new_getusers Provisioning api integration tests added app tests and getusers by a subadmin | ||||
| * | 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 |
|\ \ | | | | | | | Expose syslog tag in the configuration | ||||
| * | | 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 | ||||
| * | | | 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' | ||||
| * | | | | 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 | ||||
| * | | | | handle NoUserException in sharing code | Morris Jobke | 2015-10-22 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * setup LDAP users * share from an LDAP user * delete that LDAP user * log in as share recipient * before: unhandled NoUserException * after: NoUserEception is logged and share is not shown anymore | ||||
* | | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Keep shared locks until the end of the request so we can reuse them | ||||
| * | | | | 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 | ||||
| * | | | | | Do not display details bar after rename | Vincent Petry | 2015-10-21 | 1 | -3/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #19935 from ↵ | Thomas Müller | 2015-10-22 | 1 | -18/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-19916-settings-menu-hide-on-file-action Use the normal OC.menu JS for handling the Settings menu | ||||
| * | | | | | | 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 | ||||
| * | | | | | | Fix file upload, conflict dialog, also in public link | Vincent Petry | 2015-10-21 | 2 | -11/+129 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public link page. - Fix public link upload by properly adding the form data using a new utility function "addFormData". That one is needed because IE8 upload and regular upload use a different format... | ||||
* | | | | | | Merge pull request #19791 from ↵ | Thomas Müller | 2015-10-22 | 3 | -106/+361 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/provisioning_api_adding_integration_tests Added more tests and fixed a problem with asort which was returning f… | ||||
| * | | | | | | 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 ↵ | Sergio Bertolin | 2015-10-20 | 3 | -106/+371 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | positives | ||||
* | | | | | | | Merge pull request #19952 from owncloud/share-dialogue-tests | Thomas Müller | 2015-10-22 | 1 | -0/+78 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add JS tests for share dialog | ||||
| * | | | | | | | 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 | ||||
| * | | | | | | | 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 |
|/ / / / / / / |