Commit graph

39907 commits

Author SHA1 Message Date
Morris Jobke
655c26224b Merge pull request #5596 from nextcloud/mount-rename
Fix renaming of non-renamble mounts
2017-07-21 23:10:50 +02:00
Morris Jobke
50fc5a1e25 Merge pull request #5823 from nextcloud/improve-error-handling
Improve error handling for accepting federated shares
2017-07-21 22:54:14 +02:00
Morris Jobke
b2b4691e48 Add filename and sharer in public page
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 18:55:37 +02:00
Morris Jobke
13dd0b0ebe Merge pull request #5785 from nextcloud/path-repair-steps-storage
Also repair storage id's when repairing invalid entries
2017-07-21 16:58:31 +02:00
Lukas Reschke
4c637a428e Merge pull request #5821 from nextcloud/fix-theming-on-untrusted-domain
Fix error message on untrusted domain error page
2017-07-21 14:50:31 +02:00
Robin Appelman
06a4d6b5b9 Also repair storage id's when repairing invalid entries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 14:06:13 +02:00
Roeland Jago Douma
a33b6cdd21 Merge pull request #5820 from MarcelWaldvogel/minor-documentation-fixes
Minor documentation fixes
2017-07-21 13:32:10 +02:00
Robin Appelman
89b747d066
refactor chunked assembly stream
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-21 12:49:39 +02:00
Roeland Jago Douma
86d2fe516e Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
still remove the federated share even if we cant notify the remote
2017-07-21 12:45:01 +02:00
Roeland Jago Douma
37bff5ceda Merge pull request #5795 from nextcloud/ci-for-archive-tar
Adjust third-party ref
2017-07-21 12:36:45 +02:00
Bjoern Schiessle
8b3dfcc429
use OCSv2 to make sure that the error also arrives at the web front-end
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:09:13 +02:00
Bjoern Schiessle
e78040d250
improved error handling
check if table was updated successfully and only then send a notification
mail and return "true".

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:07:32 +02:00
Morris Jobke
1a4a68dbc6 Fix error message on untrusted domain error page
Fixes #5347

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 11:46:37 +02:00
Lukas Reschke
1c1ff82c06 Merge pull request #5802 from nextcloud/rm_dep_controller_functions
Remove deprecated Controller Functions
2017-07-21 10:12:20 +02:00
Marcel Waldvogel
4e42f059ed Minor typos
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
2017-07-21 09:50:44 +02:00
Marcel Waldvogel
15c51f410e The app password avoids 1Il etc. Adapted comment accordingly
Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
2017-07-21 09:48:14 +02:00
Roeland Jago Douma
e5bedd8947 Merge pull request #5818 from nextcloud/ocs_privatedata
PrivateData to app
2017-07-21 09:47:49 +02:00
Lukas Reschke
866a5759d1 Adjust third-party ref
CI commit for https://github.com/nextcloud/3rdparty/pull/59

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-21 09:36:58 +02:00
Morris Jobke
407a500745 Merge pull request #5803 from nextcloud/fix-public-links
fix preview for public links
2017-07-21 09:34:36 +02:00
Morris Jobke
b1954bed97 Merge pull request #5797 from paulijar/share20-postUnshareFromSelf
Dispatch event postUnshareFromSelf when the recipient of a share unshares it
2017-07-21 09:32:49 +02:00
Morris Jobke
8ef75f78a5 Merge pull request #5819 from benediktg/add-mastdon-link
Add link to mastodon in readme
2017-07-21 09:26:15 +02:00
Morris Jobke
3d9fd4d0d1 Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker
Add Phan plugin to check for SQL injections
2017-07-21 09:25:24 +02:00
Benedikt Geissler
80fc33b082
Add link to mastodon in readme 2017-07-21 08:58:51 +02:00
Roeland Jago Douma
7753b93aa6
PrivateData to app
* 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>
2017-07-21 08:51:14 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00:00
Lukas Reschke
29e715a1b9
Exclude build/.phan/ from PHP 5.6 syntax check
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-20 23:04:11 +02:00
Lukas Reschke
3d2600b039
Add Phan plugin to check for SQL injections
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>
2017-07-20 22:48:13 +02:00
Artem Kochnev
5abeb9519e Fix for mb strlen
Error with moving files with long names in UTF-8
2017-07-20 17:29:50 +03:00
Björn Schießle
c0e9b374f1 Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload
Add recovery key on public upload
2017-07-20 14:07:57 +02:00
Pauli Järvinen
7c4a15f215 Emit hook postUnshareFromSelf when the recipient of a share unshares it
- 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>
2017-07-20 14:45:46 +03:00
Morris Jobke
4826fd701d Merge pull request #5801 from nextcloud/activity-description-copy-paste
Fix copy and paste error on activity descriptions
2017-07-20 13:08:44 +02:00
Morris Jobke
cb08288cf5 Merge pull request #5790 from nextcloud/fix-documentation
Fix config.sample.php documentation
2017-07-20 12:17:38 +02:00
Bjoern Schiessle
473824fa06
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
Bjoern Schiessle
20a6b22db6
Add recovery key on public upload
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>
2017-07-20 11:40:14 +02:00
Morris Jobke
ac969cfbb6 Merge pull request #5800 from nextcloud/enable-acceptance-tests-again-on-drone-0.7
Enable acceptance tests again on Drone 0.7
2017-07-20 11:31:48 +02:00
Bjoern Schiessle
ae8a3ce085
fix preview for public links
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>
2017-07-20 11:24:52 +02:00
Roeland Jago Douma
0b495ceff8
Remove deprecated Controller Functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-20 11:03:12 +02:00
Joas Schilling
0b3266531b
Fix copy and paste error on activity descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-20 09:31:14 +02:00
Roeland Jago Douma
5e468c0bba Merge pull request #5794 from nextcloud/update-php7.1-container
Update PHP 7.1 containers
2017-07-20 08:45:52 +02:00
Daniel Calviño Sánchez
94144269de Enable acceptance tests again on Drone 0.7
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>
2017-07-20 08:08:35 +02:00
Daniel Calviño Sánchez
c37329005e Add option to acceptance test runner to set the Selenium server
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>
2017-07-20 07:56:51 +02:00
Daniel Calviño Sánchez
2fe8cad710 Add option to acceptance test runner to set the Nextcloud server domain
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>
2017-07-20 07:54:39 +02:00
Daniel Calviño Sánchez
8e9c12eed9 Make possible to configure the domain for the Nextcloud test server
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>
2017-07-20 07:50:33 +02:00
Nextcloud bot
26c42d3d30
[tx-robot] updated from transifex 2017-07-20 00:08:04 +00:00
Lukas Reschke
e215eabbf7
Update PHP 7.1 containers
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>
2017-07-19 17:00:08 +02:00
Morris Jobke
422d468d27 Fix config.sample.php documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-19 16:44:57 +02:00
Joas Schilling
3ff3c338c9 Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens
Only use readable chars in Share Tokens
2017-07-19 16:40:18 +02:00
Morris Jobke
49c622fcba Merge pull request #5719 from nextcloud/improve-jscombiner
Properly handle if the deps file if for some reason empty
2017-07-19 16:31:29 +02:00
Roeland Jago Douma
d5e3428af5 Merge pull request #5776 from nextcloud/install-phan
Run phan over code base
2017-07-19 13:45:31 +02:00
Morris Jobke
cbfea4c025 Merge pull request #5781 from nextcloud/fix_5780
Allow overwriting of IOS theming values
2017-07-19 11:34:27 +02:00