Commit graph

28220 commits

Author SHA1 Message Date
Jenkins for ownCloud
49122e66dd [tx-robot] updated from transifex 2015-11-07 01:55:11 -05:00
Thomas Müller
ab0c9da4f9 Merge pull request #20184 from owncloud/add-carddav
Introducing CardDAV into core
2015-11-06 20:54:16 +01:00
Thomas Müller
71b8916f0f adding individual phpunit.xml and bootstrap.php 2015-11-06 19:11:29 +01:00
Thomas Müller
20e37bd38f Adding occ command to create an addressbook 2015-11-06 15:26:51 +01:00
Thomas Müller
d8e965e59a Introducing CardDAV into core 2015-11-06 15:26:51 +01:00
Arthur Schiwon
133e3fe89d remove uselessly used parameter, read all user attributes also when looking up users in groups 2015-11-06 15:21:56 +01:00
Thomas Müller
82f8374f63 Merge pull request #20365 from owncloud/autoloader-fix
[autoloader] Make sure to load full paths
2015-11-06 14:59:36 +01:00
Thomas Müller
164f4d7d37 Merge pull request #18039 from owncloud/favicon-up-to-ie10
Add favicon for IE8-10
2015-11-06 14:51:24 +01:00
Thomas Müller
5e7fdd7b7c Merge pull request #20350 from owncloud/add-log-statement-for-cron
Add debug log statement for IJobList steps in cron.php
2015-11-06 14:47:26 +01:00
Vincent Petry
26b01c7fff Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 13:56:37 +01:00
Thomas Müller
6e7411fc4c Merge pull request #20346 from owncloud/show-language-code-for-unknown-languages
Show the language code in personal settings for unknown languages
2015-11-06 13:36:42 +01:00
Thomas Müller
75ff6c34ca Merge pull request #20358 from owncloud/extstorage-properlythrowexception
Properly throw exception in OC_Mount_Config::getBackendStatus
2015-11-06 13:36:26 +01:00
Roeland Jago Douma
0bb5eadf89 [autoloader] Make sure to load construct full paths
This reduces a lot of the autoloader magic and makes sure that we
generate full paths in the autoloader.
2015-11-06 13:36:19 +01:00
Thomas Müller
e1c5cba90f Merge pull request #20359 from owncloud/mark-files-drop-as-shipped
Mark files_drop as shipped
2015-11-06 13:35:58 +01:00
Lukas Reschke
d50924c59b Mark files_drop as shipped
Fixes https://github.com/owncloud/enterprise/issues/895
2015-11-06 12:36:01 +01:00
Vincent Petry
51d7527595 Properly throw exception in OC_Mount_Config::getBackendStatus 2015-11-06 12:29:24 +01:00
Sergio Bertolin
e34872141e Added tests about getting shares of a file and a test for deleting a user from a group which doesn't exist 2015-11-06 11:57:02 +01:00
Thomas Müller
dc96aa3849 Merge pull request #20340 from owncloud/fix-ocs-error-code
Revert OCS error code change from #20135
2015-11-06 11:56:34 +01:00
Thomas Müller
cc4f4f222d Merge pull request #20348 from owncloud/issue-20303-integer-group-names
Make sure that group names are strings not integers
2015-11-06 11:48:40 +01:00
Thomas Müller
8047597a81 Merge pull request #20288 from owncloud/fix_20234
make sure that we update the unencrypted size for the versions
2015-11-06 11:17:17 +01:00
Morris Jobke
95a3b4fd24 Add debug log statement for IJobList steps in cron.php
* makes debugging easier
2015-11-06 11:08:30 +01:00
Joas Schilling
292dc553c3 Make sure that group names are strings not integers 2015-11-06 10:40:09 +01:00
Thomas Müller
bf941032a3 Merge pull request #20271 from owncloud/fix-18701
LDAP: attempt to connect to backup server again, if main server is no…
2015-11-06 10:01:06 +01:00
Morris Jobke
fa24d92eea Show the language code in personal settings for unknown languages
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
2015-11-06 09:48:05 +01:00
Jenkins for ownCloud
f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05:00
Thomas Müller
3ae5a987a7 Merge pull request #19872 from owncloud/share2.0_sharemanager
Share2.0 sharemanager
2015-11-05 22:34:18 +01:00
Lukas Reschke
f8d572f55d Merge pull request #20339 from owncloud/header-not-bold
do not bold heading of update screen
2015-11-05 17:33:09 +01:00
Joas Schilling
960c9f386d Revert OCS error code change from #20135 2015-11-05 17:01:47 +01:00
Robin Appelman
d36e1bbab2 escape like parameter for move queries 2015-11-05 16:41:33 +01:00
Robin Appelman
d514200b56 Add escapeLikeParameter to IDBConnection 2015-11-05 16:41:30 +01:00
Jan-Christoph Borchardt
93f9577258 do not bold header of update screen 2015-11-05 16:36:37 +01:00
Arthur Schiwon
d9d8f7e569 make all the buttons beautiful 2015-11-05 16:32:07 +01:00
Robin Appelman
556fabf15d Add test for special character during move 2015-11-05 16:29:38 +01:00
Robin Appelman
b05e1b6ed3 define escape character for like statements on oracle 2015-11-05 16:29:35 +01:00
Robin Appelman
b394fe8709 define escape character for like statements on sqlite 2015-11-05 16:28:54 +01:00
Robin Appelman
236c3c62cc move from OC_DB to IDBConnection 2015-11-05 16:25:02 +01:00
Roeland Jago Douma
532b8a1ad0 Fix oracle 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
0be05fdddd Add unshare hooks 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
0c566698a1 Use the old code for remote shares for now 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
6624fa212a The new sharing code now handles deletion
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
Roeland Jago Douma
8b5179459a Prepare OCS Share endpoint 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
9567fa1194 Initial setup of shareing 2.0 sharemanager and share
* Added sharemanager class

This is the central class where all API calls talk to (OCS/Activity).
This in turn talks to the share providers to get the actual sharing
done.

It uses all ShareObjects

* Added share class

Simple class to hold all the share properties that is passed around

* Added IShareProvider interface

Interface that providers os a share have to implement.
2015-11-05 15:59:08 +01:00
Thomas Müller
e28daf2b37 Merge pull request #20273 from owncloud/sharing-api-adding-tests
Adding more tests to the sharing API.
2015-11-05 15:58:09 +01:00
Thomas Müller
7969f79a78 Merge pull request #20325 from owncloud/subadmin-handle-null
subadmin methods should not return any null user or group
2015-11-05 14:30:42 +01:00
Sergio Bertolín
eec7d2764c Merge branch 'master' into sharing-api-adding-tests 2015-11-05 12:43:22 +01:00
Arthur Schiwon
51ead4e59b subadmin methods should not return any null user or group 2015-11-05 11:50:57 +01:00
Thomas Müller
8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting
[files_external] fix empty user mounts setting
2015-11-05 11:36:36 +01:00
Sergio Bertolin
1a51d4c4c7 Added changes in the verification of sharing get responses 2015-11-05 09:10:46 +00:00
Thomas Müller
6e7461f64c Merge pull request #20320 from owncloud/drop-file_map
Drop unused table file_map
2015-11-05 10:03:41 +01:00
Thomas Müller
5eec9f4068 Merge pull request #20321 from owncloud/drop-principal-tables
Drop unused tables principalgroups and principals
2015-11-05 10:02:39 +01:00