Robin Appelman
21ced89beb
Dont return false for internalPath
2014-06-14 10:13:24 +02:00
Robin Appelman
a900c7aa94
Fix removing remote shares
2014-06-14 10:13:24 +02:00
Robin Appelman
1c149da52f
Support path lengths up to 4000 chars
2014-06-14 10:13:24 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
cf5a72c103
Add interface for adding a public share to a different ownCloud instance
2014-06-14 10:13:24 +02:00
Robin Appelman
d7de35376d
Add interface for accpeting external shares
2014-06-14 10:13:23 +02:00
Robin Appelman
0156ef8166
Add coments to database and dont use sql keywords as table names
2014-06-14 10:10:38 +02:00
Robin Appelman
a44baaf8eb
add remote/add external shares to manager
2014-06-14 10:10:37 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
Morris Jobke
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
Morris Jobke
35f7565e9b
Merge pull request #8978 from owncloud/movie_preview_improvements
...
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
Volkan Gezer
2b82e3c251
Merge pull request #9025 from owncloud/fix-mail-settings
...
fix mail settings save function - ref #8854
2014-06-13 18:26:14 +02:00
Frank Karlitschek
87101e6638
Merge pull request #9018 from owncloud/dbms-socket-support
...
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
Morris Jobke
f5da0052cf
fix mail settings save function - ref #8854
2014-06-13 15:31:35 +02:00
Morris Jobke
c09f5680c9
Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
...
move mail template settings to templateeditor repo
2014-06-13 13:07:41 +02:00
Jörn Friedrich Dreyer
42bf466fa1
move mail template editor from core to standalone templateeditor repo
2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer
7e8784c075
access admin settings result message correctly
2014-06-13 11:59:14 +02:00
Morris Jobke
b91db84050
Merge pull request #8714 from owncloud/minor-fixes
...
fix some minor issues
2014-06-13 08:30:57 +02:00
Jenkins for ownCloud
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
Morris Jobke
aa8f17bc63
Merge pull request #9017 from owncloud/maxheartbeatinterval
...
Added max heartbeat interval to prevent integer overflow
2014-06-13 00:19:07 +02:00
Volkan Gezer
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
Andreas Fischer
73062040e6
Don't specify host when using a socket.
2014-06-12 20:22:45 +02:00
Andreas Fischer
0932760304
Rename variable to indicate that it can be port and socket.
2014-06-12 20:18:38 +02:00
Andreas Fischer
3d8eabedbd
No need to check the port number as this will fail anyway.
2014-06-12 20:17:30 +02:00
Andreas Fischer
4ca1e3cc02
Move getValue() to where required. This actually is not required "global data".
2014-06-12 19:59:40 +02:00
Andreas Fischer
17c2e63449
Move check for : to where it belongs, getting rid of $socket = false;
2014-06-12 19:56:51 +02:00
Andreas Fischer
4b87586487
Extract common variables of $connectionParams.
2014-06-12 19:53:33 +02:00
Andreas Fischer
6da2beeaff
Inline $port expression, getting rid of $port variable.
2014-06-12 19:48:37 +02:00
Vincent Petry
6a0f5cfc61
Added unit tests for heartbeat interval min/max values
2014-06-12 18:42:09 +02:00
Vincent Petry
ce168c286a
Added max heartbeat interval to prevent integer overflow
...
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.
This fix adds a maximum ping interval of 24 hours.
Forward port of 00ec5fc193
from stable6.
2014-06-12 18:41:19 +02:00
Vincent Petry
b595c982d0
Merge pull request #8968 from owncloud/scanner-parent-repair
...
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
Morris Jobke
ab7cff6dfd
Revert "Merge pull request #8998 from macjohnny/master"
...
This reverts commit 482eded8b3
, reversing
changes made to 354cace14a
.
2014-06-12 14:56:46 +02:00
Vincent Petry
8e463926a0
Merge pull request #9004 from owncloud/cleanup-storages
...
Added check and cleanup for storage/filecache
2014-06-12 14:50:18 +02:00
macjohnny
482eded8b3
Merge pull request #8998 from macjohnny/master
...
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
Bernhard Posselt
354cace14a
Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
...
fix liskov substitution principle in admin mail template settings
2014-06-12 14:33:13 +02:00
Vincent Petry
19c73a8464
Added check and cleanup for storage/filecache
...
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.
This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
2014-06-12 13:45:39 +02:00
Morris Jobke
dff4ad3e00
Merge pull request #8999 from owncloud/issue/8996
...
Issue/8996 IE8 issues with the new menu
2014-06-12 13:34:32 +02:00
Morris Jobke
d17094e0a5
Move IE8 fixes to fixes.css
2014-06-12 13:33:32 +02:00
Vincent Petry
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
Jörn Friedrich Dreyer
72436b68bf
fix liskov substitution principle in admin mail template settings, fixes #8997
2014-06-12 12:38:34 +02:00
macjohnny
e8e2e47e68
Update manager.php
2014-06-12 11:29:20 +02:00
macjohnny
b1094cfe82
Update group.php
2014-06-12 11:28:57 +02:00
Joas Schilling
6c0e27ac99
Fix missing caret in header menu for IE8
2014-06-12 11:01:35 +02:00
Joas Schilling
324075bc78
Fix header menu background in IE8
2014-06-12 11:00:44 +02:00
Joas Schilling
7896b866df
Reduce size of png files so they match the svg
...
Fix #8996
2014-06-12 10:55:25 +02:00
macjohnny
0af8aa689f
drastic speedup for nested ldap groups
...
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-12 09:51:23 +02:00
macjohnny
ede2aa236e
Update manager.php
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd
Merge pull request #8991 from owncloud/fix-php53-arraycombine
...
Fixed array_combine for PHP 5.3
2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00