]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoMerge pull request #22124 from owncloud/comments-author-check
Thomas Müller [Thu, 4 Feb 2016 14:16:33 +0000 (15:16 +0100)]
Merge pull request #22124 from owncloud/comments-author-check

Check for authorship on edit attempt

8 years agoMerge pull request #22126 from owncloud/share2_lazy_shares
Thomas Müller [Thu, 4 Feb 2016 14:16:16 +0000 (15:16 +0100)]
Merge pull request #22126 from owncloud/share2_lazy_shares

Lazy shares

8 years agoAlso add type (file/folder) to IShare object
Roeland Jago Douma [Thu, 4 Feb 2016 13:28:09 +0000 (14:28 +0100)]
Also add type (file/folder) to IShare object

We need this for the hooks :(

8 years agoUnit test for delete lazy shares
Roeland Jago Douma [Thu, 4 Feb 2016 12:28:48 +0000 (13:28 +0100)]
Unit test for delete lazy shares

8 years agoAdd unit tests
Roeland Jago Douma [Thu, 4 Feb 2016 12:05:05 +0000 (13:05 +0100)]
Add unit tests

8 years agoMerge pull request #22121 from owncloud/comments-deleteduser
Thomas Müller [Thu, 4 Feb 2016 12:03:18 +0000 (13:03 +0100)]
Merge pull request #22121 from owncloud/comments-deleteduser

Special label for deleted users in comments list

8 years agoCheck for authorship on edit and delete attempts
Arthur Schiwon [Thu, 4 Feb 2016 11:57:48 +0000 (12:57 +0100)]
Check for authorship on edit and delete attempts

8 years agoMake the share object lazy
Roeland Jago Douma [Thu, 4 Feb 2016 11:51:23 +0000 (12:51 +0100)]
Make the share object lazy

Share providers can now just pass in a fileId. And the node will only be
created once needed.

8 years agoMerge pull request #22025 from owncloud/21838-jenkins
Thomas Müller [Thu, 4 Feb 2016 10:58:45 +0000 (11:58 +0100)]
Merge pull request #22025 from owncloud/21838-jenkins

[jenkins] + rebased, of #21838

8 years agoSpecial label for deleted users in comments list
Vincent Petry [Thu, 4 Feb 2016 10:26:11 +0000 (11:26 +0100)]
Special label for deleted users in comments list

8 years agoMerge pull request #22110 from owncloud/comment-types-always-plural
Thomas Müller [Thu, 4 Feb 2016 09:55:49 +0000 (10:55 +0100)]
Merge pull request #22110 from owncloud/comment-types-always-plural

types shall always be plural

8 years agoMerge pull request #22103 from ErikPel/tag-css-fix
Thomas Müller [Thu, 4 Feb 2016 09:49:41 +0000 (10:49 +0100)]
Merge pull request #22103 from ErikPel/tag-css-fix

Fixes #22097

8 years agoMerge pull request #21964 from owncloud/calendar-sharing-3
Thomas Müller [Thu, 4 Feb 2016 09:48:36 +0000 (10:48 +0100)]
Merge pull request #21964 from owncloud/calendar-sharing-3

Add calendar sharing

8 years agoMerge pull request #22108 from owncloud/comments-edit
Thomas Müller [Thu, 4 Feb 2016 09:47:49 +0000 (10:47 +0100)]
Merge pull request #22108 from owncloud/comments-edit

Comment owner can now edit or delete

8 years agoMerge pull request #22072 from vincchan/trim-newusername-whitespace
Thomas Müller [Thu, 4 Feb 2016 09:33:30 +0000 (10:33 +0100)]
Merge pull request #22072 from vincchan/trim-newusername-whitespace

Do not allow username to have whitespace at the beginning or at the end

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

8 years agofix unit tests
Arthur Schiwon [Wed, 3 Feb 2016 21:45:33 +0000 (22:45 +0100)]
fix unit tests

8 years agochange error logging
alexweirig [Fri, 29 Jan 2016 13:21:20 +0000 (14:21 +0100)]
change error logging

replaced variable with print_r call

8 years agoFixed undefined variable $dnGroup and variable name
alexweirig [Fri, 29 Jan 2016 07:27:59 +0000 (08:27 +0100)]
Fixed undefined variable $dnGroup and variable name

I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.

8 years agoRefactored code to avoid performance problem
alexweirig [Thu, 28 Jan 2016 13:43:55 +0000 (14:43 +0100)]
Refactored code to avoid performance problem

Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl

8 years agocode changes for user_ldap Dynamic Group Membership
Alex Weirig [Thu, 14 Jan 2016 12:26:40 +0000 (13:26 +0100)]
code changes for user_ldap Dynamic Group Membership

Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.

8 years agoAdded unit tests for edit/delete comments
Vincent Petry [Wed, 3 Feb 2016 20:06:37 +0000 (21:06 +0100)]
Added unit tests for edit/delete comments

8 years agoMove comment delete action into edit mode
Vincent Petry [Wed, 3 Feb 2016 19:32:37 +0000 (20:32 +0100)]
Move comment delete action into edit mode

8 years agoComment owner can now edit or delete
Vincent Petry [Wed, 3 Feb 2016 17:44:14 +0000 (18:44 +0100)]
Comment owner can now edit or delete

8 years agoMerge pull request #22101 from owncloud/comments-filerow
Thomas Müller [Wed, 3 Feb 2016 19:53:40 +0000 (20:53 +0100)]
Merge pull request #22101 from owncloud/comments-filerow

Add file row indicator for unread comments

8 years agoMerge pull request #22088 from owncloud/share2_ishare
Thomas Müller [Wed, 3 Feb 2016 19:53:25 +0000 (20:53 +0100)]
Merge pull request #22088 from owncloud/share2_ishare

[Share 2.0] Pass around userid/groupid/federatedid

8 years agoRemove entries in dav_shares on deletion of a calendar
Thomas Müller [Wed, 3 Feb 2016 19:18:56 +0000 (20:18 +0100)]
Remove entries in dav_shares on deletion of a calendar

8 years agotypes shall always be plural
Arthur Schiwon [Wed, 3 Feb 2016 18:28:15 +0000 (19:28 +0100)]
types shall always be plural

8 years ago[Share 2.0] Fix public link sharing
Roeland Jago Douma [Wed, 3 Feb 2016 07:25:57 +0000 (08:25 +0100)]
[Share 2.0] Fix public link sharing

8 years ago[Share 2.0] Fix OCS endpoint
Roeland Jago Douma [Wed, 3 Feb 2016 07:14:48 +0000 (08:14 +0100)]
[Share 2.0] Fix OCS endpoint

8 years ago[Share 2.0] Fix shareManager
Roeland Jago Douma [Tue, 2 Feb 2016 20:02:09 +0000 (21:02 +0100)]
[Share 2.0] Fix shareManager

8 years ago[Share 2.0] Fix defaultshare provider
Roeland Jago Douma [Tue, 2 Feb 2016 15:57:50 +0000 (16:57 +0100)]
[Share 2.0] Fix defaultshare provider

8 years ago[Share 2.0] Use strings for ids
Roeland Jago Douma [Tue, 2 Feb 2016 15:55:41 +0000 (16:55 +0100)]
[Share 2.0] Use strings for ids

* sharedWith
* sharedBy
* shareOwner

Now all set/get strings with the id. (userId, groupId,
federatedsharerId).

This to avoid a huge amount of if statements

8 years agoMerge pull request #22106 from owncloud/use-newly-generated-keys
Daniel Molkentin [Wed, 3 Feb 2016 17:19:24 +0000 (18:19 +0100)]
Merge pull request #22106 from owncloud/use-newly-generated-keys

Use newly generated certificate authority

8 years agoUse newly generated certificate authority
Lukas Reschke [Wed, 3 Feb 2016 17:17:43 +0000 (18:17 +0100)]
Use newly generated certificate authority

8 years agoAdding propfind property to retrieve sharee information from a dav resource
Thomas Müller [Tue, 2 Feb 2016 14:13:28 +0000 (15:13 +0100)]
Adding propfind property to retrieve sharee information from a dav resource

8 years agoDeleting a shared address book results in unshare
Thomas Müller [Tue, 2 Feb 2016 12:50:46 +0000 (13:50 +0100)]
Deleting a shared address book results in unshare

8 years agoDeleting a shared calendar results in unshare
Thomas Müller [Tue, 2 Feb 2016 12:07:14 +0000 (13:07 +0100)]
Deleting a shared calendar results in unshare

8 years agoDisallow to share with the owner of the resource
Thomas Müller [Mon, 1 Feb 2016 10:47:41 +0000 (11:47 +0100)]
Disallow to share with the owner of the resource

8 years agoFix ACLs on shared calendars
Thomas Müller [Thu, 28 Jan 2016 19:30:40 +0000 (20:30 +0100)]
Fix ACLs on shared calendars

8 years agoNo duplicate address book if shared with user and group and the user is part of the...
Thomas Müller [Thu, 28 Jan 2016 16:40:59 +0000 (17:40 +0100)]
No duplicate address book if shared with user and group and the user is part of the group

8 years agoNo duplicate calendars if shared with user and group and the user is part of the...
Thomas Müller [Thu, 28 Jan 2016 16:16:11 +0000 (17:16 +0100)]
No duplicate calendars if shared with user and group and the user is part of the group

8 years agoAdd calendar sharing
Thomas Müller [Tue, 26 Jan 2016 11:06:02 +0000 (12:06 +0100)]
Add calendar sharing

8 years agoFixes #22097
Erik Pellikka [Wed, 3 Feb 2016 13:11:59 +0000 (08:11 -0500)]
Fixes #22097

Updated with more specific css selector

Moved the curly brace to the same line as the selector

firefox fix

8 years agoReset comments read marker after loading comments
Vincent Petry [Wed, 3 Feb 2016 15:18:14 +0000 (16:18 +0100)]
Reset comments read marker after loading comments

8 years agoMerge pull request #22086 from RealRancor/RealRancor-patch-1
Thomas Müller [Wed, 3 Feb 2016 15:09:02 +0000 (16:09 +0100)]
Merge pull request #22086 from RealRancor/RealRancor-patch-1

Remove files_locking from shipped.json

8 years agoMerge pull request #22095 from owncloud/public_link_with_port
Thomas Müller [Wed, 3 Feb 2016 15:06:54 +0000 (16:06 +0100)]
Merge pull request #22095 from owncloud/public_link_with_port

Public link downloads should work on instance on non default port

8 years agoMerge pull request #22071 from owncloud/cache-split-insert
Thomas Müller [Wed, 3 Feb 2016 13:32:28 +0000 (14:32 +0100)]
Merge pull request #22071 from owncloud/cache-split-insert

split cache->insert from cache->put

8 years agoMerge pull request #22098 from owncloud/cleanup-core-apps
Thomas Müller [Wed, 3 Feb 2016 13:17:10 +0000 (14:17 +0100)]
Merge pull request #22098 from owncloud/cleanup-core-apps

Cleanup core apps

8 years agomove whitspace check to user manager
Vincent Chan [Wed, 3 Feb 2016 13:09:15 +0000 (14:09 +0100)]
move whitspace check to user manager

8 years agoMerge pull request #21996 from owncloud/flysystem-1.0.16
Thomas Müller [Wed, 3 Feb 2016 12:57:09 +0000 (13:57 +0100)]
Merge pull request #21996 from owncloud/flysystem-1.0.16

[3rdparty] Bump flysystem to 1.0.16

8 years agoMerge pull request #22070 from owncloud/share2_exceptions
Thomas Müller [Wed, 3 Feb 2016 12:36:14 +0000 (13:36 +0100)]
Merge pull request #22070 from owncloud/share2_exceptions

Add sharing exceptions to OCP

8 years agoMerge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting
Thomas Müller [Wed, 3 Feb 2016 12:03:43 +0000 (13:03 +0100)]
Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting

Revert "setting to skip migration tests by default"

8 years agoAdd file row indicator for unread comments
Vincent Petry [Wed, 3 Feb 2016 12:00:55 +0000 (13:00 +0100)]
Add file row indicator for unread comments

8 years agoRevert "setting to skip migration tests by default"
Morris Jobke [Wed, 3 Feb 2016 11:59:47 +0000 (12:59 +0100)]
Revert "setting to skip migration tests by default"

8 years agoMake sure tests don't leave a stray directory behind
Joas Schilling [Wed, 3 Feb 2016 11:57:22 +0000 (12:57 +0100)]
Make sure tests don't leave a stray directory behind

8 years agoMake sure encryption has a valid licence tag
Joas Schilling [Wed, 3 Feb 2016 11:57:03 +0000 (12:57 +0100)]
Make sure encryption has a valid licence tag

8 years agoRemove deprecated and unused standalone tag
Joas Schilling [Wed, 3 Feb 2016 11:56:42 +0000 (12:56 +0100)]
Remove deprecated and unused standalone tag

8 years agoRemove invalid app user doc links
Joas Schilling [Wed, 3 Feb 2016 11:56:17 +0000 (12:56 +0100)]
Remove invalid app user doc links

8 years agosplit cache->insert from cache->put
Robin Appelman [Tue, 2 Feb 2016 13:41:14 +0000 (14:41 +0100)]
split cache->insert from cache->put

8 years agoMerge pull request #21997 from owncloud/checksums
Thomas Müller [Wed, 3 Feb 2016 10:36:22 +0000 (11:36 +0100)]
Merge pull request #21997 from owncloud/checksums

Checksums

8 years agoMerge pull request #22081 from owncloud/mount-cache-invalid-storage
Thomas Müller [Wed, 3 Feb 2016 10:36:04 +0000 (11:36 +0100)]
Merge pull request #22081 from owncloud/mount-cache-invalid-storage

filter invalid storages from the mount cache early

8 years agoMerge pull request #22084 from owncloud/configphp-fixes
Thomas Müller [Wed, 3 Feb 2016 10:35:43 +0000 (11:35 +0100)]
Merge pull request #22084 from owncloud/configphp-fixes

small corrections; Web is capitalized, webroot is one lowercase word

8 years agoMerge pull request #22090 from owncloud/skip-migration-tests-setting
Thomas Müller [Wed, 3 Feb 2016 10:35:16 +0000 (11:35 +0100)]
Merge pull request #22090 from owncloud/skip-migration-tests-setting

setting to skip migration tests by default

8 years agoConstruct valid URL
Roeland Jago Douma [Wed, 3 Feb 2016 10:29:36 +0000 (11:29 +0100)]
Construct valid URL

8 years agohost and hostname are different things
Roeland Jago Douma [Wed, 3 Feb 2016 10:28:07 +0000 (11:28 +0100)]
host and hostname are different things

host can contain the port (host of http://example.com:1234 is
example.com:1234) while hostname never contains a port. They can however
be similar. If you navigate to http://example.com then both host and
hostname will be example.com.

* Fixed docs
* added getHostName function

8 years agosmall corrections; Web is capitalized, webroot is one lowercase word
Carla Schroder [Tue, 2 Feb 2016 23:30:07 +0000 (15:30 -0800)]
small corrections; Web is capitalized, webroot is one lowercase word

8 years agoRemove files_locking from shipped.json
RealRancor [Wed, 3 Feb 2016 07:14:08 +0000 (08:14 +0100)]
Remove files_locking from shipped.json

8 years agosetting to skip migration tests by default
Morris Jobke [Thu, 1 Oct 2015 12:23:25 +0000 (14:23 +0200)]
setting to skip migration tests by default

* if you install owncloud via package it is not
  possible to skip migration tests
* this also allows to disable migration tests for
  an instance by default

8 years agoMerge pull request #21772 from owncloud/occ-external-applicable
Thomas Müller [Wed, 3 Feb 2016 08:03:59 +0000 (09:03 +0100)]
Merge pull request #21772 from owncloud/occ-external-applicable

Add occ command to manage applicables

8 years agoAdd store/retrieve checksums
Roeland Jago Douma [Fri, 29 Jan 2016 20:50:48 +0000 (21:50 +0100)]
Add store/retrieve checksums

* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums

8 years agoMerge pull request #21961 from owncloud/comments-gui
Thomas Müller [Wed, 3 Feb 2016 08:03:43 +0000 (09:03 +0100)]
Merge pull request #21961 from owncloud/comments-gui

Comments GUI in files sidebar

8 years agoMerge pull request #22059 from owncloud/comments-readmark-dav
Thomas Müller [Wed, 3 Feb 2016 08:00:32 +0000 (09:00 +0100)]
Merge pull request #22059 from owncloud/comments-readmark-dav

Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status

8 years agoMerge pull request #22053 from owncloud/files_external-params-flags
Thomas Müller [Wed, 3 Feb 2016 08:00:17 +0000 (09:00 +0100)]
Merge pull request #22053 from owncloud/files_external-params-flags

Remove magic flags from files_external backend params

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

8 years agoMerge pull request #22076 from owncloud/activities-yes-default-enabled-no
Morris Jobke [Tue, 2 Feb 2016 17:20:20 +0000 (18:20 +0100)]
Merge pull request #22076 from owncloud/activities-yes-default-enabled-no

Don't enable tag activities for email by default

8 years agoAdd comments app to expected apps in test
Vincent Petry [Tue, 2 Feb 2016 17:14:58 +0000 (18:14 +0100)]
Add comments app to expected apps in test

8 years agofilter invalid storages from the mount cache early
Robin Appelman [Tue, 2 Feb 2016 17:10:13 +0000 (18:10 +0100)]
filter invalid storages from the mount cache early

8 years agoFixed report name
Vincent Petry [Tue, 2 Feb 2016 17:06:16 +0000 (18:06 +0100)]
Fixed report name

8 years agoAdded JS unit tests for comments
Vincent Petry [Tue, 2 Feb 2016 14:13:45 +0000 (15:13 +0100)]
Added JS unit tests for comments

8 years agoAdd spinner when submitting comments
Vincent Petry [Tue, 2 Feb 2016 11:06:12 +0000 (12:06 +0100)]
Add spinner when submitting comments

8 years agoFix parsing empty Webdav property nodes
Vincent Petry [Tue, 2 Feb 2016 10:52:55 +0000 (11:52 +0100)]
Fix parsing empty Webdav property nodes

Return empty string instead of undefined

8 years agoFix formatting messages with newlines
Vincent Petry [Mon, 1 Feb 2016 15:54:27 +0000 (16:54 +0100)]
Fix formatting messages with newlines

8 years agoBetter comments pagination logic
Vincent Petry [Mon, 1 Feb 2016 15:54:18 +0000 (16:54 +0100)]
Better comments pagination logic

8 years agoImprove comments style, add avatars
Vincent Petry [Mon, 1 Feb 2016 15:37:33 +0000 (16:37 +0100)]
Improve comments style, add avatars

8 years agoExpose display name in JS side
Vincent Petry [Mon, 1 Feb 2016 14:11:42 +0000 (15:11 +0100)]
Expose display name in JS side

Adds a new method `OC.getCurrentUser` to get both the user id and
display name Could be used for a future Js

8 years agoUse last comment's time for pagination
Vincent Petry [Thu, 28 Jan 2016 13:26:07 +0000 (14:26 +0100)]
Use last comment's time for pagination

8 years agoAdd pagination support for comments GUI
Vincent Petry [Thu, 28 Jan 2016 13:24:12 +0000 (14:24 +0100)]
Add pagination support for comments GUI

8 years agoImprove comment date format
Vincent Petry [Thu, 28 Jan 2016 10:47:23 +0000 (11:47 +0100)]
Improve comment date format

8 years agoComments GUI
Vincent Petry [Wed, 27 Jan 2016 17:28:55 +0000 (18:28 +0100)]
Comments GUI

8 years agoDon't enable tag activities by default
Joas Schilling [Tue, 2 Feb 2016 15:28:37 +0000 (16:28 +0100)]
Don't enable tag activities by default

8 years agoMerge pull request #22054 from vincchan/vincchan/fix#20199
Thomas Müller [Tue, 2 Feb 2016 14:59:07 +0000 (15:59 +0100)]
Merge pull request #22054 from vincchan/vincchan/fix#20199

Move data protection check to javascript

8 years agoRemove magic flags from files_external backend params
Robin Appelman [Mon, 1 Feb 2016 16:44:58 +0000 (17:44 +0100)]
Remove magic flags from files_external backend params

8 years agoDo not allow username to have space at the beginning or at the end
Vincent Chan [Tue, 2 Feb 2016 13:56:19 +0000 (14:56 +0100)]
Do not allow username to have space at the beginning or at the end
fixes #22035

8 years agoupdate routine was lacking where statements :see_no_evil:
Arthur Schiwon [Mon, 1 Feb 2016 21:45:52 +0000 (22:45 +0100)]
update routine was lacking where statements :see_no_evil:

8 years ago[Share 2.0] Use GenericShareException
Roeland Jago Douma [Tue, 2 Feb 2016 13:18:59 +0000 (14:18 +0100)]
[Share 2.0] Use GenericShareException

8 years ago[Share 2.0] Add exceptions to OCP
Roeland Jago Douma [Tue, 2 Feb 2016 13:07:11 +0000 (14:07 +0100)]
[Share 2.0] Add exceptions to OCP

8 years agoMerge pull request #22023 from owncloud/interruptable-commands
Thomas Müller [Tue, 2 Feb 2016 13:07:07 +0000 (14:07 +0100)]
Merge pull request #22023 from owncloud/interruptable-commands

Interruptable commands

8 years agoMerge pull request #22013 from owncloud/share2_moveshare
Thomas Müller [Tue, 2 Feb 2016 12:34:50 +0000 (13:34 +0100)]
Merge pull request #22013 from owncloud/share2_moveshare

[Share 2.0] Allow moving of shares

8 years agoMerge pull request #22049 from owncloud/issue-22041-activities-for-systemtags
Thomas Müller [Tue, 2 Feb 2016 12:08:01 +0000 (13:08 +0100)]
Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags

Issue 22041 activities for systemtags