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

29894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
e4ad4c7e98 [user_ldap] properly decode cached objects 
* fixes #21896
 2016-01-29 07:51:16 +01:00
Thomas Müller
476720ada9 Merge pull request #21975 from owncloud/fix_ocs_unit_tests 
Fix OCS unit tests after two share merges
 2016-01-28 15:09:31 +01:00
Roeland Jago Douma
2831884e74 Fix OCS unit tests after two share merges 
* Use getNode
* Return IShare object so typechecking is happy
 2016-01-28 13:17:16 +01:00
Thomas Müller
de8852a760 Merge pull request #21958 from owncloud/systemtags-style 
Use boxes for system tags, shorten permission text
 2016-01-28 12:54:52 +01:00
Thomas Müller
295de6aad7 Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings 
Share2 ocs fix passing empty strings
 2016-01-28 11:58:35 +01:00
Thomas Müller
d425b4ffc2 Merge pull request #21952 from owncloud/systemtags-fix-conflicts 
Fix system tags conflict situations
 2016-01-28 11:57:37 +01:00
Thomas Müller
c11337eb22 Merge pull request #21851 from owncloud/shared-unreadable 
Base shared cache on CacheJail
 2016-01-28 11:57:18 +01:00
Robin Appelman
d7a777af3a fix cachejail->update 2016-01-28 11:46:44 +01:00
Robin Appelman
1369f2c684 cleanup shared cache 2016-01-28 11:46:43 +01:00
Vincent Petry
1473e156f4 Use boxes for system tags, shorten permission text 
Permission text now doesn't appear when all permissions are there, or
shows as "invisible" or "not assignable", which should better cover all
use cases.

Changed select2 style to use boxes in the input field.
 2016-01-28 11:24:13 +01:00
Thomas Müller
b7710ab6d7 Merge pull request #21858 from owncloud/getMountsForFileId 
add IUserMountCache->getMountsForFileId
 2016-01-28 11:20:42 +01:00
Thomas Müller
dda9f31455 Merge pull request #21970 from zander/mentionbot 
Stop spamming me.
 2016-01-28 11:20:25 +01:00
Thomas Müller
928a1e1d40 Merge pull request #21971 from owncloud/notify-me 
Notify me on activity and notifications for sure
 2016-01-28 11:19:25 +01:00
Joas Schilling
d9365f1051 More more more, kidding, just to be sure 2016-01-28 11:15:18 +01:00
Morris Jobke
0e95aeab75 Merge pull request #21957 from owncloud/share2_to_ocp 
[Share 2.0] Move interfaces to OCP
 2016-01-28 10:41:39 +01:00
Tom
27e1cf8770 Stop spamming me. 
Honestly, the bot should be improved, if a person hasn't contributed for
a long time it really doens't make sense to email him.
I would also argue that altering the .gitignore doesn't make me an
expert on that file. So classes of files really should not cause
the mention bot spamming me.
 2016-01-28 09:26:21 +00:00
Roeland Jago Douma
8d44e537ac [Share 2.0] Remove setId and setProviderId from the interface 
Those should only ever be set by the providers
 2016-01-28 07:54:16 +01:00
Roeland Jago Douma
34e912ab6b [Share 2.0] Fix interfaces and comments 
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
 2016-01-28 07:54:09 +01:00
Roeland Jago Douma
f2e70441e4 [Share 2.0] Add getShareManager to OCP\IServerContainer 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
357b271cb4 [Share 2.0] Create IManger interface for share manager 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
185b9c6edd [Share 2.0] Move IShare to OCP 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
0832cca54e [Share 2.0] Fix IShare 2016-01-27 22:04:09 +01:00
Roeland Jago Douma
6957917b20 [Share 2.0] Allow using permissions to update link share 2016-01-27 20:36:36 +01:00
Roeland Jago Douma
f5c45dfe7b [Share 2.0] Still allow isolated updates 
Still allow isolated updates of parameters
 2016-01-27 20:36:31 +01:00
Roeland Jago Douma
b321ceef60 [Share 2.0] Also handle empty parameter in updateShare 
* More sanity checks
* More unit tests
 2016-01-27 20:34:06 +01:00
Roeland Jago Douma
35a3432793 [Share 2.0] When passing empty strings don't fail 
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
 2016-01-27 20:34:06 +01:00
Thomas Müller
90f2a2352d Merge pull request #21963 from owncloud/fix-installer 
Check whether ownCloud is installed
 2016-01-27 20:25:51 +01:00
Thomas Müller
40a8686fe7 Merge pull request #21959 from owncloud/cache-interface-clean 
clean cache interface
 2016-01-27 19:33:35 +01:00
Thomas Müller
0f51851d7d Merge pull request #21895 from owncloud/calendar-sharing 
Migrate from CardDAV sharing to more general DAV sharing
 2016-01-27 19:32:05 +01:00
Lukas Reschke
cb1a64b949 Check whether ownCloud is installed 
ownCloud might not yet be setup. This causes an issue as the user config requires a setup ownCloud. Thus this needs a block whether ownCloud is installed or not.

Fixes https://github.com/owncloud/core/issues/21955
 2016-01-27 18:30:18 +01:00
Thomas Müller
816c23c17a Merge pull request #21923 from owncloud/fix-errors-after-install 
Fix errors after install
 2016-01-27 16:16:31 +01:00
Thomas Müller
6973718fb8 Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_shares 
[Share 2.0] Properly handle user deleted group shares
 2016-01-27 16:16:06 +01:00
Thomas Müller
05bff25cf3 Merge pull request #21950 from owncloud/ignore-gd-jped-warnings 
Ignore GD JPEG warnings
 2016-01-27 16:15:38 +01:00
Robin Appelman
6682f31074 clean cache interface 2016-01-27 15:51:39 +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
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