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

30667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
03d0fb4e3f revolutionar: change updates might even sent the new value (optional) 2016-02-09 18:37:41 +01:00
Lukas Reschke
a39c7591d6 Merge pull request #22238 from owncloud/add-link-to-updater 
Move update notification code into app
 2016-02-09 18:22:20 +01:00
Arthur Schiwon
d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +01:00
Lukas Reschke
abc675d87e Move update notification code into app 
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.

Furthermore also makes some more code unit-testable...
 2016-02-09 18:05:51 +01:00
Arthur Schiwon
096115870c Avatar should also claim its change 2016-02-09 17:44:49 +01:00
Arthur Schiwon
82a37d41d0 Doc improvements 2016-02-09 17:41:04 +01:00
Arthur Schiwon
ef7846f7bd fix tests 2016-02-09 17:37:13 +01:00
Arthur Schiwon
3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Robin Appelman
3982c8f87a update icewind/smb to 1.0.5 2016-02-09 17:09:30 +01:00
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
a3eaefa530 Save display name and email address on paste operations - fixes #22245 2016-02-09 16:20:04 +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
60c1ff7634 Register process control signel handlers only on execution of the command 2016-02-09 15:52:19 +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
Robin Appelman
acd8c72d3d add tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma
359c62d90e Fix unit tests 2016-02-09 15:03:00 +01:00
Robin Appelman
f9f2800016 check share permissions in share controller 2016-02-09 15:03:00 +01:00
Robin Appelman
fd9166488b Check that the owner of a link share still has share permissions on access 2016-02-09 15:02:34 +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
Roeland Jago Douma
49726470ab Catch exception 2016-02-09 11:05:34 +01:00
Roeland Jago Douma
426a12baaa Throw exception 2016-02-09 11:05:29 +01:00
Roeland Jago Douma
ee65cd0bd8 Only set the default expiration date on share creation 
Fixes #19685

The default expiration date should only be set when we create a new
share. So if a share is created and the expiration date is unset. And
after that the password is updated the expiration date should remain
unset.
 2016-02-09 11:05:14 +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