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

30068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
1601d9235a Make enable_avatars setting more robust 
* handles the setting in the same way everywhere
* fixes #21949
 2016-01-27 15:17:25 +01:00
Vincent Petry
714d8c2424 Fix system tags conflict situations 
Does not disrupt the UX whenever a tag or association was created
concurrently. The input field will adjust itself as if the tag was
already there in the first place.
 2016-01-27 15:09:59 +01:00
Lukas Reschke
f32827e903 Ignore GD JPEG warnings 
Fixes https://github.com/owncloud/core/issues/21873
 2016-01-27 13:59:15 +01:00
Joas Schilling
2563c3ffaf Fix failing oracle and postgres tests 2016-01-27 12:53:44 +01:00
Joas Schilling
0c7922cf70 Use new constants 2016-01-27 12:53:44 +01:00
Robin Appelman
644a8ab797 add IUserMountCache->getMountsForFileId 2016-01-27 12:53:44 +01:00
Thomas Müller
308396b770 Merge pull request #21942 from owncloud/use-message-if-hint-is-empty 
In case the hint of the HintException is empty we better use the exce…
 2016-01-27 12:11:31 +01:00
Thomas Müller
c7abad65ea Fix sql to get shared addressbooks including unit tests 2016-01-27 12:10:06 +01:00
Thomas Müller
8f4ab55b4b Unit testing database access to old contacts tables 2016-01-27 12:10:06 +01:00
Thomas Müller
b2976eb72c Unit testing migration logic 2016-01-27 12:10:06 +01:00
Thomas Müller
07a5c26583 Add app to migrate contacts and calendars 
Add group sharing migration

Migrate all users
 2016-01-27 12:10:06 +01:00
Thomas Müller
ea93310623 Merge pull request #21947 from owncloud/oc-backbone-webdav-put-bool-tojson 
Fix system tags proppatch with booleans
 2016-01-27 11:43:57 +01:00
Vincent Petry
cfba90a78d Fix system tags proppatch with booleans 
Backbone webdav adapter now converts booleans and ints to strings.

Fixed system tags to use "true" / "false" strings for booleans instead
of 1 / 0.
 2016-01-27 11:09:43 +01:00
Thomas Müller
c264f9362d Merge pull request #21856 from owncloud/sync-federated-cloud-users-in-cron 
Sync federated clouds using a cron job
 2016-01-27 10:11:01 +01:00
Thomas Müller
a067355a98 In case the hint of the HintException is empty we better use the exception message 2016-01-27 10:08:21 +01:00
Thomas Müller
ba565edc1e Extract sharing functionality into own backend class for reusability 2016-01-27 09:45:32 +01:00
Thomas Müller
92c7d15739 Fix server ctor including unit test - this shall never happen again 2016-01-27 09:43:44 +01:00
Thomas Müller
d1104954aa Migrate from CardDAV sharing to more generalk DAV sharing 2016-01-27 09:43:44 +01:00
Thomas Müller
1594371c8c Merge pull request #21741 from owncloud/l10n-improvements 
Move methods to the factory that are not related to translating, but to guessing/finding the language
 2016-01-27 09:37:00 +01:00
Thomas Müller
5b7a1b13f3 Merge pull request #21887 from owncloud/share2_updateShare 
[Sharing 2.0] update share
 2016-01-27 09:36:41 +01:00
Thomas Müller
c274f03e12 Merge pull request #21906 from owncloud/querybuilder-clob-comparison 
Querybuilder clob comparison
 2016-01-27 09:36:21 +01:00
Thomas Müller
0fffc3a0de Merge pull request #21930 from owncloud/less-error-messages 
Avoid error message in log during setup because of existing data dir
 2016-01-27 09:34:09 +01:00
Roeland Jago Douma
a4900d721f [Share 2.0] Properly handle user deleted group shares 
If a user deletes a group share we create a special share entry. To the
API this is just a normal group share for that user with permissions 0.
But we should not return this.
 2016-01-27 09:02:12 +01:00
Jenkins for ownCloud
1df31c802b [tx-robot] updated from transifex 2016-01-27 01:55:01 -05:00
Arthur Schiwon
a5c528ff7e provide info about plugin, and do not run commit ourselves on proppatch 2016-01-26 21:35:12 +01:00
Morris Jobke
e43aaf4a15 Avoid error message in log during setup because of existing data dir 2016-01-26 18:50:41 +01:00
Robin McCorkell
405e2d9b50 Fix validation of inputs that aren't text 2016-01-26 17:42:35 +00:00
Thomas Müller
db788a382c Merge pull request #21926 from owncloud/add-locking-support-for-onenote 
Add fake locking support for OneNote 2013
 2016-01-26 18:11:12 +01:00
