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

30297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
2982017682 Merge pull request #22228 from owncloud/comments-limit-message 
Limit comment message to 1k chars
 2016-02-09 16:35:23 +01:00
Thomas Müller
d89ddba3a2 Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-add 
Forward exception message to the admin in case of errors and in case …
 2016-02-09 16:11:18 +01:00
Thomas Müller
ac08540597 Merge pull request #20571 from owncloud/transfer-ownership 
Introduce console command to transfer ownerships of files
 2016-02-09 16:11:04 +01:00
Thomas Müller
81d4042af4 Adjust command description 2016-02-09 15:42:41 +01:00
Thomas Müller
10b9bf15f4 Set share owner and share initiator on upate as well 2016-02-09 15:41:06 +01:00
Thomas Müller
cbb7934fb3 Introduce console command to transfer ownerships of files - refs #19154 2016-02-09 15:41:06 +01:00
Thomas Müller
4659bf9b4a Merge pull request #22234 from owncloud/systemtags-filter-intersect-empty 
Fix system tag filter AND condition
 2016-02-09 15:34:06 +01:00
Thomas Müller
1199b539f2 Merge pull request #21773 from owncloud/files_external-list-authtype 
Show the proper auth identifier when listing mounts as json
 2016-02-09 15:33:47 +01:00
Thomas Müller
232bb75329 Merge pull request #21893 from owncloud/migrate-calendars 
Migrate calendars
 2016-02-09 15:14:33 +01:00
Thomas Müller
bc8632856a Forward exception message to the admin in case of errors and in case the remote server version is to low and appropriate message is displayed as well 2016-02-09 14:41:26 +01:00
Arthur Schiwon
bbc86e0756 on DAV throw Bad Request if provided message is too long 2016-02-09 13:59:13 +01:00
Thomas Müller
a6ade67dfb Merge pull request #22197 from owncloud/files-filterbysystemtags 
Add file list filter to filter by system tags
 2016-02-09 13:31:00 +01:00
Thomas Müller
9639981041 Merge pull request #22202 from owncloud/global-auth-no-user 
handle no user set for personal global auth
 2016-02-09 13:30:41 +01:00
Thomas Müller
6474866aff Merge pull request #22225 from owncloud/sharing-moar-hooks 
More sharing hooks for extended auditing
 2016-02-09 13:30:22 +01:00
Thomas Müller
1a2d72b0ac Merge pull request #22212 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-02-09 13:30:06 +01:00
Joas Schilling
e8d9c288bc Stop when a mid result is empty 2016-02-09 12:07:30 +01:00
Joas Schilling
178914104c Add a test for empty mid-result 2016-02-09 12:07:17 +01:00
Vincent Petry
3028684d89 Fix system tag filter AND condition 
If one of the results is empty, no need to do array_intersect and return
an empty result directly.
 2016-02-09 11:39:22 +01:00
Thomas Müller
d11179a0f5 Merge pull request #22227 from owncloud/appmanager-hooks 
Send events when enabling and disabling of apps
 2016-02-09 11:23:19 +01:00
Thomas Müller
b93fc4fc5f Merge pull request #22232 from owncloud/fix-user-settings-navigation 
Fix scroll area in navigation of users management
 2016-02-09 11:22:41 +01:00
Vincent Petry
847a2426b8 Fix unit tests for system tag filter section 2016-02-09 11:22:05 +01:00
Thomas Müller
bf3a843e89 Migration of calendars 2016-02-09 11:20:31 +01:00
Thomas Müller
254e0fa71a Merge pull request #22220 from owncloud/enc-fixfilesizelogicwithpartfile 
Fix part file partial cache logic in encryption code
 2016-02-09 11:06:22 +01:00
Vincent Petry
e378a757ff Add system tags filter section for files app 2016-02-09 10:59:29 +01:00
Joas Schilling
349f3bf54a More fixes 2016-02-09 10:40:00 +01:00
Roeland Jago Douma
12afd7b005 Move password update hook after update 2016-02-09 10:38:12 +01:00
Roeland Jago Douma
623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Thomas Müller
7e0ddfe0d0 Merge pull request #22223 from owncloud/git-ignore-ackrc 
gitignore ack config file
 2016-02-09 10:24:48 +01:00
Thomas Müller
cf38b9b368 Merge pull request #22231 from owncloud/remove_modify_ajax_share.php 
Remove modifying calls in ajax/share.php
 2016-02-09 10:22:56 +01:00
Roeland Jago Douma
38cbfed476 Fix unit test 2016-02-09 10:20:25 +01:00
Thomas Müller
616a62a98d fixes #22221 2016-02-09 09:48:13 +01:00
Vincent Petry
19980be116 Fix part file partial cache logic in encryption code 
The encryption code uses partial cache entries for the part file (which
are not stored in the database) but are useful for other parts of the
code to retrieve the file size again.

This means that in the fixed code $info was empty, so getData() could
not be called.

The fix makes sure to support both cases when the cache entry exists and
doesn't.
 2016-02-09 09:47:34 +01:00
Roeland Jago Douma
5f3a91536d Remove modifying calls in ajax/share.php 
Those calls used the old sharing endpoint that created incompatible
shares. Which eventually would lead to some weird bugs.
 2016-02-09 09:42:06 +01:00
Thomas Müller
98497aa423 Merge pull request #22199 from owncloud/multiple_checksums 
Make checksum propfind future proof
 2016-02-09 09:10:32 +01:00
Thomas Müller
bfa404b441 Merge pull request #22217 from owncloud/fix_22215 
Federates shares have to set a file_target
 2016-02-09 09:10:17 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon
347ad3e223 Limit comment message to 1k chars 2016-02-09 03:14:30 +01:00
Arthur Schiwon
cd00751de5 Send events when enabling and disabling of apps 2016-02-09 02:51:12 +01:00
Arthur Schiwon
cd68500731 throw hooks when accessing a link share 2016-02-09 00:34:10 +01:00
blizzz
a5cbd00447 ignore ack config file 2016-02-08 23:36:18 +01:00
Arthur Schiwon
4dfd56ee81 add post hook on link-share password change 2016-02-08 23:27:37 +01:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined 
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
 2016-02-08 22:33:39 +01:00
Thomas Müller
850ac0cf84 Merge pull request #22170 from owncloud/occ-check-signature 
CLI commands to check app and core signatures
 2016-02-08 21:42:34 +01:00
Thomas Müller
b77a4b0c6a Merge pull request #22112 from owncloud/dav-filesreport 
Provide REPORT method on files DAV to filter/search files
 2016-02-08 21:41:40 +01:00
Thomas Müller
75bbd4f8b6 Merge pull request #22211 from owncloud/versions-hook-info 
versions provide more information when throwing hooks
 2016-02-08 21:06:03 +01:00
Vincent Petry
2f1a60a64d Add REPORT on files endpoint for filtering 
For now only supports filtering by system tags
 2016-02-08 21:04:53 +01:00
Victor Dubiniuk
5910b82de1 Cut authors list. Declare a member variable 2016-02-08 20:37:05 +03:00
Roeland Jago Douma
7f2cb6ab60 Federates shares have to set a file_target 
The old code path is still used to get the sharing info in the webui.
This requires the file_target to be set. This does not mean anything
for federated shares.

Fixes #22215
 2016-02-08 18:30:51 +01:00
Arthur Schiwon
d2d6644702 use int values and constants instead of strings 2016-02-08 18:16:27 +01:00
Thomas Müller
698a6b07a8 Merge pull request #22206 from owncloud/share2_migration_with_federated 
Update the migration step to include federated shares
 2016-02-08 17:58:26 +01:00