aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20026 from owncloud/LukasReschke-patch-1Lukas Reschke2015-10-251-1/+1
|\ | | | | Add HackerOne page to CONTRIBUTING.md
| * Add HackerOne page to CONTRIBUTING.mdLukas Reschke2015-10-251-1/+1
|/
* Merge pull request #20024 from owncloud/optimized-autoloaderLukas Reschke2015-10-251-0/+0
|\ | | | | Use optimized autoloader for 3rdparty
| * Use optimized autoloader for 3rdpartyLukas Reschke2015-10-251-0/+0
|/
* Merge pull request #16957 from owncloud/throw-exception-if-file-does-not-existLukas Reschke2015-10-2514-54/+121
|\ | | | | Throw exception on `getPath` if file does not exist
| * Throw exception on `getPath` if file does not existLukas Reschke2015-10-2514-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 transifexJenkins for ownCloud2015-10-2524-26/+100
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-24142-150/+124
|
* Merge pull request #20013 from owncloud/guzzlehttp-guzzle-5.3.0Thomas Müller2015-10-231-0/+0
|\ | | | | Bump 3rdparty for guzzlehttp/http to 5.3.0
| * Bump 3rdparty for guzzlehttp/http to 5.3.0Roeland Jago Douma2015-10-231-0/+0
|/ | | | Includes bump of react/promise to 2.2.1
* Merge pull request #20004 from owncloud/dont-lock-user-filesThomas Müller2015-10-231-1/+1
|\ | | | | Dont lock /$user/files
| * Dont lock /$user/filesRobin Appelman2015-10-231-1/+1
| |
* | Merge pull request #19987 from owncloud/full_sabre_2.1.7Thomas Müller2015-10-231-0/+0
|\ \ | | | | | | Bump 3rdparty to have full sabre/dav-2.1.7
| * | Bump 3rdparty to have full sabre/dav-2.1.7Roeland Jago Douma2015-10-231-0/+0
|/ /
* | Merge pull request #19977 from ↵Thomas Müller2015-10-232-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 appsSergio Bertolin2015-10-222-0/+94
| |
| * added test for getting users of a group being subadminSergio Bertolin2015-10-222-11/+24
| |
* | Merge pull request #19957 from owncloud/volter-masterThomas Müller2015-10-232-1/+9
|\ \ | | | | | | Expose syslog tag in the configuration
| * | Add syslog_tag docu to sample configSteffen Lindner2015-10-231-0/+8
| | |
| * | Expose syslog tag in the configurationVolker Fröhlich2015-10-221-1/+1
| | |
* | | Merge pull request #19970 from owncloud/encryption-getuidonbooleanThomas Müller2015-10-231-4/+4
|\ \ \ | | | | | | | | Fix "Call to a member function getUID() on boolean" in Crypt
| * | | Fix "Call to a member function getUID() on boolean" in CryptJoas Schilling2015-10-221-4/+4
| | | |
* | | | Merge pull request #19990 from owncloud/stay-logged-in-wordingThomas Müller2015-10-231-1/+1
|\ \ \ \ | | | | | | | | | | change wording from 'remember' to more understandable 'Stay logged in'
| * | | | change wording from 'remember' to more understandable 'Stay logged in'Jan-Christoph Borchardt2015-10-231-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2330-8/+202
| | | | |
* | | | | Merge pull request #19980 from owncloud/fix-deleted-ldap-user-sharingThomas Müller2015-10-221-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | handle NoUserException in sharing code
| * | | | handle NoUserException in sharing codeMorris Jobke2015-10-221-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.1Thomas Müller2015-10-221-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | Bump 3rdparty for pear/archive_tar-1.4.1
| * | | | Bump 3rdparty for pear/archive_tar-1.4.1Roeland Jago Douma2015-10-221-0/+0
|/ / / /
* | | | Merge pull request #19967 from owncloud/assetic_1.3.1Thomas Müller2015-10-221-0/+0
|\ \ \ \ | |_|_|/ |/| | | 3rdparty bump for assetic-1.3.1
| * | | 3rdparty bump for assetic-1.3.1Roeland Jago Douma2015-10-221-0/+0
| | | |
* | | | Merge pull request #19890 from owncloud/db-keep-shared-locksThomas Müller2015-10-222-18/+107
|\ \ \ \ | | | | | | | | | | Keep shared locks until the end of the request so we can reuse them
| * | | | add phpdocRobin Appelman2015-10-212-0/+13
| | | | |
| * | | | Keep shared locks until the end of the request so we can reuse themRobin Appelman2015-10-212-18/+94
| | | | |
* | | | | Merge pull request #19937 from owncloud/detailsview-donotopenonrenameThomas Müller2015-10-221-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Do not display details bar after rename
| * | | | | Do not display details bar after renameVincent Petry2015-10-211-3/+6
| | | | | |
* | | | | | Merge pull request #19935 from ↵Thomas Müller2015-10-221-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 menuJoas Schilling2015-10-211-18/+1
| | | | | | |
* | | | | | | Merge pull request #19931 from owncloud/fix-webui-upload-and-conflictsThomas Müller2015-10-222-11/+129
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Fix file upload, conflict dialog, also in public link
| * | | | | | Fix file upload, conflict dialog, also in public linkVincent Petry2015-10-212-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üller2015-10-223-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 arraysSergio Bertolin2015-10-211-15/+5
| | | | | | |
| * | | | | | Added more tests and fixed a problem with asort which was returning false ↵Sergio Bertolin2015-10-203-106/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | positives
* | | | | | | Merge pull request #19952 from owncloud/share-dialogue-testsThomas Müller2015-10-221-0/+78
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add JS tests for share dialog
| * | | | | | | Fix line lengths in share dialog unit testsTom Needham2015-10-211-2/+8
| | | | | | | |
| * | | | | | | Add JS tests for share autocompletion handlingTom Needham2015-10-211-0/+56
| | | | | | | |
| * | | | | | | Add test for remote share info tooltopTom Needham2015-10-211-0/+16
| | | | | | | |
* | | | | | | | Merge pull request #19960 from owncloud/bump_pimple_3.0.2Thomas Müller2015-10-221-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | 3rdparty bump for pimple-3.0.2
| * | | | | | | 3rdparty bump for pimple-3.0.2Roeland Jago Douma2015-10-221-0/+0
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-2288-80/+74
|/ / / / / / /