]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoRename variable to indicate that it can be port and socket.
Andreas Fischer [Thu, 12 Jun 2014 18:18:38 +0000 (20:18 +0200)]
Rename variable to indicate that it can be port and socket.

10 years agoNo need to check the port number as this will fail anyway.
Andreas Fischer [Thu, 12 Jun 2014 18:17:30 +0000 (20:17 +0200)]
No need to check the port number as this will fail anyway.

10 years agoMove getValue() to where required. This actually is not required "global data".
Andreas Fischer [Thu, 12 Jun 2014 17:59:40 +0000 (19:59 +0200)]
Move getValue() to where required. This actually is not required "global data".

10 years agoMove check for : to where it belongs, getting rid of $socket = false;
Andreas Fischer [Thu, 12 Jun 2014 17:55:26 +0000 (19:55 +0200)]
Move check for : to where it belongs, getting rid of $socket = false;

10 years agoExtract common variables of $connectionParams.
Andreas Fischer [Thu, 12 Jun 2014 17:53:33 +0000 (19:53 +0200)]
Extract common variables of $connectionParams.

10 years agoInline $port expression, getting rid of $port variable.
Andreas Fischer [Thu, 12 Jun 2014 17:48:37 +0000 (19:48 +0200)]
Inline $port expression, getting rid of $port variable.

10 years agoFixes based on suggestions
josh4trunks [Thu, 12 Jun 2014 04:47:45 +0000 (21:47 -0700)]
Fixes based on suggestions

I use the term socket for any extension, either unix socket, or internet socket (port).

I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.

By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.

I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks

10 years agoUpdate notes on dbhost
josh4trunks [Fri, 6 Jun 2014 03:17:50 +0000 (20:17 -0700)]
Update notes on dbhost

10 years agoFix variable not always being defined.
josh4trunks [Thu, 5 Jun 2014 06:03:13 +0000 (23:03 -0700)]
Fix variable not always being defined.

10 years agoWork with MySQL Sockets
josh4trunks [Thu, 5 Jun 2014 05:50:23 +0000 (22:50 -0700)]
Work with MySQL Sockets

This passes anything that is not a valid port (0<int<65535) as a unix socket.
I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues.

To use a unix socket, even one different than PHP's mysql.default_socket..
* Database Host = localhost:/path/to/socket

10 years agoMerge pull request #8882 from owncloud/remove-placeholdercall
Morris Jobke [Wed, 4 Jun 2014 22:07:13 +0000 (00:07 +0200)]
Merge pull request #8882 from owncloud/remove-placeholdercall

remove obsolete placeholder call, fix #8881

10 years agoMerge pull request #8724 from owncloud/update-sabre-2.0
Thomas Müller [Wed, 4 Jun 2014 21:05:34 +0000 (23:05 +0200)]
Merge pull request #8724 from owncloud/update-sabre-2.0

Update SabreDAV to 1.8.10

10 years agoMerge pull request #8824 from owncloud/mail_template_editing_in_webui
Morris Jobke [Wed, 4 Jun 2014 16:44:44 +0000 (18:44 +0200)]
Merge pull request #8824 from owncloud/mail_template_editing_in_webui

minimal mail template editor for administrators

10 years agoremove obsolete placeholder call, fix #8881
Jan-Christoph Borchardt [Wed, 4 Jun 2014 16:44:12 +0000 (18:44 +0200)]
remove obsolete placeholder call, fix #8881

10 years agoMerge pull request #8471 from owncloud/versioning_no_longer_track_the_size
Thomas Müller [Wed, 4 Jun 2014 16:19:48 +0000 (18:19 +0200)]
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size

[versioning] let the file cache track the size of the versions

10 years agoMerge pull request #8876 from owncloud/design-css-settings
Morris Jobke [Wed, 4 Jun 2014 15:52:10 +0000 (17:52 +0200)]
Merge pull request #8876 from owncloud/design-css-settings

personal settings: unbold clients header and remove obsolete CSS

10 years agouse the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
Thomas Müller [Tue, 3 Jun 2014 09:43:28 +0000 (11:43 +0200)]
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface

10 years agopersonal settings: unbold clients header and remove obsolete CSS
Jan-Christoph Borchardt [Wed, 4 Jun 2014 15:05:44 +0000 (17:05 +0200)]
personal settings: unbold clients header and remove obsolete CSS

