]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoMock logger 358/head
Roeland Jago Douma [Sun, 10 Jul 2016 12:19:55 +0000 (14:19 +0200)]
Mock logger

8 years agoFix phpunit-5.4 wargning
Roeland Jago Douma [Sun, 10 Jul 2016 12:17:26 +0000 (14:17 +0200)]
Fix phpunit-5.4 wargning

* getMock is deprecated.
* \PDOStatement mocking fails hard on phpunit 4.8

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 11 Jul 2016 00:09:22 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #330 from nextcloud/php7.0-ci
Morris Jobke [Sun, 10 Jul 2016 11:46:59 +0000 (13:46 +0200)]
Merge pull request #330 from nextcloud/php7.0-ci

PHP 7.0 CI

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Jul 2016 00:09:23 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoRun mysql and posgres on 5.6 330/head
Roeland Jago Douma [Sat, 9 Jul 2016 18:17:01 +0000 (20:17 +0200)]
Run mysql and posgres on 5.6

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Jul 2016 00:09:16 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoBump drone to use newer php7 docker
Roeland Jago Douma [Fri, 8 Jul 2016 13:12:36 +0000 (15:12 +0200)]
Bump drone to use newer php7 docker

8 years agoDisable coverage for now
Roeland Jago Douma [Wed, 6 Jul 2016 17:36:57 +0000 (19:36 +0200)]
Disable coverage for now

Coverage generation takes to long. So disabling for now.

8 years agoAdd 5.6 sqlite ci
Roeland Jago Douma [Wed, 6 Jul 2016 15:59:29 +0000 (17:59 +0200)]
Add 5.6 sqlite ci

8 years agoMove 'main' ci to php7 (speed)
Roeland Jago Douma [Wed, 6 Jul 2016 15:57:45 +0000 (17:57 +0200)]
Move 'main' ci to php7 (speed)

8 years agoCorrection is no longer required in php7
Roeland Jago Douma [Fri, 8 Jul 2016 07:27:54 +0000 (09:27 +0200)]
Correction is no longer required in php7

8 years agoFix phpunit Trait warning
Roeland Jago Douma [Fri, 8 Jul 2016 07:11:28 +0000 (09:11 +0200)]
Fix phpunit Trait warning

8 years agoMerge pull request #317 from nextcloud/scrutinizer-fixed
Roeland Douma [Fri, 8 Jul 2016 11:49:42 +0000 (13:49 +0200)]
Merge pull request #317 from nextcloud/scrutinizer-fixed

Scrutinizer fixes

8 years agoFix test using private propertries 317/head
Robin Appelman [Thu, 7 Jul 2016 14:56:28 +0000 (16:56 +0200)]
Fix test using private propertries

8 years agocombine if statements
Robin Appelman [Tue, 5 Jul 2016 21:35:32 +0000 (23:35 +0200)]
combine if statements

8 years agohandle errors while getting fileinfo
Robin Appelman [Tue, 5 Jul 2016 21:19:30 +0000 (23:19 +0200)]
handle errors while getting fileinfo

8 years agoAllow null
Robin Appelman [Tue, 5 Jul 2016 21:19:10 +0000 (23:19 +0200)]
Allow null

8 years agoFix type hinting
Robin Appelman [Tue, 5 Jul 2016 21:18:41 +0000 (23:18 +0200)]
Fix type hinting

8 years agoadd missing var
Robin Appelman [Tue, 5 Jul 2016 21:18:06 +0000 (23:18 +0200)]
add missing var

8 years agohint global handlebars
Robin Appelman [Tue, 5 Jul 2016 21:17:43 +0000 (23:17 +0200)]
hint global handlebars

8 years agodont overwrite a variable with a different type
Robin Appelman [Tue, 5 Jul 2016 21:15:41 +0000 (23:15 +0200)]
dont overwrite a variable with a different type

