]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoRemove undefined variable
Lukas Reschke [Tue, 8 Dec 2015 08:30:55 +0000 (09:30 +0100)]
Remove undefined variable

8 years agoFix PHPDoc + Add handling for error cases
Lukas Reschke [Tue, 8 Dec 2015 08:28:49 +0000 (09:28 +0100)]
Fix PHPDoc + Add handling for error cases

Makes static code analyzers happier.

8 years agoMerge pull request #21498 from owncloud/cleanup-OC_DB
Thomas Müller [Thu, 7 Jan 2016 19:13:16 +0000 (20:13 +0100)]
Merge pull request #21498 from owncloud/cleanup-OC_DB

Cleanup OC_DB methods

8 years agoMerge pull request #20966 from knox/master
Thomas Müller [Thu, 7 Jan 2016 16:16:51 +0000 (17:16 +0100)]
Merge pull request #20966 from knox/master

Do not rewrite letsencrypt .well-known URI

8 years agoMerge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration
Thomas Müller [Thu, 7 Jan 2016 16:07:29 +0000 (17:07 +0100)]
Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration

Added new capabilities test with changes in server configuration

8 years agoMerge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
Thomas Müller [Thu, 7 Jan 2016 15:51:00 +0000 (16:51 +0100)]
Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning

Issue 20218 min max owncloud version warning

8 years agoMerge pull request #21512 from owncloud/allow-searching-by-app-id
Thomas Müller [Thu, 7 Jan 2016 15:43:47 +0000 (16:43 +0100)]
Merge pull request #21512 from owncloud/allow-searching-by-app-id

Allow searching apps by ID

8 years agoAllow searching apps by ID
Joas Schilling [Thu, 7 Jan 2016 15:33:25 +0000 (16:33 +0100)]
Allow searching apps by ID

8 years agoMerge pull request #21481 from owncloud/ext-smb-dependencies
Thomas Müller [Thu, 7 Jan 2016 15:19:20 +0000 (16:19 +0100)]
Merge pull request #21481 from owncloud/ext-smb-dependencies

Check libsmbclient-php as well as smbclient binary

8 years agoMerge pull request #21502 from owncloud/di_mimetypedetector
Thomas Müller [Thu, 7 Jan 2016 15:18:55 +0000 (16:18 +0100)]
Merge pull request #21502 from owncloud/di_mimetypedetector

Add 'OCP\Files\IMimeTypeDetector' to DI container

8 years agoMerge pull request #21507 from owncloud/users-dropdownscroll
Thomas Müller [Thu, 7 Jan 2016 15:18:29 +0000 (16:18 +0100)]
Merge pull request #21507 from owncloud/users-dropdownscroll

Fix users list dropdown position after scroll

8 years agoMerge pull request #21455 from owncloud/fix-method-signature
Thomas Müller [Thu, 7 Jan 2016 15:18:02 +0000 (16:18 +0100)]
Merge pull request #21455 from owncloud/fix-method-signature

Fix method call + undefined variable

8 years agoMerge pull request #21505 from owncloud/allow-downgrades-for-brave-developers
Thomas Müller [Thu, 7 Jan 2016 15:03:36 +0000 (16:03 +0100)]
Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers

Allow downgrades for our brave developers, that switch between branches

8 years agoFix users list dropdown position after scroll
Vincent Petry [Thu, 7 Jan 2016 14:25:04 +0000 (15:25 +0100)]
Fix users list dropdown position after scroll

When scrolling, the position calculation of the multiselect dropdown was
wrong. Adding "position: relative" to the list container makes the
button calculation relative to it instead of the whole page. In this
case the dropdown is properly aligned with the field regardless of
scrolling.

8 years agoRemove deprecated shipped flag from info.xml which has no use anymore
Joas Schilling [Thu, 7 Jan 2016 14:15:58 +0000 (15:15 +0100)]
Remove deprecated shipped flag from info.xml which has no use anymore

8 years agoAdd ownCloud min and max version for shipped apps
Joas Schilling [Thu, 7 Jan 2016 14:11:49 +0000 (15:11 +0100)]
Add ownCloud min and max version for shipped apps

8 years agoAdd a warning to the app:check-code if the version is missing
Joas Schilling [Thu, 7 Jan 2016 14:04:36 +0000 (15:04 +0100)]
Add a warning to the app:check-code if the version is missing

8 years agoAdd a warning on the apps list when the version is missing
Joas Schilling [Thu, 7 Jan 2016 13:55:23 +0000 (14:55 +0100)]
Add a warning on the apps list when the version is missing