10 years agoMerge pull request #8791 from owncloud/share-overview-sharewithstatus
Morris Jobke [Wed, 4 Jun 2014 15:04:30 +0000 (17:04 +0200)]
Merge pull request #8791 from owncloud/share-overview-sharewithstatus

Update share action text to display owner/recipients

10 years agoMerge pull request #8875 from owncloud/app-css-relative
Jan-Christoph Borchardt [Wed, 4 Jun 2014 14:51:43 +0000 (16:51 +0200)]
Merge pull request #8875 from owncloud/app-css-relative

explicit position:relative for app-content, fixes first run layout

10 years agoremove obsolete position rule from files app
Jan-Christoph Borchardt [Wed, 4 Jun 2014 14:50:55 +0000 (16:50 +0200)]
remove obsolete position rule from files app

10 years agoexplicit position:relative for app-content, fixes first run layout
Jan-Christoph Borchardt [Wed, 4 Jun 2014 14:41:11 +0000 (16:41 +0200)]
explicit position:relative for app-content, fixes first run layout

10 years agofixes during test
Thomas Müller [Wed, 4 Jun 2014 13:01:36 +0000 (15:01 +0200)]
fixes during test

10 years agoMerge pull request #8822 from owncloud/cache-change-propagator
Vincent Petry [Wed, 4 Jun 2014 11:03:14 +0000 (13:03 +0200)]
Merge pull request #8822 from owncloud/cache-change-propagator

[WIP] Improved propagation of cache changes

10 years agoMerge pull request #8844 from owncloud/design-icons
Morris Jobke [Wed, 4 Jun 2014 10:23:08 +0000 (12:23 +0200)]
Merge pull request #8844 from owncloud/design-icons

[WIP] simplify icons, remove shadow

10 years agoUpgrade SabreDAV to 1.8.10
Thomas Müller [Thu, 9 Jan 2014 13:25:48 +0000 (14:25 +0100)]
Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces

10 years agoMerge pull request #8701 from owncloud/slide-up-toggle
Bernhard Posselt [Wed, 4 Jun 2014 09:31:04 +0000 (11:31 +0200)]
Merge pull request #8701 from owncloud/slide-up-toggle

Create reusable data attribute for apps setting slideup

10 years agoMerge pull request #8853 from owncloud/design-typeface
Jan-Christoph Borchardt [Wed, 4 Jun 2014 09:16:03 +0000 (11:16 +0200)]
Merge pull request #8853 from owncloud/design-typeface

Use Open Sans as typeface

10 years agoMerge pull request #8860 from owncloud/phpstorm-code-style
Morris Jobke [Wed, 4 Jun 2014 09:12:35 +0000 (11:12 +0200)]
Merge pull request #8860 from owncloud/phpstorm-code-style

add phpstorm code style

10 years agoIE -> IE8 only
Morris Jobke [Wed, 4 Jun 2014 09:07:28 +0000 (11:07 +0200)]
IE -> IE8 only

10 years agomove from tff to woff and fix IE8
Morris Jobke [Wed, 4 Jun 2014 08:57:49 +0000 (10:57 +0200)]
move from tff to woff and fix IE8

10 years agoadd phpstorm code style
Robin Appelman [Wed, 4 Jun 2014 08:58:51 +0000 (10:58 +0200)]
add phpstorm code style

10 years agoDo not update action icon recipients for file list
Vincent Petry [Wed, 4 Jun 2014 08:48:01 +0000 (10:48 +0200)]
Do not update action icon recipients for file list

Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.

For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.

10 years agoUse recipient display names when updating shares in the UI
Vincent Petry [Wed, 4 Jun 2014 08:37:04 +0000 (10:37 +0200)]
Use recipient display names when updating shares in the UI

Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.

10 years agoMerge pull request #8662 from owncloud/f-lock
Thomas Müller [Wed, 4 Jun 2014 08:26:02 +0000 (10:26 +0200)]
Merge pull request #8662 from owncloud/f-lock

f-lock

10 years agoFix unit tests
Robin Appelman [Wed, 4 Jun 2014 08:01:50 +0000 (10:01 +0200)]
Fix unit tests

10 years agoMerge pull request #8842 from owncloud/ldap_cli_methods
Thomas Müller [Wed, 4 Jun 2014 07:37:04 +0000 (09:37 +0200)]
Merge pull request #8842 from owncloud/ldap_cli_methods

command line tools to see, modify and test existing LDAP configurations

