Commit graph

28187 commits

Author SHA1 Message Date
Robin Appelman
960c8cb5bc Merge pull request #16604 from owncloud/cache-escape-like
escape like parameter in cache operations
2015-11-10 09:45:00 +01:00
Jenkins for ownCloud
f09db6451e [tx-robot] updated from transifex 2015-11-10 01:55:11 -05:00
Thomas Müller
baacb2cd30 Merge pull request #20333 from owncloud/fix-18956
[LDAP Wizard] make all the buttons beautiful
2015-11-10 00:27:54 +01:00
Thomas Müller
f8e020ff87 Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement
Do not allow two different version requirements
2015-11-10 00:27:05 +01:00
Thomas Müller
a8ea3acafa Merge pull request #20403 from owncloud/fix_19788
Fix Error message when sharing outside of group
2015-11-10 00:26:28 +01:00
Thomas Müller
4604596c3e Merge pull request #20404 from owncloud/fix_autoloader_tests
Fix autoloader unit test output
2015-11-10 00:25:59 +01:00
Thomas Müller
3ee6fda8ec Merge pull request #20397 from owncloud/fix-carddav-lookup
Register DAVACL plugin to provide current-user-principal
2015-11-09 16:02:05 +01:00
Roeland Jago Douma
87e3402ef5 Fix autoloader unit test output
Removed leftover print statement
2015-11-09 15:54:40 +01:00
Roeland Jago Douma
402e0afbc5 Fix Error message when sharing outside of group
For #19788
2015-11-09 15:52:17 +01:00
Thomas Müller
37c5edc202 Merge pull request #20351 from owncloud/sharing-api-integration-tests-getting-shares
Added tests about getting shares of a file and a test for deleting a …
2015-11-09 14:13:18 +01:00
Thomas Müller
836173289f Register DAVACL plugin to provide current-user-principal 2015-11-09 13:27:19 +01:00
Thomas Müller
2e8d8bf4ef Merge pull request #20236 from maprambo/safari-pinned-tab-icon
added Safari tabbed pin icon
2015-11-09 11:12:38 +01:00
Thomas Müller
77335ca403 Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval
Force approval in GDrive oauth to get refresh_token
2015-11-09 11:11:13 +01:00
Thomas Müller
a5dd2df384 Merge pull request #20383 from owncloud/fix-setupchecks-messages
Properly detect setup check messages set in the HTML template
2015-11-09 11:10:41 +01:00
Joas Schilling
fe04451cb1 Do not allow two different version requirements 2015-11-09 11:10:37 +01:00
Jenkins for ownCloud
113f9f80f3 [tx-robot] updated from transifex 2015-11-09 01:55:05 -05:00
Jenkins for ownCloud
f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Robin McCorkell
6959d5ca22 Properly detect setup check messages set in the HTML template 2015-11-08 00:02:59 +00:00
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
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