8 years agoFix undefined properties
Robin Appelman [Tue, 5 Jul 2016 20:45:05 +0000 (22:45 +0200)]
Fix undefined properties

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 8 Jul 2016 00:09:25 +0000 (00:09 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #314 from jernst/master
Lukas Reschke [Thu, 7 Jul 2016 17:34:11 +0000 (19:34 +0200)]
Merge pull request #314 from jernst/master

Allow wildcard * to be used in trusted domains

8 years agoMerge pull request #333 from nextcloud/sync-master
Lukas Reschke [Thu, 7 Jul 2016 17:29:43 +0000 (19:29 +0200)]
Merge pull request #333 from nextcloud/sync-master

Sync master

8 years agoExtended documentation on trusted_domains to cover ports and wildcards.
Johannes Ernst [Thu, 7 Jul 2016 16:23:20 +0000 (16:23 +0000)]
Extended documentation on trusted_domains to cover ports and wildcards.

8 years agoMerge pull request #312 from nextcloud/files-other-lists-goto
Morris Jobke [Thu, 7 Jul 2016 13:48:38 +0000 (15:48 +0200)]
Merge pull request #312 from nextcloud/files-other-lists-goto

Add "goto" links for files in non-default file lists

8 years agoSimplify test code and don't show anything if no date is set
Morris Jobke [Thu, 7 Jul 2016 07:54:32 +0000 (09:54 +0200)]
Simplify test code and don't show anything if no date is set

8 years agoadd unit tests
Morris Jobke [Mon, 4 Jul 2016 15:16:50 +0000 (17:16 +0200)]
add unit tests

8 years agoUpdate header during update callback
Morris Jobke [Fri, 1 Apr 2016 07:07:04 +0000 (09:07 +0200)]
Update header during update callback

8 years agoNot set expiration date is represented as 0
Morris Jobke [Wed, 16 Mar 2016 17:28:45 +0000 (18:28 +0100)]
Not set expiration date is represented as 0

8 years agoadd "Never" if expiration date is not set
Morris Jobke [Fri, 2 Oct 2015 06:45:07 +0000 (08:45 +0200)]
add "Never" if expiration date is not set

8 years agoAdd expiration date to share by link view
Morris Jobke [Wed, 30 Sep 2015 16:20:55 +0000 (18:20 +0200)]
Add expiration date to share by link view

8 years agoChange png icons to svg
Juan Pablo Villafáñez [Thu, 7 Jul 2016 08:17:21 +0000 (10:17 +0200)]
Change png icons to svg

8 years agoRevert "occ web executor (#24957)"
Morris Jobke [Thu, 7 Jul 2016 10:14:45 +0000 (12:14 +0200)]
Revert "occ web executor (#24957)"

This reverts commit 854352d9a064a1e469ede207493bce44fd41d96c.

8 years agoRevert "Bypass upgrade page when occ controller is requested"
Morris Jobke [Thu, 7 Jul 2016 10:14:39 +0000 (12:14 +0200)]
Revert "Bypass upgrade page when occ controller is requested"

This reverts commit 89e581acf8d30e11a27f1d23560d54306615ae7e.

8 years agoMerge branch 'master' into sync-master
Morris Jobke [Thu, 7 Jul 2016 09:29:46 +0000 (11:29 +0200)]
Merge branch 'master' into sync-master

8 years agoRevert "[tx-robot] updated from transifex"
Morris Jobke [Thu, 7 Jul 2016 09:01:48 +0000 (11:01 +0200)]
Revert "[tx-robot] updated from transifex"

This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f.

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Jul 2016 08:58:00 +0000 (08:58 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #323 from Faldon/database_port
Morris Jobke [Thu, 7 Jul 2016 08:20:08 +0000 (10:20 +0200)]
Merge pull request #323 from Faldon/database_port

Added occ install option for database-port

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 7 Jul 2016 05:56:27 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

8 years agoDisallow certain malformed domain names even if they match the trusted domain expression
Johannes Ernst [Wed, 6 Jul 2016 23:51:04 +0000 (23:51 +0000)]
Disallow certain malformed domain names even if they match the trusted domain expression
Stricter checking for valid domain names

8 years agoTrusted domain wildcard checking made shorter, supporting multiple *
Johannes Ernst [Wed, 6 Jul 2016 23:38:30 +0000 (23:38 +0000)]
Trusted domain wildcard checking made shorter, supporting multiple *
Added test cases

8 years agoSet content type when downloading log file to force download in some browsers (#25382)
Vincent Petry [Wed, 6 Jul 2016 20:47:16 +0000 (22:47 +0200)]
Set content type when downloading log file to force download in some browsers (#25382)

8 years agoUse named parameter instead of direct value for system tags search param (#25380)
Vincent Petry [Wed, 6 Jul 2016 20:39:34 +0000 (22:39 +0200)]
Use named parameter instead of direct value for system tags search param (#25380)

8 years agoMerge pull request #327 from nextcloud/add-php-5.4-5.5
Roeland Douma [Wed, 6 Jul 2016 14:37:57 +0000 (16:37 +0200)]
Merge pull request #327 from nextcloud/add-php-5.4-5.5

Add PHP 5.4 and 5.5 jobs to CI

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Jul 2016 13:28:06 +0000 (13:28 +0000)]
[tx-robot] updated from transifex

8 years agoAdd PHP 5.4 and 5.5 jobs to CI
Morris Jobke [Wed, 6 Jul 2016 13:01:11 +0000 (15:01 +0200)]
Add PHP 5.4 and 5.5 jobs to CI

8 years agoMerge pull request #324 from nextcloud/fix-naming-issue-drone
Morris Jobke [Wed, 6 Jul 2016 12:48:30 +0000 (14:48 +0200)]
Merge pull request #324 from nextcloud/fix-naming-issue-drone

Fix docker image naming issue for CI

8 years agoFix docker image naming issue for CI
Morris Jobke [Wed, 6 Jul 2016 09:27:35 +0000 (11:27 +0200)]
Fix docker image naming issue for CI

* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end

8 years agoMerge pull request #25361 from owncloud/sharing-inttestforusershareaftergroupshare
Vincent Petry [Wed, 6 Jul 2016 10:49:30 +0000 (12:49 +0200)]
Merge pull request #25361 from owncloud/sharing-inttestforusershareaftergroupshare

Add integration test for sharing with group, then user in group

8 years agoMerge pull request #25325 from owncloud/filelist-prependslash
Vincent Petry [Wed, 6 Jul 2016 10:44:03 +0000 (12:44 +0200)]
Merge pull request #25325 from owncloud/filelist-prependslash

Filelist change dir auto-prepend slash

8 years agoIgnore invalid paths in the JS file list (#25368)
Vincent Petry [Wed, 6 Jul 2016 09:55:02 +0000 (11:55 +0200)]
Ignore invalid paths in the JS file list (#25368)

8 years agoChanged the input option for database-port to required when parameter was provided.
Thomas Pulzer [Wed, 6 Jul 2016 09:31:28 +0000 (11:31 +0200)]
Changed the input option for database-port to required when parameter was provided.
Added casting database port to int for input sanitation in pgsql and oci connections.

8 years agoUpgrading the log level From Debug to INFO to be consistent with files_trashbin ...
Carlos Damken [Wed, 6 Jul 2016 08:33:31 +0000 (10:33 +0200)]
Upgrading the log level From Debug to INFO to be consistent with files_trashbin (#25367)

8 years agoAdded occ install option for database-port.
Thomas Pulzer [Wed, 6 Jul 2016 07:58:38 +0000 (09:58 +0200)]
Added occ install option for database-port.
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.

8 years agoMerge pull request #319 from nextcloud/config-sample
Roeland Douma [Wed, 6 Jul 2016 07:58:14 +0000 (09:58 +0200)]
Merge pull request #319 from nextcloud/config-sample

Fix config sample text

8 years agoFix config sample text
Morris Jobke [Wed, 6 Jul 2016 06:59:38 +0000 (08:59 +0200)]
Fix config sample text

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 6 Jul 2016 05:56:27 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

8 years agoDuh, no 'next' in PHP.
Johannes Ernst [Wed, 6 Jul 2016 04:51:49 +0000 (04:51 +0000)]
Duh, no 'next' in PHP.
Use === instead of == for extra paranoia.

8 years agoAdd "goto" links for files in non-default file lists
Robin Appelman [Tue, 5 Jul 2016 13:05:01 +0000 (15:05 +0200)]
Add "goto" links for files in non-default file lists

8 years agoAllow wildcard * to be used in trusted domains, to support setups where no reliable...
Johannes Ernst [Tue, 5 Jul 2016 18:49:18 +0000 (18:49 +0000)]
Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com)

8 years agoMerge pull request #311 from Bugsbane/master
Joas Schilling [Tue, 5 Jul 2016 11:52:17 +0000 (13:52 +0200)]
Merge pull request #311 from Bugsbane/master

Update system tags icon

8 years agoReplace tag svg with optimized version
Bugsbane [Tue, 5 Jul 2016 10:52:10 +0000 (06:52 -0400)]
Replace tag svg with optimized version

Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)

8 years agoClean the svg with inkscapes clean document function
Bugsbane [Tue, 5 Jul 2016 10:18:02 +0000 (06:18 -0400)]
Clean the svg with inkscapes clean document function

8 years agoUpdate system tags icon
Bugsbane [Tue, 5 Jul 2016 10:16:25 +0000 (06:16 -0400)]
Update system tags icon

Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.

8 years agoMerge pull request #25356 from owncloud/checkupgrade-bypass
Vincent Petry [Tue, 5 Jul 2016 10:04:19 +0000 (12:04 +0200)]
Merge pull request #25356 from owncloud/checkupgrade-bypass

Bypass upgrade page when occ controller is requested

8 years agoMerge pull request #25344 from owncloud/fix-ldap-check-user
Vincent Petry [Tue, 5 Jul 2016 09:29:55 +0000 (11:29 +0200)]
Merge pull request #25344 from owncloud/fix-ldap-check-user

check if renamed user is still valid by reapplying the ldap filter

8 years agoAdd integration test for sharing with group, then user in group
Vincent Petry [Tue, 5 Jul 2016 09:08:19 +0000 (11:08 +0200)]
Add integration test for sharing with group, then user in group

Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.

8 years agoMerge pull request #309 from Faldon/master
Björn Schießle [Tue, 5 Jul 2016 08:27:48 +0000 (10:27 +0200)]
Merge pull request #309 from Faldon/master

Changed the creation of the update notification link

8 years agofix swift primary object store test (#25281)
Thomas Müller [Tue, 5 Jul 2016 06:54:51 +0000 (08:54 +0200)]
fix swift primary object store test (#25281)

* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 5 Jul 2016 06:31:32 +0000 (02:31 -0400)]
[tx-robot] updated from transifex

8 years agoBypass upgrade page when occ controller is requested
Victor Dubiniuk [Tue, 5 Jul 2016 06:20:37 +0000 (09:20 +0300)]
Bypass upgrade page when occ controller is requested

8 years agoAdded escaping html code when building link to documentation.
Thomas Pulzer [Tue, 5 Jul 2016 04:59:11 +0000 (06:59 +0200)]
Added escaping html code when building link to documentation.

8 years agoChanged the creation of the update notification link to generate the js object from...
Thomas Pulzer [Mon, 4 Jul 2016 20:57:10 +0000 (22:57 +0200)]
Changed the creation of the update notification link to generate the js object from concated string.

8 years agoMerge pull request #306 from nextcloud/sidebar-preview-text
Marius Blüm [Mon, 4 Jul 2016 19:36:51 +0000 (21:36 +0200)]
Merge pull request #306 from nextcloud/sidebar-preview-text

Add large sidebar previews for text files

8 years agoMerge pull request #25240 from owncloud/remove-svg
Morris Jobke [Mon, 4 Jul 2016 15:49:00 +0000 (17:49 +0200)]
Merge pull request #25240 from owncloud/remove-svg

Remove SVG fallback

8 years agofor text use max-height to trim whitespace
Morris Jobke [Mon, 4 Jul 2016 15:38:26 +0000 (17:38 +0200)]
for text use max-height to trim whitespace

8 years agoMerge pull request #25253 from owncloud/users-fixotherquotadropdown
Vincent Petry [Mon, 4 Jul 2016 14:13:18 +0000 (16:13 +0200)]
Merge pull request #25253 from owncloud/users-fixotherquotadropdown

Fix "Other" value handling in quota dropdown in users page

8 years agoMerge pull request #25314 from owncloud/files_external-backends-config
Vincent Petry [Mon, 4 Jul 2016 14:10:03 +0000 (16:10 +0200)]
Merge pull request #25314 from owncloud/files_external-backends-config

show configuration options for authentication backends

8 years agoadjust padding of text preview
Morris Jobke [Mon, 4 Jul 2016 13:38:16 +0000 (15:38 +0200)]
adjust padding of text preview

8 years agoChange nickvergessen mailmap entry (#25349)
Joas Schilling [Mon, 4 Jul 2016 13:19:47 +0000 (15:19 +0200)]
Change nickvergessen mailmap entry (#25349)

8 years agocheck if renamed user is still valid by reapplying the ldap filter (#25338)
felixboehm [Mon, 4 Jul 2016 12:16:13 +0000 (14:16 +0200)]
check if renamed user is still valid by reapplying the ldap filter (#25338)

8 years agoCap LDAP user cache (#25323)
Jörn Friedrich Dreyer [Mon, 4 Jul 2016 11:57:15 +0000 (13:57 +0200)]
Cap LDAP user cache (#25323)

8 years agoMerge pull request #296 from ayamshanov/add_fb2_mimetype
Lukas Reschke [Mon, 4 Jul 2016 11:54:11 +0000 (13:54 +0200)]
Merge pull request #296 from ayamshanov/add_fb2_mimetype

Add mimetype for fb2-extension

8 years agoMerge pull request #305 from Faldon/master
Lukas Reschke [Mon, 4 Jul 2016 11:25:00 +0000 (13:25 +0200)]
Merge pull request #305 from Faldon/master

Changing name of default logfile

8 years agoAdd large sidebar previews for text files
Robin Appelman [Mon, 4 Jul 2016 10:54:12 +0000 (12:54 +0200)]
Add large sidebar previews for text files

8 years agoMerge pull request #284 from nextcloud/cleanup-after-sync
Morris Jobke [Mon, 4 Jul 2016 10:23:41 +0000 (12:23 +0200)]
Merge pull request #284 from nextcloud/cleanup-after-sync

we don't need to check permissions twice

8 years agoMerge branch 'master' of https://github.com/nextcloud/server
Thomas Pulzer [Mon, 4 Jul 2016 10:06:52 +0000 (12:06 +0200)]
Merge branch 'master' of https://github.com/nextcloud/server

8 years agoFactor out handling sidebar previews
Robin Appelman [Mon, 4 Jul 2016 10:02:07 +0000 (12:02 +0200)]
Factor out handling sidebar previews

8 years agoMerge pull request #303 from nextcloud/collapse-logs-in-github-issue-template
Morris Jobke [Mon, 4 Jul 2016 09:57:43 +0000 (11:57 +0200)]
Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-template

Collapse logs and lists with HTML5 support of github

8 years agoFix summary
Morris Jobke [Mon, 4 Jul 2016 09:56:38 +0000 (11:56 +0200)]
Fix summary

8 years agoChanged name of default logfile from owncloud.log to nextcloud.log.
Thomas Pulzer [Mon, 4 Jul 2016 09:50:32 +0000 (11:50 +0200)]
Changed name of default logfile from owncloud.log to nextcloud.log.

8 years agoMerge pull request #299 from nextcloud/master-use-parameterized-query
Morris Jobke [Mon, 4 Jul 2016 09:49:40 +0000 (11:49 +0200)]
Merge pull request #299 from nextcloud/master-use-parameterized-query

[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager

8 years agowe don't need to check permissions twice
Bjoern Schiessle [Fri, 1 Jul 2016 16:48:48 +0000 (18:48 +0200)]
we don't need to check permissions twice

8 years agoCollapse logs and lists with HTML5 support of github
Joas Schilling [Mon, 4 Jul 2016 08:40:13 +0000 (10:40 +0200)]
Collapse logs and lists with HTML5 support of github

8 years agoMerge pull request #290 from nextcloud/update-transifex-link
Morris Jobke [Mon, 4 Jul 2016 06:07:22 +0000 (08:07 +0200)]
Merge pull request #290 from nextcloud/update-transifex-link

We have our own Transifex org now ;)

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 4 Jul 2016 05:56:34 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

8 years ago[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
Lukas Reschke [Sun, 3 Jul 2016 14:54:41 +0000 (16:54 +0200)]
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager

$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.