10 years agoMerge pull request #8849 from owncloud/trash_expire_fix
Thomas Müller [Wed, 4 Jun 2014 07:36:40 +0000 (09:36 +0200)]
Merge pull request #8849 from owncloud/trash_expire_fix

get files in trash from file cache

10 years agofixing typo
Thomas Müller [Wed, 4 Jun 2014 07:36:27 +0000 (09:36 +0200)]
fixing typo

10 years agoMerge pull request #8468 from owncloud/remove-infieldlabels
Jan-Christoph Borchardt [Wed, 4 Jun 2014 07:28:20 +0000 (09:28 +0200)]
Merge pull request #8468 from owncloud/remove-infieldlabels

Remove infieldlabels

10 years agoworkaround to get the unit test going
Thomas Müller [Wed, 4 Jun 2014 06:21:28 +0000 (08:21 +0200)]
workaround to get the unit test going

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 4 Jun 2014 05:57:48 +0000 (01:57 -0400)]
[tx-robot] updated from transifex

10 years agoget the storage from the view
Bjoern Schiessle [Tue, 3 Jun 2014 08:23:51 +0000 (10:23 +0200)]
get the storage from the view

10 years agoUse ->instanceOfStorage() not instanceof for Storage instances.
ringmaster [Mon, 2 Jun 2014 19:52:31 +0000 (15:52 -0400)]
Use ->instanceOfStorage() not instanceof for Storage instances.

10 years agoCan't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage(...
ringmaster [Mon, 2 Jun 2014 14:54:41 +0000 (10:54 -0400)]
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.

10 years agoonly lock if unlink is called for a file
Bjoern Schiessle [Mon, 2 Jun 2014 14:38:55 +0000 (16:38 +0200)]
only lock if unlink is called for a file

10 years agofix unit test after adding the additional parameter to addStorageWrapper()
Bjoern Schiessle [Mon, 2 Jun 2014 13:12:31 +0000 (15:12 +0200)]
fix unit test after adding the additional parameter to addStorageWrapper()

10 years agoname the storage wrapper to make sure that we don't apply the wrapper multiple times
Bjoern Schiessle [Mon, 2 Jun 2014 13:06:15 +0000 (15:06 +0200)]
name the storage wrapper to make sure that we don't apply the wrapper multiple times

10 years agodon't ask for fileInfo if we already have one
Bjoern Schiessle [Mon, 2 Jun 2014 10:04:46 +0000 (12:04 +0200)]
don't ask for fileInfo if we already have one

10 years agoNormalize lock exception messages.
ringmaster [Fri, 30 May 2014 12:10:48 +0000 (08:10 -0400)]
Normalize lock exception messages.

10 years agomake sure to close the stream at the end of each test
Bjoern Schiessle [Wed, 28 May 2014 14:05:24 +0000 (16:05 +0200)]
make sure to close the stream at the end of each test

10 years agoRestore the reference to this used exception class.
ringmaster [Wed, 28 May 2014 13:45:03 +0000 (09:45 -0400)]
Restore the reference to this used exception class.

10 years agoMove Lock to private namespace, add interface. Update PHPDoc.
ringmaster [Wed, 28 May 2014 13:04:05 +0000 (09:04 -0400)]
Move Lock to private namespace, add interface. Update PHPDoc.

10 years agoDon't error out on console.
ringmaster [Wed, 28 May 2014 11:56:24 +0000 (07:56 -0400)]
Don't error out on console.

10 years agoRemoved unused vars/declarations, update PHPDoc.
ringmaster [Tue, 27 May 2014 20:12:07 +0000 (16:12 -0400)]
Removed unused vars/declarations, update PHPDoc.

10 years agoFix typo
Lukas Reschke [Tue, 27 May 2014 19:02:55 +0000 (21:02 +0200)]
Fix typo

10 years agoFix typo
Lukas Reschke [Tue, 27 May 2014 18:59:48 +0000 (20:59 +0200)]
Fix typo

10 years agoRemove unused methods.
ringmaster [Tue, 27 May 2014 13:31:20 +0000 (09:31 -0400)]
Remove unused methods.

10 years agoRespect locked files, surface correct exception.
ringmaster [Sat, 24 May 2014 13:18:24 +0000 (09:18 -0400)]
Respect locked files, surface correct exception.

10 years agoSimpler log unique id.
ringmaster [Sat, 24 May 2014 13:17:29 +0000 (09:17 -0400)]
Simpler log unique id.

10 years agoAdd actual locking and log changes necessary for debugging.
ringmaster [Sat, 24 May 2014 11:46:44 +0000 (07:46 -0400)]
Add actual locking and log changes necessary for debugging.

