Commit Graph

24214 Commits

Author SHA1 Message Date
Lukas Reschke
a881218fc2 Add "Reply-To" support for mails 2015-04-10 15:05:34 +02:00
Thomas Müller
a163243e31 Merge pull request #15510 from owncloud/cron-singleuser
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Morris Jobke
75312f96d4 Merge pull request #15530 from owncloud/davclient-catchmoreexceptions
Catch more exceptions in DAV client
2015-04-10 14:17:42 +02:00
Vincent Petry
b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry
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
Thomas Müller
79ef54fe00 Merge pull request #15528 from owncloud/share-loading
fix share input loading spinner, fix #15522
2015-04-10 11:45:24 +02:00
Jan-Christoph Borchardt
9c76bcd479 fix share input loading spinner, fix #15522 2015-04-10 11:32:02 +02:00
Thomas Müller
a33edcd2f0 Fix singe user mode on public.php - take two 2015-04-10 11:17:33 +02:00
Jan-Christoph Borchardt
bbb2567918 Merge pull request #15398 from Volker-E/master
fixing #15396 & #15397
2015-04-10 10:43:39 +02:00
Morris Jobke
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
Thomas Müller
02614d214e Merge pull request #15437 from owncloud/deleteorphanedfiles
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
Thomas Müller
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
Thomas Müller
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
blizzz
c6151053ba Merge pull request #15492 from owncloud/ldap-wizard-overhaul
LDAP Wizard Overhaul
2015-04-09 23:52:53 +02:00
Thomas Müller
f05e19348d Fix single user check in case no user is logged in 2015-04-09 23:47:24 +02:00
Thomas Müller
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
Arthur Schiwon
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
Arthur Schiwon
a8b831b018 compile user and login filter on the first time automatically, if a suggestion was provided 2015-04-09 21:05:16 +02:00
Vincent Petry
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
Lukas Reschke
0bad8f644a Merge pull request #15511 from owncloud/fix-typos
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Vincent Petry
4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Morris Jobke
de4a81f462 Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
fixes #15326
2015-04-09 18:41:18 +02:00
Morris Jobke
51e4633187 Don't stop event execution for menu item click
* fixes #12326 - the settings menu is closed now, because the event is executed
2015-04-09 18:32:33 +02:00
Thomas Müller
06a5a9d0c2 Fix mock object to return proper type 2015-04-09 18:30:45 +02:00
Vincent Petry
2865f09984 Merge pull request #15282 from owncloud/keepsharerelationshipondelete
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Thomas Müller
11c3741526 Fix mock object to return proper type 2015-04-09 17:45:57 +02:00
Lukas Reschke
b60d5d3d6f Merge pull request #14540 from owncloud/windows-setup-check
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Robin Appelman
a7aba07dc1 block ocs in single user mode 2015-04-09 15:57:27 +02:00
Robin Appelman
8af106cc75 block webdav in single user mode 2015-04-09 15:56:41 +02:00
Lukas Reschke
0abce86b31 Disallow Windows Server in Server Check
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Morris Jobke
f5a145b410 Merge pull request #15501 from owncloud/better-output-format-console
Add an option to get the output in plain, json or print_r syntax
2015-04-09 15:46:36 +02:00
Jörn Friedrich Dreyer
8af52e3876 fixes #15326 2015-04-09 15:37:00 +02:00
Vincent Petry
5803a1f5f7 Remove trashbin storage wrapper when disabling it for tests 2015-04-09 15:02:24 +02:00
Morris Jobke
b9eaa386c4 Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
2015-04-09 14:54:57 +02:00
Björn Schießle
0710db77bc Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Arthur Schiwon
ca9426308d escape filter for output 2015-04-09 14:49:11 +02:00
Thomas Müller
1d9bd3d31e Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Arthur Schiwon
3abc72dad8 fix number and insert position when adding/copying a config 2015-04-09 14:44:40 +02:00
Joas Schilling
98bdfa1518 change handling in app:list 2015-04-09 14:44:30 +02:00
Joas Schilling
def3b687ee Replace print_r() with pretty json 2015-04-09 14:42:44 +02:00
Arthur Schiwon
00c2970547 update back/continue buttons also on tab click 2015-04-09 14:40:00 +02:00
Morris Jobke
9246c7e8ee Merge pull request #15500 from owncloud/installation-hint
add link to installation documentation to setup page
2015-04-09 14:33:55 +02:00
Björn Schießle
5a50a678c9 Merge pull request #15507 from owncloud/remove-uneeded-file
Remove unneeded file
2015-04-09 14:32:53 +02:00
Lukas Reschke
ec69f2838c Fix typos and some other adjustments 2015-04-09 14:09:09 +02:00
Arthur Schiwon
b4c96e6ba0 cleanup 2015-04-09 14:01:39 +02:00
Arthur Schiwon
630e35d8cc newlines at end of file
yes, IDE is now configured accordingly.
2015-04-09 14:00:34 +02:00
Arthur Schiwon
9ed9741d81 doc 2015-04-09 13:56:20 +02:00
Arthur Schiwon
3354881355 move script and style inclusions into template 2015-04-09 13:52:35 +02:00
Robin Appelman
d96e9d174b block cron when in single user mode 2015-04-09 13:50:53 +02:00
Lukas Reschke
96e7f607d5 Remove unneeded file 2015-04-09 13:29:51 +02:00