f816acde27
fix reading of private key
2015-04-14 12:23:25 +02:00
ffa115b517
Merge pull request #15566 from owncloud/fix-filepicker
...
fix filepicker
2015-04-14 00:39:12 +02:00
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
8688660825
check that we know the parent
2015-04-13 17:10:02 +02:00
6b5daca7b7
check for source cache
2015-04-13 17:10:02 +02:00
a88e013f72
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
...
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
b21dc35355
Do not try to make user subadmin of group twice
...
If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.
Added unit test to ensure things keep working.
2015-04-13 11:42:56 +02:00
59efcb63a3
fix filepicker
...
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +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
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04: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
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
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
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
1427ea78d4
fix typo and comment
2015-04-10 09:12:37 +02:00
5626a02d69
throw exception if setup is incomplete
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
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
c6151053ba
Merge pull request #15492 from owncloud/ldap-wizard-overhaul
...
LDAP Wizard Overhaul
2015-04-09 23:52:53 +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
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
4feb97d8e4
Properly catch guzzle 503 when querying share info
2015-04-09 18:55:28 +02:00
2865f09984
Merge pull request #15282 from owncloud/keepsharerelationshipondelete
...
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
5803a1f5f7
Remove trashbin storage wrapper when disabling it for tests
2015-04-09 15:02:24 +02:00
ca9426308d
escape filter for output
2015-04-09 14:49:11 +02:00
3abc72dad8
fix number and insert position when adding/copying a config
2015-04-09 14:44:40 +02:00
00c2970547
update back/continue buttons also on tab click
2015-04-09 14:40:00 +02:00
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
b4c96e6ba0
cleanup
2015-04-09 14:01:39 +02:00
630e35d8cc
newlines at end of file
...
yes, IDE is now configured accordingly.
2015-04-09 14:00:34 +02:00
9ed9741d81
doc
2015-04-09 13:56:20 +02:00
3354881355
move script and style inclusions into template
2015-04-09 13:52:35 +02:00
96e7f607d5
Remove unneeded file
2015-04-09 13:29:51 +02:00
8e7081d784
run functionality checks also when host field changes
2015-04-09 12:36:53 +02:00
08a9d1d2dc
Remove unused $toRemove
2015-04-09 12:34:19 +02:00
c840c18252
Merge pull request #15499 from owncloud/admin-hints
...
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
65dc958418
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:07:05 +02:00
40edaa5a69
adjust tests
2015-04-09 12:00:11 +02:00
4ca6419475
Fix PHPDoc
2015-04-09 10:54:53 +02:00
3aad47c0f0
Fix code style
2015-04-09 10:46:46 +02:00
d869f8212b
Enforce string as passed type
2015-04-09 10:45:50 +02:00
461302244e
Keep shares when deleting shared folders
...
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Thomas Müller
Robin Appelman
Morris Jobke
Vincent Petry
Roeland Jago Douma
Clark Tomlinson
Bjoern Schiessle
Jörn Friedrich Dreyer
blizzz
Lukas Reschke
Jan-Christoph Borchardt