10 years agoContinued flock work.
ringmaster [Fri, 23 May 2014 14:29:37 +0000 (10:29 -0400)]
Continued flock work.

10 years agoflock changes. Work in progress.
ringmaster [Tue, 20 May 2014 21:44:57 +0000 (17:44 -0400)]
flock changes.  Work in progress.

10 years agounbold the username
Jan-Christoph Borchardt [Tue, 3 Jun 2014 18:02:50 +0000 (20:02 +0200)]
unbold the username

10 years agoFix size calculation during recursive scan
Robin Appelman [Tue, 3 Jun 2014 09:55:35 +0000 (11:55 +0200)]
Fix size calculation during recursive scan

10 years agoMerge pull request #8686 from owncloud/session-early
Morris Jobke [Tue, 3 Jun 2014 17:23:30 +0000 (19:23 +0200)]
Merge pull request #8686 from owncloud/session-early

Make the session available as early as possible

10 years agoMerge pull request #8698 from owncloud/sharing_improve_permissions
Thomas Müller [Tue, 3 Jun 2014 17:13:51 +0000 (19:13 +0200)]
Merge pull request #8698 from owncloud/sharing_improve_permissions

get permissions directly from share storage to avoid additional db calls

10 years agodo not use italic typeface style, instead lighter color
Jan-Christoph Borchardt [Tue, 3 Jun 2014 17:12:31 +0000 (19:12 +0200)]
do not use italic typeface style, instead lighter color

10 years agoFix casing and PHPDoc
Thomas Müller [Tue, 3 Jun 2014 17:10:18 +0000 (19:10 +0200)]
Fix casing and PHPDoc

10 years agoMerge pull request #7930 from owncloud/fix_7785_master
blizzz [Tue, 3 Jun 2014 17:09:33 +0000 (19:09 +0200)]
Merge pull request #7930 from owncloud/fix_7785_master

LDAP: put out fetching of user meta data into a fully tested class of it...

10 years agouse Open Sans as typeface
Jan-Christoph Borchardt [Tue, 3 Jun 2014 17:07:08 +0000 (19:07 +0200)]
use Open Sans as typeface

10 years agoFix merge conflict
Thomas Müller [Tue, 3 Jun 2014 17:05:21 +0000 (19:05 +0200)]
Fix merge conflict

10 years agoMerge pull request #8264 from owncloud/app-enable-by-group
icewind1991 [Tue, 3 Jun 2014 17:01:12 +0000 (19:01 +0200)]
Merge pull request #8264 from owncloud/app-enable-by-group

Add the option to enable apps only for specific groups

10 years agoMerge pull request #8809 from owncloud/appconfig-caching
Thomas Müller [Tue, 3 Jun 2014 16:59:37 +0000 (18:59 +0200)]
Merge pull request #8809 from owncloud/appconfig-caching

Improve caching in AppConfig

10 years agoconvert mail template editor to app framework for a restful api
Jörn Friedrich Dreyer [Tue, 3 Jun 2014 14:50:05 +0000 (16:50 +0200)]
convert mail template editor to app framework for a restful api

10 years agoMerge pull request #8837 from owncloud/issue/8720
Morris Jobke [Tue, 3 Jun 2014 14:46:04 +0000 (16:46 +0200)]
Merge pull request #8837 from owncloud/issue/8720

Fix cursor and background of app navigation

10 years agoget files in trash from file cache
Bjoern Schiessle [Tue, 3 Jun 2014 14:45:11 +0000 (16:45 +0200)]
get files in trash from file cache

10 years agoMerge pull request #8840 from owncloud/share_settings
Thomas Müller [Tue, 3 Jun 2014 14:42:44 +0000 (16:42 +0200)]
Merge pull request #8840 from owncloud/share_settings

by default don't show option to send mail notifications for shares

10 years agoMerge pull request #8577 from owncloud/apps-sidebar-narrower
Morris Jobke [Tue, 3 Jun 2014 14:39:41 +0000 (16:39 +0200)]
Merge pull request #8577 from owncloud/apps-sidebar-narrower

reduce width of app sidebar a bit

10 years agoMerge pull request #8843 from owncloud/design-detail-sharedropdown
Morris Jobke [Tue, 3 Jun 2014 14:35:31 +0000 (16:35 +0200)]
Merge pull request #8843 from owncloud/design-detail-sharedropdown