8 years agoMerge pull request #20773 from owncloud/share2.0_create
Thomas Müller [Thu, 7 Jan 2016 13:57:05 +0000 (14:57 +0100)]
Merge pull request #20773 from owncloud/share2.0_create

[Sharing 2.0] create share

8 years agoRemove OC_DB::getConnection
Morris Jobke [Thu, 7 Jan 2016 09:26:00 +0000 (10:26 +0100)]
Remove OC_DB::getConnection

8 years agoRemove OC_DB::insertid
Morris Jobke [Thu, 7 Jan 2016 09:22:30 +0000 (10:22 +0100)]
Remove OC_DB::insertid

8 years agoRemove beginTransaction, commit, rollback from OC_DB
Morris Jobke [Thu, 7 Jan 2016 09:18:38 +0000 (10:18 +0100)]
Remove beginTransaction, commit, rollback from OC_DB

8 years agoRemove OC_DB::isError
Morris Jobke [Thu, 7 Jan 2016 09:14:05 +0000 (10:14 +0100)]
Remove OC_DB::isError

8 years agoRemove OC_DB::dropTable
Morris Jobke [Thu, 7 Jan 2016 09:12:08 +0000 (10:12 +0100)]
Remove OC_DB::dropTable

8 years agoMerge pull request #21495 from owncloud/polyfill
Thomas Müller [Thu, 7 Jan 2016 13:23:03 +0000 (14:23 +0100)]
Merge pull request #21495 from owncloud/polyfill

[3rdparty] Bump symfony/polyfill-php

8 years agoMerge pull request #21493 from owncloud/fix-repair-path
Thomas Müller [Thu, 7 Jan 2016 13:18:51 +0000 (14:18 +0100)]
Merge pull request #21493 from owncloud/fix-repair-path

Move lib/repair to lib/private/repair

8 years agoAllow downgrades for our brave developers, that switch between branches
Joas Schilling [Thu, 7 Jan 2016 13:13:46 +0000 (14:13 +0100)]
Allow downgrades for our brave developers, that switch between branches

8 years agoMerge pull request #21359 from owncloud/check-changes
Thomas Müller [Thu, 7 Jan 2016 13:07:38 +0000 (14:07 +0100)]
Merge pull request #21359 from owncloud/check-changes

remove mention of 'filesystem_check_changes' => 2 from the config sample

8 years agoMerge pull request #21503 from owncloud/public-fixdownloadlinktoken
Lukas Reschke [Thu, 7 Jan 2016 12:55:32 +0000 (13:55 +0100)]
Merge pull request #21503 from owncloud/public-fixdownloadlinktoken

Add token in webdav download link of public page

8 years agoAdd token in webdav download link of public page
Vincent Petry [Thu, 7 Jan 2016 12:37:18 +0000 (13:37 +0100)]
Add token in webdav download link of public page

8 years agoFix method call + undefined variable
Lukas Reschke [Tue, 5 Jan 2016 08:50:59 +0000 (09:50 +0100)]
Fix method call + undefined variable

1. Variable is not defined
2. Method does not expect any parameters

```
Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45
```

8 years agoAdd 'OCP\Files\IMimeTypeDetector' to DI container
Roeland Jago Douma [Thu, 7 Jan 2016 12:20:43 +0000 (13:20 +0100)]
Add 'OCP\Files\IMimeTypeDetector' to DI container

* Added test to server container as well

8 years ago[3rdparty] Bump symfony/polyfill-php
Roeland Jago Douma [Thu, 7 Jan 2016 08:32:14 +0000 (09:32 +0100)]
[3rdparty] Bump symfony/polyfill-php

8 years agoMove lib/repair to lib/private/repair
Morris Jobke [Thu, 7 Jan 2016 08:14:35 +0000 (09:14 +0100)]
Move lib/repair to lib/private/repair

8 years agoMerge pull request #21404 from owncloud/symfony_console_2.8.0
Thomas Müller [Thu, 7 Jan 2016 08:11:54 +0000 (09:11 +0100)]
Merge pull request #21404 from owncloud/symfony_console_2.8.0

[3rdparty] Bump symfony/console to 2.8.0

8 years agofix js unit tests
Morris Jobke [Wed, 6 Jan 2016 19:06:04 +0000 (20:06 +0100)]
fix js unit tests

8 years agoAlso remove it from the web interface
Robin Appelman [Wed, 23 Dec 2015 16:23:56 +0000 (17:23 +0100)]
Also remove it from the web interface

8 years agoremove mention of 'filesystem_check_changes' => 2 from the config sample
Robin Appelman [Wed, 23 Dec 2015 16:13:41 +0000 (17:13 +0100)]
remove mention of 'filesystem_check_changes' => 2 from the config sample