Lukas Reschke
b6ca05f9a0 Add fake locking support for OneNote 2013 
Fixes https://github.com/owncloud/core/issues/21925
 2016-01-26 17:32:52 +01:00
Lukas Reschke
a0cb52c90e Fix PHPDoc and signature 2016-01-26 17:27:58 +01:00
Thomas Müller
aa598fc701 Merge pull request #21664 from owncloud/comments-dav 
Comments DAV implementation
 2016-01-26 17:20:32 +01:00
Thomas Müller
cfb6539b01 Merge pull request #21921 from owncloud/use-proper-tag 
Do not use duplicated tag
 2016-01-26 17:19:37 +01:00
Lukas Reschke
8a4e1fbecd Fix errors after install 
When installing ownCloud the first time the first thing that an admin saw was an error message:

> Error   PHP   touch(): Unable to create file owncloud.log because Permission denied at /var/www/owncloud/lib/private/log/owncloud.php#48

Or something related. This lead to a lot confusion as can be seen in our forum and in our issue tracker. This change should make the error messages disappear in most cases (e.g. where the file can actually be written). To test this:

1. On master install ownCloud and check owncloud.log => Error message
2. On this branch install ownCloud and check owncloud.log => No error message

Fixes https://github.com/owncloud/core/issues/13736 and https://github.com/owncloud/core/issues/12893
 2016-01-26 17:06:23 +01:00
Lukas Reschke
8bdf2f5c25 Do not use duplicated tag 
Fixes "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", the tag can only be there once. Also set to 9.0 as this will be the next major release.
 2016-01-26 16:42:31 +01:00
Thomas Müller
f383332d83 Merge pull request #21912 from owncloud/issue-21908-trashbin-flickering 
Hide the delete button, until we know its a custom avatar
 2016-01-26 16:16:21 +01:00
Thomas Müller
6deb553dc2 Merge pull request #21833 from owncloud/use-proper-shared-uri-for-contacts 
Reassemble behavior on shared address books with respect to uri and d…
 2016-01-26 16:13:32 +01:00
Thomas Müller
22010517f5 Merge pull request #21752 from owncloud/files-delete-fix 
Only check selection for delete permissions, not parent folder
 2016-01-26 16:13:10 +01:00
Thomas Müller
022ac12ab4 Merge pull request #21916 from owncloud/sftp-handle-no-user 
Handle no user set in sftp constructor
 2016-01-26 16:12:38 +01:00
Thomas Müller
ce84c36d6e Merge pull request #21920 from owncloud/fix-firstrunwizard-button 
fix first run wizard button not wrapping
 2016-01-26 16:12:14 +01:00
Arthur Schiwon
3b7ded863b files_sharing requires int as file id 2016-01-26 15:45:37 +01:00
Roeland Jago Douma
d11682dcb4 Fix comments from Thomas 2016-01-26 15:31:52 +01:00
Jan-Christoph Borchardt
44415a29ba fix first run wizard button not wrapping 2016-01-26 15:28:19 +01:00
Vincent Petry
f881c11b8a Merge pull request #21913 from owncloud/fix_resolve_user_group_share 
[Share 2.0] Resolve to correct usergroup share
 2016-01-26 15:20:03 +01:00
Thomas Müller
7b678a8c17 Reassemble behavior on shared address books with respect to uri and displayname 2016-01-26 15:07:50 +01:00
Joas Schilling
01164e89a4 Move parameter to the right function call 2016-01-26 14:56:07 +01:00
Joas Schilling
76f506e264 Use our OCP constants 2016-01-26 14:56:07 +01:00
Joas Schilling
a0e8a9de61 Introduce helper method 2016-01-26 14:56:07 +01:00
Joas Schilling
7514695399 Fix Oracle comparisons 2016-01-26 14:56:07 +01:00
Joas Schilling
bd444ae3c3 Add tests for clob comparisons 2016-01-26 14:56:07 +01:00
Joas Schilling
90ce876378 Adjust comments to the new constants 2016-01-26 14:56:07 +01:00