fix positioning issue of share dropdown in intermediate widths

10 years agoMerge pull request #7015 from owncloud/db-migration-check-copy
icewind1991 [Tue, 3 Jun 2014 14:27:06 +0000 (16:27 +0200)]
Merge pull request #7015 from owncloud/db-migration-check-copy

Check database migration on a copy of the table first

10 years agomove to updated version of placeholder
Morris Jobke [Tue, 3 Jun 2014 14:18:06 +0000 (16:18 +0200)]
move to updated version of placeholder

10 years agosimplify logout and caret icons, remove shadow
Jan-Christoph Borchardt [Tue, 3 Jun 2014 13:59:41 +0000 (15:59 +0200)]
simplify logout and caret icons, remove shadow

10 years agofix text alignment in input fields
Jan-Christoph Borchardt [Tue, 3 Jun 2014 08:02:11 +0000 (10:02 +0200)]
fix text alignment in input fields

10 years agofix icon alignment in input fields
Jan-Christoph Borchardt [Tue, 3 Jun 2014 07:58:17 +0000 (09:58 +0200)]
fix icon alignment in input fields

10 years agoadd missing placeholder shim for change password fields in IE8/9
Jan-Christoph Borchardt [Mon, 2 Jun 2014 21:39:59 +0000 (23:39 +0200)]
add missing placeholder shim for change password fields in IE8/9

10 years agoremove tilde selector for IE8 compatibility
Jan-Christoph Borchardt [Mon, 2 Jun 2014 21:39:27 +0000 (23:39 +0200)]
remove tilde selector for IE8 compatibility

10 years agoremove scruntinizer config for infield
Morris Jobke [Tue, 6 May 2014 11:50:03 +0000 (13:50 +0200)]
remove scruntinizer config for infield

10 years agofix show password icon in personal settings
Jan-Christoph Borchardt [Tue, 6 May 2014 10:44:16 +0000 (12:44 +0200)]
fix show password icon in personal settings

10 years agoinfield label removal: remove last occurences of infield labels
Jan-Christoph Borchardt [Tue, 6 May 2014 10:43:52 +0000 (12:43 +0200)]
infield label removal: remove last occurences of infield labels

10 years agoinfield label removal: remove JS file and references to it
Jan-Christoph Borchardt [Tue, 6 May 2014 10:30:43 +0000 (12:30 +0200)]
infield label removal: remove JS file and references to it

10 years agoinfield label removal: fix installation screen
Jan-Christoph Borchardt [Tue, 6 May 2014 10:14:11 +0000 (12:14 +0200)]
infield label removal: fix installation screen

10 years agofirst step of infield label removal, fix login screen
Jan-Christoph Borchardt [Tue, 6 May 2014 10:07:53 +0000 (12:07 +0200)]
first step of infield label removal, fix login screen

10 years agoMerge pull request #8827 from owncloud/add-sqlite-info
Thomas Müller [Tue, 3 Jun 2014 13:07:59 +0000 (15:07 +0200)]
Merge pull request #8827 from owncloud/add-sqlite-info

add info about sqlite on setup page

10 years agoMerge pull request #8838 from owncloud/backgroundjob-legacy-gc
Thomas Müller [Tue, 3 Jun 2014 13:06:35 +0000 (15:06 +0200)]
Merge pull request #8838 from owncloud/backgroundjob-legacy-gc

Support having legacy `OC_Cache_FileGlobalGC` background jobs

10 years agoMerge pull request #7151 from owncloud/user-jquery
Thomas Müller [Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)]
Merge pull request #7151 from owncloud/user-jquery

Continuing the New User management

10 years agoremove specific sidebar size from Files app
Jan-Christoph Borchardt [Tue, 3 Jun 2014 11:24:44 +0000 (13:24 +0200)]
remove specific sidebar size from Files app

10 years agoreduce width of app sidebar a bit
Jan-Christoph Borchardt [Tue, 13 May 2014 13:13:35 +0000 (15:13 +0200)]
reduce width of app sidebar a bit

10 years agofix positioning issue of share dropdown in intermediate widths
Jan-Christoph Borchardt [Tue, 3 Jun 2014 11:13:15 +0000 (13:13 +0200)]
fix positioning issue of share dropdown in intermediate widths

10 years agoget rid of @read in PHP doc after rebase
Arthur Schiwon [Tue, 3 Jun 2014 11:01:14 +0000 (13:01 +0200)]
get rid of @read in PHP doc after rebase