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
Morris Jobke
86e1d8ca54
AllowUserMount defaults now to all backends fixes #7958
2014-06-13 18:14:41 +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
dc2212cd46
migrate table layout to paragraph layout for HTTPS setting
2014-06-13 16:54:47 +02:00
Morris Jobke
fc9787ed64
fix layout of password protected shares
...
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Morris Jobke
dda5e6c85b
add proper Exception message for invalid token
2014-06-13 16:18:58 +02:00
Morris Jobke
1cb7239cb7
use array_merge for merging arrays in PHP
2014-06-13 16:18:39 +02:00
Morris Jobke
ed8b7fc101
complete renaming uid to userId
2014-06-13 16:18:21 +02:00
Morris Jobke
ebbf228309
remove whitespace at end of line
2014-06-13 16:03:13 +02:00
Morris Jobke
a53cfcb9d1
Migrate ´ to '
2014-06-13 16:02:41 +02:00
Morris Jobke
cedca03ef5
Remove infield label, add password icon, fix layout
2014-06-13 15:56:21 +02:00
Morris Jobke
d0b71dffca
reformat method call and fix paranthesis mismatch
2014-06-13 15:39:44 +02:00
Bernhard Posselt
2b2b1b487c
more style fixes
2014-06-13 15:34:52 +02:00
Bernhard Posselt
a6e45a8d0e
use more stuff from core :)
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
e026b1dc19
Add missing use
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
59ff71f781
Fix check for user existence
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
47c6fd0c85
Remove debug output
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
4b359ad20c
Change routes. Update templates
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
218d0add36
Changes according to review
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
a7fbd91e53
Use appframework
2014-06-13 15:34:52 +02:00
Victor Dubiniuk
23ed038a27
Basics
2014-06-13 15:34: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
Georg Ehrke
0890ce4f91
Update preseed-config.php
2014-06-13 00:07:43 +02:00
macjohnny
767aa4e35f
drastic speedup for nested ldap groups
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) 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-13 00:04:06 +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
Vincent Petry
05e351416e
Fixed instanceof to use interface instead of class
2014-06-12 17:38:26 +02:00
Vincent Petry
ca690c4d02
Added RepairStep interface and default repair step lists
...
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.
Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.
Added unit test to test messaging, error and exception cases.
2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db
Add support for repair step classes
...
This also makes it possible to unit test each repair step class
individually
2014-06-12 17:38:26 +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