8 years agoCheck libsmbclient-php as well as smbclient binary
Robin McCorkell [Wed, 6 Jan 2016 11:51:56 +0000 (11:51 +0000)]
Check libsmbclient-php as well as smbclient binary

8 years agoMerge pull request #21343 from owncloud/ldap-showremnants-json-output
Thomas Müller [Thu, 7 Jan 2016 07:45:06 +0000 (08:45 +0100)]
Merge pull request #21343 from owncloud/ldap-showremnants-json-output

Add an option to occ ldap:showremnants to output a json encoded array…

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 7 Jan 2016 06:55:48 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoMerge pull request #20994 from owncloud/personal-page
Thomas Müller [Wed, 6 Jan 2016 16:25:12 +0000 (17:25 +0100)]
Merge pull request #20994 from owncloud/personal-page

improve layout of personal settings page

8 years agoMerge pull request #21349 from owncloud/web_use_sharee
Thomas Müller [Wed, 6 Jan 2016 16:24:52 +0000 (17:24 +0100)]
Merge pull request #21349 from owncloud/web_use_sharee

Webinterface use sharee API

8 years agoMerge pull request #21398 from owncloud/sharing-disabled-cache
Thomas Müller [Wed, 6 Jan 2016 16:23:14 +0000 (17:23 +0100)]
Merge pull request #21398 from owncloud/sharing-disabled-cache

Cache isSharingDisabledForUser

8 years agoMerge pull request #21443 from owncloud/fix-container-lookup
Thomas Müller [Wed, 6 Jan 2016 16:22:41 +0000 (17:22 +0100)]
Merge pull request #21443 from owncloud/fix-container-lookup

Lookup the App name instead of OCA

8 years agoMerge pull request #21444 from owncloud/move-regenerate-below
Thomas Müller [Wed, 6 Jan 2016 16:21:43 +0000 (17:21 +0100)]
Merge pull request #21444 from owncloud/move-regenerate-below

Move regeneration of session ID into session classes

8 years agoMerge pull request #21459 from owncloud/make-ldap-more-robust
Thomas Müller [Wed, 6 Jan 2016 16:04:16 +0000 (17:04 +0100)]
Merge pull request #21459 from owncloud/make-ldap-more-robust

Make LDAP more robust to exceptions and log them properly

8 years agoMerge pull request #21469 from owncloud/drop-old-gallery-table
Thomas Müller [Wed, 6 Jan 2016 16:03:58 +0000 (17:03 +0100)]
Merge pull request #21469 from owncloud/drop-old-gallery-table

Drop oc_gallery_sharing which was removed in 8.0.0

8 years agoMerge pull request #21482 from owncloud/htaccess-ico-rule
Thomas Müller [Wed, 6 Jan 2016 16:03:18 +0000 (17:03 +0100)]
Merge pull request #21482 from owncloud/htaccess-ico-rule

Allow ico files to be served statically

8 years agoMerge pull request #21488 from th3fallen/patch-1
Thomas Müller [Wed, 6 Jan 2016 15:57:43 +0000 (16:57 +0100)]
Merge pull request #21488 from th3fallen/patch-1

Blacklist myself

8 years agoBlacklist myself
Clark Tomlinson [Wed, 6 Jan 2016 15:08:59 +0000 (10:08 -0500)]
Blacklist myself

To stop being mentioned endlessly

8 years ago[Sharing 2.0] Some error cases report 404 instead of 403
Roeland Jago Douma [Wed, 6 Jan 2016 10:34:12 +0000 (11:34 +0100)]
[Sharing 2.0] Some error cases report 404 instead of 403

8 years ago[Sharing 2.0] Add L10N instance to manager for translated errors
Roeland Jago Douma [Tue, 5 Jan 2016 11:50:00 +0000 (12:50 +0100)]
[Sharing 2.0] Add L10N instance to manager for translated errors

8 years ago[Sharing 2.0] Do not use static function to get numeric storage id
Roeland Jago Douma [Tue, 5 Jan 2016 10:42:54 +0000 (11:42 +0100)]
[Sharing 2.0] Do not use static function to get numeric storage id

8 years ago[Sharing 2.0] General exceptions return 403
Roeland Jago Douma [Tue, 5 Jan 2016 10:00:09 +0000 (11:00 +0100)]
[Sharing 2.0] General exceptions return 403

This is the same as the old behaviour

8 years agoSkip one intergration test until we have fixed the getshares
Roeland Jago Douma [Tue, 15 Dec 2015 08:56:05 +0000 (09:56 +0100)]
Skip one intergration test until we have fixed the getshares

