summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-2256-4/+162
|
* Merge pull request #5596 from nextcloud/mount-renameMorris Jobke2017-07-212-11/+14
|\ | | | | Fix renaming of non-renamble mounts
| * fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5823 from nextcloud/improve-error-handlingMorris Jobke2017-07-213-13/+22
|\ \ | | | | | | Improve error handling for accepting federated shares
| * | use OCSv2 to make sure that the error also arrives at the web front-endBjoern Schiessle2017-07-211-2/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | improved error handlingBjoern Schiessle2017-07-212-11/+20
| | | | | | | | | | | | | | | | | | | | | check if table was updated successfully and only then send a notification mail and return "true". Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #5785 from nextcloud/path-repair-steps-storageMorris Jobke2017-07-213-5/+42
|\ \ \ | | | | | | | | Also repair storage id's when repairing invalid entries
| * | | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-213-5/+42
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domainLukas Reschke2017-07-211-1/+1
|\ \ \ \ | |/ / / |/| | | Fix error message on untrusted domain error page
| * | | Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixesRoeland Jago Douma2017-07-214-4/+4
|\ \ \ \ | | | | | | | | | | Minor documentation fixes
| * | | | Minor typosMarcel Waldvogel2017-07-213-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
| * | | | The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
* | | | | Merge pull request #5753 from nextcloud/fed-unshare-fail-remoteRoeland Jago Douma2017-07-211-2/+7
|\ \ \ \ \ | | | | | | | | | | | | still remove the federated share even if we cant notify the remote
| * | | | | still remove the federated share even if we cant notify the remoteRobin Appelman2017-07-171-2/+7
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5795 from nextcloud/ci-for-archive-tarRoeland Jago Douma2017-07-211-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Adjust third-party ref
| * | | | Adjust third-party refLukas Reschke2017-07-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI commit for https://github.com/nextcloud/3rdparty/pull/59 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #5802 from nextcloud/rm_dep_controller_functionsLukas Reschke2017-07-212-174/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove deprecated Controller Functions
| * | | | | Remove deprecated Controller FunctionsRoeland Jago Douma2017-07-202-174/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #5818 from nextcloud/ocs_privatedataRoeland Jago Douma2017-07-218-455/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | PrivateData to app
| * | | | PrivateData to appRoeland Jago Douma2017-07-218-455/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PrivateData is an app now: https://github.com/nextcloud/privatedata * No need to load the OCS routes.php (as there is none!) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #5803 from nextcloud/fix-public-linksMorris Jobke2017-07-211-1/+3
|\ \ \ \ \ | | | | | | | | | | | | fix preview for public links
| * | | | | fix preview for public linksBjoern Schiessle2017-07-201-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case a user is already logged in on the same server from which the public link comes from, we need to setup the owners file system in order to show the preview Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #5797 from paulijar/share20-postUnshareFromSelfMorris Jobke2017-07-214-0/+103
|\ \ \ \ \ | | | | | | | | | | | | Dispatch event postUnshareFromSelf when the recipient of a share unshares it
| * | | | | Emit hook postUnshareFromSelf when the recipient of a share unshares itPauli Järvinen2017-07-204-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This kind of hook signal used to be emitted in the old Share library but it was missing from Share 2.0 Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
* | | | | | Merge pull request #5819 from benediktg/add-mastdon-linkMorris Jobke2017-07-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add link to mastodon in readme
| * | | | | | Add link to mastodon in readmeBenedikt Geissler2017-07-211-0/+1
| | | | | | |
* | | | | | | Merge pull request #5817 from nextcloud/add-basic-sql-injection-checkerMorris Jobke2017-07-2123-1/+311
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add Phan plugin to check for SQL injections
| * | | | | | Exclude build/.phan/ from PHP 5.6 syntax checkLukas Reschke2017-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Add Phan plugin to check for SQL injectionsLukas Reschke2017-07-2023-0/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues. As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections. The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-21350-1080/+460
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #5629 from nextcloud/add-recovery-key-on-public-uploadBjörn Schießle2017-07-201-2/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add recovery key on public upload
| * | | | | make sure that we always have a ownerBjoern Schiessle2017-07-201-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | Add recovery key on public uploadBjoern Schiessle2017-07-201-2/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to decide if a recovery key needs to be added we always need to check the files owner settings and not the settings of the currently logged in user. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #5801 from nextcloud/activity-description-copy-pasteMorris Jobke2017-07-202-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix copy and paste error on activity descriptions
| * | | | | Fix copy and paste error on activity descriptionsJoas Schilling2017-07-202-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5790 from nextcloud/fix-documentationMorris Jobke2017-07-201-5/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix config.sample.php documentation
| * | | | | Fix config.sample.php documentationMorris Jobke2017-07-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5800 from ↵Morris Jobke2017-07-204-17/+110
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/enable-acceptance-tests-again-on-drone-0.7 Enable acceptance tests again on Drone 0.7
| * | | | | Enable acceptance tests again on Drone 0.7Daniel Calviño Sánchez2017-07-201-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running the acceptance tests on Drone relied on the pod-style networking used by services (service containers were available at 127.0.0.1 from the build containers). However, in Drone 0.7 service and build containers must be accessed from each other using their domain name instead. Thus, acceptance tests had to be disabled on Drone. Now that the acceptance test system supports setting a different domain for the Selenium server and for the Nextcloud test server the acceptance tests can be enabled again on Drone. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add option to acceptance test runner to set the Selenium serverDaniel Calviño Sánchez2017-07-201-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default "127.0.0.1:4444" is used, so nothing needs to be set when the acceptance tests and the Selenium server share the same network (like when called by "run.sh"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add option to acceptance test runner to set the Nextcloud server domainDaniel Calviño Sánchez2017-07-202-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default "127.0.0.1" is used, so nothing needs to be set when the Selenium server and the Nextcloud test server share the same network (like when called by "run.sh"). Besides passing the domain to the acceptance tests the Nextcloud test server configuration must be modified to see the given domain as a trusted domain; otherwise the access would be forbidden. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Make possible to configure the domain for the Nextcloud test serverDaniel Calviño Sánchez2017-07-201-6/+16
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NextcloudTestServerLocalHelper started the PHP built-in web server for the Nextcloud test server at 127.0.0.1; as the Selenium server has to access the Nextcloud test server they were forced to share the same network. Now, the domain at which the PHP built-in web server is started can be specified when the NextcloudTestServerLocalHelper is created, which removes the need of sharing the same network, as the Selenium server now can access the Nextcloud test server at an arbitrary domain. However, by default "127.0.0.1" is still used if no domain is given. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #5794 from nextcloud/update-php7.1-containerRoeland Jago Douma2017-07-201-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Update PHP 7.1 containers
| * | | | | Update PHP 7.1 containersLukas Reschke2017-07-191-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Previously this container used a very old CentOS version. It has been migrated to Debian Jessie now using the deb.sury.org repositories. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / / / [tx-robot] updated from transifexNextcloud bot2017-07-2042-0/+144
|/ / / /
* | | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokensJoas Schilling2017-07-194-11/+5
|\ \ \ \ | | | | | | | | | | Only use readable chars in Share Tokens
| * | | | Only use readable chars in Share TokensJoas Schilling2017-07-184-11/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5719 from nextcloud/improve-jscombinerMorris Jobke2017-07-193-3/+40
|\ \ \ \ \ | | | | | | | | | | | | Properly handle if the deps file if for some reason empty
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 10:35:36 +0000