Morris Jobke
fb87441fd9
Deduplicate version expire jobs
...
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 11:21:28 +01:00
Thomas Müller
e5dbddaab8
Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master
...
Looks like ceph requires more time to come up ....
2015-12-10 10:59:58 +01:00
Jenkins for ownCloud
078ca149b5
[tx-robot] updated from transifex
2015-12-10 01:55:17 -05:00
Thomas Müller
d4a4270adb
Merge pull request #21077 from owncloud/external-index-names
...
Let doctrine generate index names for files_external
2015-12-09 18:22:55 +01:00
Thomas Müller
5cf376ccb7
Looks like ceph requires more time to come up ....
...
Use sed - not replace
apply btrfs hack
2015-12-09 16:06:25 +01:00
Robin Appelman
ce3adb8121
Let doctrine generate index names
2015-12-09 15:38:49 +01:00
Thomas Müller
54dbe5b8d5
Merge pull request #20989 from owncloud/fix_20769
...
Update parent when moving share into recieved share
2015-12-09 13:07:57 +01:00
Thomas Müller
bffd7a1d93
Merge pull request #21059 from owncloud/remove-deaed-code-mount-config
...
Remove dead code
2015-12-09 13:05:14 +01:00
Thomas Müller
7fb2f7f5fe
Merge pull request #21068 from owncloud/fix-exit-code-autotest-external
...
Fix exit code autotest external
2015-12-09 13:02:25 +01:00
Thomas Müller
4d86466aec
Use default timeout on connection test
2015-12-09 12:18:51 +01:00
Thomas Müller
1dfa93367d
Merge pull request #20995 from owncloud/fix-18734
...
ensure multiselect always receives an array when setting its value, f…
2015-12-09 11:27:46 +01:00
Thomas Müller
51b5498be8
Merge pull request #21003 from owncloud/personal-mount-mountid
...
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 10:05:36 +01:00
Thomas Müller
bc744ff6de
Merge pull request #21038 from owncloud/share-computesharepermissions-notstore
...
Fix (re)share permission checks in a few code paths
2015-12-09 10:04:56 +01:00
Lukas Reschke
025f021fd4
Remove dead code
...
Silences two other security warnings, also I cleaned up the PHPDoc a little bit.
2015-12-09 08:18:47 +01:00
Jenkins for ownCloud
dda9525c4b
[tx-robot] updated from transifex
2015-12-09 01:55:14 -05:00
Robin Appelman
8c1afb8fb9
Add tests
2015-12-08 18:01:44 +01:00
Vincent Petry
28e9bc1156
Fix more unit tests to pass a mock storage instead of null to FileInfo
2015-12-08 16:33:39 +01:00
Thomas Müller
13993c4a6d
Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry
...
passing an empty base in this diagnosis call will not result in LDAP…
2015-12-08 16:24:50 +01:00
Thomas Müller
0dd111ca2e
Merge pull request #21018 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-08 14:51:57 +01:00
Thomas Müller
85409b6701
Merge pull request #20786 from owncloud/systemtags-dav
...
DAV endpoint for system tags
2015-12-08 13:51:25 +01:00
Vincent Petry
6e4006d139
Add reshare permission checks
...
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-08 13:13:26 +01:00
Vincent Petry
e241d26316
Compute share permissions in the view
...
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-08 13:04:22 +01:00
Arthur Schiwon
b91c9851a3
passing an empty base in this diagnosis call will not result in LDAP errors
...
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 12:32:02 +01:00
Lukas Reschke
f55a56ff6c
Use proper PHPDoc reference
2015-12-08 09:45:20 +01:00
Joas Schilling
5453daab03
More fixes to the docs
2015-12-08 09:11:50 +01:00
Jenkins for ownCloud
736e133c04
[tx-robot] updated from transifex
2015-12-08 01:56:19 -05:00
Scrutinizer Auto-Fixer
0f1be1b601
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 20:08:20 +00:00
Thomas Müller
bec34f1275
Merge pull request #21006 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-07 17:49:43 +01:00
Thomas Müller
000523a7fe
Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_filter_as_deleted
...
treat LDAP users not available by user filter as deleted
2015-12-07 17:47:10 +01:00
Thomas Müller
7dd1874188
Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen
...
Improving fopen behaviour for Swift backend
2015-12-07 16:50:07 +01:00
Scrutinizer Auto-Fixer
453e1bf66e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
Roeland Jago Douma
d38949f423
Update parent when moving share into recieved share
...
Fixes #20769
When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-07 16:28:33 +01:00
Robin Appelman
eec4f82cf0
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-07 16:15:37 +01:00
Arthur Schiwon
952f1f3e60
ensure multiselect always receives an array when setting its value, fixes #18734
2015-12-07 15:14:57 +01:00
Scrutinizer Auto-Fixer
97f9213da9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller
e44b164f40
Merge pull request #20569 from owncloud/issue_20427
...
Show external storage status in file list + prompt credentials if different
2015-12-07 10:27:35 +01:00
Thomas Müller
22843fc6e3
Merge pull request #20796 from owncloud/cleanup-trashbin-code
...
Cleanup trashbin expire code
2015-12-07 10:24:09 +01:00
Thomas Müller
00b592f2a6
Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale
...
Fix hidpi previews on public page
2015-12-07 10:23:58 +01:00
Thomas Müller
f3d49a89fe
Merge pull request #11131 from owncloud/use-phpini-wrapper
...
Replacing ini_get instances with inigetwrapper usages
2015-12-07 10:20:59 +01:00
Tim Dettrick
35ab7f0e64
Improving fopen behaviour for Swift backend
2015-12-07 10:20:09 +01:00
Jenkins for ownCloud
d14f128329
[tx-robot] updated from transifex
2015-12-06 01:54:33 -05:00
Jenkins for ownCloud
f0b1ba713d
[tx-robot] updated from transifex
2015-12-05 01:55:14 -05:00
Vincent Petry
316b907a13
Fixed system tags DAV and API and docs
2015-12-04 17:30:50 +01:00
Robin Appelman
a1898dc2bf
db config backend for files_external
2015-12-04 13:48:21 +01:00
Thomas Müller
6af858c41b
Delete no longer existing users from system addressbook
2015-12-04 11:51:45 +01:00
Thomas Müller
6034c9142d
Merge pull request #20933 from owncloud/more-OC_Config-cleanups
...
More cleanups of OC_Config usage
2015-12-04 09:06:47 +01:00
Thomas Müller
561ca002ae
Merge pull request #20931 from owncloud/dav-fixnamespaceoutput
...
Fix namespace XML output of files and tags dav
2015-12-04 08:31:21 +01:00
Jenkins for ownCloud
a2848af625
[tx-robot] updated from transifex
2015-12-04 01:56:31 -05:00
Thomas Müller
2ceae43989
Merge pull request #20545 from owncloud/scan-storage-in-background-job
...
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
Morris Jobke
c60c793cf2
More cleanups of OC_Config usage
2015-12-03 16:41:23 +01:00
Vincent Petry
acdd106a24
Fix namespace XML output of files and tags dav
2015-12-03 15:55:10 +01:00
Vincent Petry
fe95fd5bec
Unit test for system tags plugin
2015-12-03 15:23:21 +01:00
Thomas Müller
502e454a69
Fix PHPDoc ...
2015-12-03 15:23:21 +01:00
Vincent Petry
cc72c6a30d
Added dav endpoints for system tags
2015-12-03 15:23:21 +01:00
Jesus Macias Portela
dcfbbe4737
Merge branch 'master' into issue_20427
2015-12-03 12:35:49 +01:00
Jesús Macias
f4f53e328d
Fix duplicate use in storage controller
2015-12-03 10:00:01 +01:00
Jesús Macias
98f5c50aa4
Migrate storate status code to storagenotavailablexception
2015-12-03 09:59:45 +01:00
Jesús Macias
4ead2bc861
Fix code from PR comments
2015-12-03 09:58:55 +01:00
Jesús Macias
9d1ec02c5a
Change exception catch order
2015-12-03 09:58:30 +01:00
Jesús Macias
332c6748f9
Delete unnecessary storage status constans
2015-12-03 09:58:10 +01:00
Jesús Macias
7cd13f462a
Add new external storage exceptions for different errors
2015-12-03 09:57:59 +01:00
Jesús Macias
b17f26834d
Add different storage status codes managed by StoragedNotAvailableException
2015-12-03 09:57:54 +01:00
Thomas Müller
7fefd4f4d9
Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place
...
User IUser::getEMailAddress() all over the place
2015-12-03 09:21:53 +01:00
Thomas Müller
6b4f48e0f3
Merge pull request #20900 from owncloud/share-group-only-with-exact-match
...
Only return the exact match, when it's allowed
2015-12-03 09:21:29 +01:00
Jenkins for ownCloud
5c178a2719
[tx-robot] updated from transifex
2015-12-03 01:55:12 -05:00
Thomas Müller
e1bf50edd2
Merge pull request #20905 from owncloud/allow-framing-itself
...
Allow framing 'self'
2015-12-02 21:55:12 +01:00
Thomas Müller
09600058d0
Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff
...
Replace old config code with usage of proper APIs
2015-12-02 21:54:42 +01:00
Thomas Müller
eebe2b9c23
User IUser::getEMailAddress() all over the place
2015-12-02 21:25:05 +01:00
Lukas Reschke
8aaab0dbad
Allow framing 'self'
...
This is required by the pdf viewer, since the files app on master uses the AppFramework it had applied the more strict defaults which made it not work on master.
2015-12-02 17:30:40 +01:00
Thomas Müller
df5872ec50
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
...
Adding system addressbook for users of this instance - a occ command …
2015-12-02 16:17:58 +01:00
Joas Schilling
372f54075f
Only return the exact match, when it's allowed
2015-12-02 16:01:01 +01:00
Morris Jobke
37ecde065b
Replace old config code with usage of proper APIs
2015-12-02 15:56:59 +01:00
Thomas Müller
28ceab2f61
Fix endless recursion
2015-12-02 14:44:41 +01:00
Thomas Müller
8d218bf3ef
Merge pull request #20875 from owncloud/remove-changepropagator
...
remove old propagation logic
2015-12-02 13:03:31 +01:00
Thomas Müller
f558ac7dd5
Fix update of avatar image
2015-12-02 11:09:15 +01:00
Thomas Müller
d4abbb10d3
Merge pull request #20884 from owncloud/fix_20713
...
Respect disabled incoming federated shares
2015-12-02 10:56:59 +01:00
Thomas Müller
4c695e63c0
Fix comments
2015-12-02 09:20:58 +01:00
Thomas Müller
6abc02cb88
Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends
2015-12-02 09:14:41 +01:00
Thomas Müller
599ba31edc
Specify the email type and set name properly
2015-12-02 09:14:41 +01:00
Thomas Müller
906777dc9c
Add converter to generate/update a vcard from a given user
2015-12-02 09:14:41 +01:00
Thomas Müller
1e8ad65288
Add system principal to cal of each card
2015-12-02 09:14:41 +01:00
Thomas Müller
df6fc6cc70
Add the user's cloud id to the vCard
2015-12-02 09:14:41 +01:00
Thomas Müller
7c8a84e7ac
Add user's email address to vCard
2015-12-02 09:14:41 +01:00
Thomas Müller
079ae9b7a9
Update addressbook home configuration for CalDAVTester
2015-12-02 09:14:41 +01:00
Thomas Müller
6a2dde6400
user and system addressbooks are now living in sub folders
2015-12-02 09:14:41 +01:00
Thomas Müller
dcfd089a6c
Adding a second principal backend which holds system principals - as of now only one principals/system/system
2015-12-02 09:14:41 +01:00
Thomas Müller
dad6470baa
Add IUser::getAvatarImage() for easy access
2015-12-02 09:14:41 +01:00
Thomas Müller
c91192fb73
Adding system addressbook for users of this instance - a occ command is supplied for synchronizing
2015-12-02 09:08:27 +01:00
Roeland Jago Douma
1e19661daa
[Sharing] Respect disabled incoming federated shares
...
Only fetch the incoming federated shares if incoming shares are actually
enabled.
Fixes #20713
2015-12-02 09:00:21 +01:00
Jenkins for ownCloud
4f4b91a9ec
[tx-robot] updated from transifex
2015-12-02 02:00:28 -05:00
Robin Appelman
62cc316c6a
remove old propagation logic
2015-12-01 16:50:20 +01:00
Thomas Müller
27da63886f
Merge pull request #20710 from owncloud/files_external_config_command
...
Add command to get and set config for external mounts
2015-12-01 15:27:32 +01:00
Robin Appelman
1347e3332b
return non 0 status code in case of missing mount
2015-12-01 13:47:56 +01:00
Robin Appelman
2dd0066b0e
Add command to set mount options for external storages
2015-12-01 13:47:32 +01:00
Robin Appelman
d5ffbc9401
Add command to get and set config for external mounts
2015-12-01 13:47:32 +01:00
Morris Jobke
0655f3d102
Revert "Fix column width of mtime column"
2015-12-01 13:45:30 +01:00
Jesús Macias
a79ae4ae08
Delete js unit test. Another issue has been created to create js test
2015-12-01 12:58:01 +01:00
Thomas Müller
634859e6ed
Merge pull request #20825 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-01 09:26:22 +01:00
Jenkins for ownCloud
8421a43df1
[tx-robot] updated from transifex
2015-12-01 01:55:07 -05:00
Thomas Müller
d6da0396d0
Adjust patches
2015-11-30 23:00:51 +01:00