The new sharing code handles things differently so there is no way for
create shares to handle this all properly.

8 years agoMake sure to login at least once for the intergration tests
Roeland Jago Douma [Tue, 15 Dec 2015 08:55:25 +0000 (09:55 +0100)]
Make sure to login at least once for the intergration tests

Else we run into race conditions with the skeleton code

8 years ago[Share 2.0] Enable share creation via OCS API
Roeland Jago Douma [Tue, 15 Dec 2015 08:54:50 +0000 (09:54 +0100)]
[Share 2.0] Enable share creation via OCS API

8 years ago[Share 2.0] Make the share manager ready for share creation
Roeland Jago Douma [Tue, 15 Dec 2015 08:54:12 +0000 (09:54 +0100)]
[Share 2.0] Make the share manager ready for share creation

8 years ago[Share 2.0] Make share provider ready for create shares
Roeland Jago Douma [Tue, 15 Dec 2015 08:53:16 +0000 (09:53 +0100)]
[Share 2.0] Make share provider ready for create shares

8 years ago[Share 2.0] Update share class
Roeland Jago Douma [Tue, 15 Dec 2015 08:52:04 +0000 (09:52 +0100)]
[Share 2.0] Update share class

More getters and setters are required to properly create shares

8 years ago[Share 2.0] Update db structure to stay backwards compatible
Roeland Jago Douma [Tue, 15 Dec 2015 08:51:16 +0000 (09:51 +0100)]
[Share 2.0] Update db structure to stay backwards compatible

8 years agoMake LDAP more robust to exceptions and log them properly
Morris Jobke [Tue, 5 Jan 2016 10:41:06 +0000 (11:41 +0100)]
Make LDAP more robust to exceptions and log them properly

8 years agoDrop oc_gallery_sharing which was removed in 8.0.0
Morris Jobke [Tue, 5 Jan 2016 16:42:20 +0000 (17:42 +0100)]
Drop oc_gallery_sharing which was removed in 8.0.0

See https://github.com/owncloud/gallery-old/commit/c080dfe87d5eb1de8aa27b1836629b57b0316004

8 years agoAllow ico files to be served statically
Morris Jobke [Wed, 6 Jan 2016 12:34:40 +0000 (13:34 +0100)]
Allow ico files to be served statically

8 years agoMerge pull request #21473 from owncloud/fix-unit-tests-because-appstore
Jörn Friedrich Dreyer [Wed, 6 Jan 2016 12:43:29 +0000 (13:43 +0100)]
Merge pull request #21473 from owncloud/fix-unit-tests-because-appstore

Inject OCSClient - Fixes master unit tests

8 years agoInject OCSClient
Lukas Reschke [Tue, 5 Jan 2016 23:03:08 +0000 (00:03 +0100)]
Inject OCSClient

Fixes https://github.com/owncloud/core/issues/21451

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 6 Jan 2016 06:55:16 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoMerge pull request #21409 from JohannesKleine/patch-1
Jörn Friedrich Dreyer [Tue, 5 Jan 2016 14:13:52 +0000 (15:13 +0100)]
Merge pull request #21409 from JohannesKleine/patch-1

Update config.sample.php

8 years agoMerge pull request #21377 from owncloud/login-submit-button-border-2
Jörn Friedrich Dreyer [Tue, 5 Jan 2016 14:13:06 +0000 (15:13 +0100)]
Merge pull request #21377 from owncloud/login-submit-button-border-2

Remove unnecessary border from login button

8 years agoMerge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-help
Jörn Friedrich Dreyer [Tue, 5 Jan 2016 14:12:38 +0000 (15:12 +0100)]
Merge pull request #21446 from edwardcrompton/feature/21413-better-occ-user-help

Feature/21413 better occ user help

8 years agoMerge pull request #21454 from owncloud/proper-style-sidebar-transparency
Jörn Friedrich Dreyer [Tue, 5 Jan 2016 13:50:16 +0000 (14:50 +0100)]
Merge pull request #21454 from owncloud/proper-style-sidebar-transparency

Use color instead of transparency for proper tooltip appearance

8 years agoMerge pull request #21442 from owncloud/annotate-type
Jörn Friedrich Dreyer [Tue, 5 Jan 2016 11:36:31 +0000 (12:36 +0100)]
Merge pull request #21442 from owncloud/annotate-type

Annotate type

8 years agoUse color instead of transparency for proper tooltip appearance
Morris Jobke [Tue, 5 Jan 2016 08:39:24 +0000 (09:39 +0100)]
Use color instead of transparency for proper tooltip appearance

* fixes #21436

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 5 Jan 2016 06:57:14 +0000 (01:57 -0500)]
[tx-robot] updated from transifex

