wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
39825 commits 157 branches 562 tags 714 MiB
Commit graph

39825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benedikt Geissler
80fc33b082
Add link to mastodon in readme 2017-07-21 08:58:51 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex 2017-07-21 00:08:06 +00: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
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
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
Lukas Reschke
591aaa4154
Add workaround for https://github.com/etsy/phan/issues/1033 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 11:08:43 +02:00
Morris Jobke
8e6b707d2f Merge pull request #5778 from nextcloud/changelog 
Add link to real changelog
 2017-07-19 10:44:24 +02:00
Morris Jobke
e9532cfbbb Add link to real changelog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:39:55 +02:00
Lukas Reschke
e96c823f17
Update third-party ref 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke
030d85bc9c
Remove unused functions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke
4d1d82e2d7
Install phan manually 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke
ac1a54cccf
Use new Drone image 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:12 +02:00
Lukas Reschke
842a923a6e
Exclude phan from scrutinizer 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Lukas Reschke
d8ec399454
Run phan over code base 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-07-19 10:28:11 +02:00
Morris Jobke
e48ca730fe Add Android and iOS URLs to theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:20:47 +02:00
Roeland Jago Douma
e2298e0a71
Allow overwriting of IOS theming values 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-19 08:22:45 +02:00
Nextcloud bot
0ee83ac56b
[tx-robot] updated from transifex 2017-07-19 00:08:22 +00:00
Morris Jobke
2ebafb06fd Properly handle if the deps file if for some reason empty 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 00:10:46 +02:00
Morris Jobke
5accbf5568 Merge pull request #5744 from 1manprojects/patch-1 
Removed cast to integer in getSize
 2017-07-18 23:43:09 +02:00
Morris Jobke
a5495b8ef1 Merge pull request #5775 from nextcloud/fix-postgres 
Disable postgres temporarily
 2017-07-18 23:15:28 +02:00
Morris Jobke
6a313accfc Merge pull request #5764 from nextcloud/update-3rdparty 
Update 3rdparty for "Fix infinite propfinds reporting files as direct…
 2017-07-18 23:13:13 +02:00
Roeland Jago Douma
f0f1e2c501 Merge pull request #5770 from nextcloud/path-repair-steps-loop 
Fix invalid path repair step not getting all invalid entries
 2017-07-18 22:22:51 +02:00
Morris Jobke
884751a8c0 Merge pull request #5733 from nextcloud/app-menu-ellipsis 
Long app names will have ellipsis in the app menu popover.
 2017-07-18 20:42:27 +02:00
Morris Jobke
75f893b62f Disable postgres temporarily 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-18 19:23:56 +02:00
Joas Schilling
e71b9fb3d6 Merge pull request #5709 from nextcloud/null-user-exist 
null users dont exist
 2017-07-18 18:24:42 +02:00
Joas Schilling
984933e586
Only use readable chars in Share Tokens 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 15:44:34 +02:00
Robin Appelman
8b58b4c2a7
Fix invalid path repair step not getting all invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-18 14:01:49 +02:00
Joas Schilling
b0809ef405
Update 3rdparty for "Fix infinite propfinds reporting files as directories" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-18 10:03:28 +02:00
Roeland Jago Douma
1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4 
Spelling: Bigversal and LDAP
 2017-07-18 09:09:46 +02:00
Morris Jobke
5c900e535b Merge pull request #5745 from paulijar/master 
Fix emitting of legacy hook post_unshare
 2017-07-18 09:07:38 +02:00
Roeland Jago Douma
ac5d238ffe Merge pull request #5758 from nextcloud/comradekingu-patch-7 
Spelling: ": Bigversal"
 2017-07-18 09:06:34 +02:00
Morris Jobke
58f72309cc Merge pull request #5736 from smueller18/patch-2 
do not show hyphen in og:title if slogan does not exist
 2017-07-18 09:04:47 +02:00
Roeland Jago Douma
4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1 
Spelling: Shortening and binding
 2017-07-18 08:52:09 +02:00
Morris Jobke
99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2 
Spelling: command-line, Consider narrowing
 2017-07-18 08:49:48 +02:00