c3fbc2b6fd
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
...
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
0a72e66e9f
Merge pull request #15562 from owncloud/fix-15560
...
Properly import used classes
2015-04-13 10:07:01 +02:00
906b6b7337
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"
2015-04-13 09:43:45 +02:00
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
75adee1ebd
Merge pull request #15555 from rullzer/fix_15494
...
Initial fix for #15494
2015-04-12 23:00:32 +02:00
84041a4fa2
Merge pull request #15541 from owncloud/add-reply-to-support
...
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
2b8fc774d0
Initial fix for #15494
2015-04-12 16:29:05 +02:00
907719200f
Merge pull request #15545 from owncloud/fix-fonts
...
fix wrong typeface being used for some buttons
2015-04-12 10:03:54 +02:00
573c57402f
fix wrong typeface being used for some buttons
2015-04-11 13:29:55 +02:00
7ce4d2dec9
Merge pull request #15535 from owncloud/smb-1.0.0
...
update icewind/smb to 1.0.0
2015-04-10 23:43:55 +02:00
2e88f8af43
Merge pull request #15536 from owncloud/fix-mysql-autotest
...
[autotest.sh] use the DATABASEHOST for the mysql DB drop
2015-04-10 21:56:27 +01:00
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
20a1a110de
Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
...
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
d1fa3c6b32
add unit test for crypt.php
2015-04-10 15:12:57 +02:00
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
a41fbf7a92
update icewind/smb to 1.0.0
2015-04-10 14:59:16 +02:00
4a225aa12c
Clear leftover shares from other tests
2015-04-10 14:53:17 +02:00
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
c72ea81137
[autotest.sh] use the DATABASEHOST for the mysql DB drop
2015-04-10 14:46:08 +02:00
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
75312f96d4
Merge pull request #15530 from owncloud/davclient-catchmoreexceptions
...
Catch more exceptions in DAV client
2015-04-10 14:17:42 +02:00
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +02:00
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
79ef54fe00
Merge pull request #15528 from owncloud/share-loading
...
fix share input loading spinner, fix #15522
2015-04-10 11:45:24 +02:00
9c76bcd479
fix share input loading spinner, fix #15522
2015-04-10 11:32:02 +02:00
a33edcd2f0
Fix singe user mode on public.php - take two
2015-04-10 11:17:33 +02:00
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
bbb2567918
Merge pull request #15398 from Volker-E/master
...
fixing #15396 & #15397
2015-04-10 10:43:39 +02:00
1427ea78d4
fix typo and comment
2015-04-10 09:12:37 +02:00
a85bc5538f
fix filesystem and encryption tests
...
Conflicts:
apps/files_encryption/lib/util.php
apps/files_encryption/tests/hooks.php
2015-04-10 09:12:37 +02:00
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
473d3e14c8
more robust share dialog
2015-04-10 09:12:37 +02:00
077ab27281
fix_tests
...
Conflicts:
apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
8964c5068c
do not disclose information, show generic error on login page
...
Conflicts:
core/templates/login.php
lib/base.php
2015-04-10 09:12:37 +02:00
488405d1ec
do not hide exception when ldap server has a hiccup
2015-04-10 09:12:37 +02:00
43b503641c
Merge pull request #15521 from owncloud/shareinfo-catchguzzle503
...
Properly catch guzzle 503 when querying share info
2015-04-10 00:23:05 +02:00
02614d214e
Merge pull request #15437 from owncloud/deleteorphanedfiles
...
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
13178db465
Merge pull request #15404 from Crote/occ-password-from-env
...
Add password input from env variable for occ user:{add, resetpassword}
2015-04-10 00:08:40 +02:00
20eaadd72b
Merge pull request #15182 from rullzer/fix-8231
...
ajax/share.php should return correct list of suggestions
2015-04-10 00:05:11 +02:00
c6151053ba
Merge pull request #15492 from owncloud/ldap-wizard-overhaul
...
LDAP Wizard Overhaul
2015-04-09 23:52:53 +02:00
f05e19348d
Fix single user check in case no user is logged in
2015-04-09 23:47:24 +02:00
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
60bf934e6f
change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability
2015-04-09 21:05:20 +02:00
a8b831b018
compile user and login filter on the first time automatically, if a suggestion was provided
2015-04-09 21:05:16 +02:00
10ffa3b770
Merge pull request #15512 from owncloud/autoclose-settings-menu
...
Don't stop event execution for menu item click
2015-04-09 19:53:43 +02:00
Morris Jobke
Joas Schilling
Thomas Müller
Lukas Reschke
Roeland Jago Douma
Jan-Christoph Borchardt
Robin McCorkell
Clark Tomlinson
Vincent Petry
Bjoern Schiessle
Robin Appelman
Jörn Friedrich Dreyer
blizzz