8 years agoWhitespace correction
Edward Crompton [Mon, 4 Jan 2016 15:10:25 +0000 (15:10 +0000)]
Whitespace correction

8 years agoRemoving the . from the end of the help response to match convention set by other...
Edward Crompton [Mon, 4 Jan 2016 15:02:24 +0000 (15:02 +0000)]
Removing the . from the end of the help response to match convention set by other messages

8 years agoAdding a more helpful error message for when occ is run at the console as the wrong...
Edward Crompton [Mon, 4 Jan 2016 14:58:11 +0000 (14:58 +0000)]
Adding a more helpful error message for when occ is run at the console as the wrong user

8 years agoAssign DB group for unit tests
Lukas Reschke [Mon, 4 Jan 2016 14:05:28 +0000 (15:05 +0100)]
Assign DB group for unit tests

8 years agoMove regeneration of session ID into session classes
Lukas Reschke [Mon, 4 Jan 2016 14:00:58 +0000 (15:00 +0100)]
Move regeneration of session ID into session classes

There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.

8 years agoMerge pull request #21393 from owncloud/fix-urlgenerator-call
Thomas Müller [Mon, 4 Jan 2016 14:00:06 +0000 (15:00 +0100)]
Merge pull request #21393 from owncloud/fix-urlgenerator-call

No more deprecation messages in error log

8 years agoLookup the App name instead of OCA
Joas Schilling [Mon, 4 Jan 2016 13:47:49 +0000 (14:47 +0100)]
Lookup the App name instead of OCA

8 years agoAnnotate type
Lukas Reschke [Mon, 4 Jan 2016 13:18:01 +0000 (14:18 +0100)]
Annotate type

Otherwise static code scanners will complain about this.

8 years agoMerge pull request #21435 from owncloud/improved_upgrade_messages
Björn Schießle [Mon, 4 Jan 2016 12:40:52 +0000 (13:40 +0100)]
Merge pull request #21435 from owncloud/improved_upgrade_messages

don't show previous log level in upgrade message

8 years agodon't show previous log level in upgrade message
Björn Schießle [Mon, 4 Jan 2016 10:50:07 +0000 (11:50 +0100)]
don't show previous log level in upgrade message

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 4 Jan 2016 06:55:05 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoMerge branch 'master' into patch-1
JohannesKleine [Sat, 2 Jan 2016 20:56:45 +0000 (21:56 +0100)]
Merge branch 'master' into patch-1

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 2 Jan 2016 06:54:46 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

8 years ago[3rdparty] Bump symfony/console to 2.8.0
Roeland Jago Douma [Wed, 30 Dec 2015 16:04:37 +0000 (17:04 +0100)]
[3rdparty] Bump symfony/console to 2.8.0

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 1 Jan 2016 06:55:10 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoUpdate config.sample.php
JohannesKleine [Thu, 31 Dec 2015 13:48:19 +0000 (14:48 +0100)]
Update config.sample.php

I corrected the word order.

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 31 Dec 2015 06:55:16 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoMerge pull request #21402 from owncloud/view-getuserobject-cache
Thomas Müller [Wed, 30 Dec 2015 19:04:51 +0000 (20:04 +0100)]
Merge pull request #21402 from owncloud/view-getuserobject-cache

Cache usermanager instance in view

8 years agoCache sharing disabled in the view
Robin Appelman [Wed, 30 Dec 2015 13:42:12 +0000 (14:42 +0100)]
Cache sharing disabled in the view

8 years agoCache usermanager instance in view
Robin Appelman [Wed, 30 Dec 2015 13:28:53 +0000 (14:28 +0100)]
Cache usermanager instance in view

8 years agoAdded js tests for the Sharee API usage
Roeland Jago Douma [Wed, 30 Dec 2015 09:46:19 +0000 (10:46 +0100)]
Added js tests for the Sharee API usage

8 years agoMerge branch 'master' into master
mbi [Wed, 30 Dec 2015 09:34:42 +0000 (10:34 +0100)]
Merge branch 'master' into master

8 years agoFix unit tests
Roeland Jago Douma [Wed, 23 Dec 2015 09:49:27 +0000 (10:49 +0100)]
Fix unit tests

8 years agoFilter out share owner in sharee suggestion list
Roeland Jago Douma [Wed, 23 Dec 2015 09:38:53 +0000 (10:38 +0100)]
Filter out share owner in sharee suggestion list

8 years agoWeb sharing uses sharee endpoint
Roeland Jago Douma [Wed, 23 Dec 2015 09:16:57 +0000 (10:16 +0100)]
Web sharing uses sharee endpoint