| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | remove double space | Morris Jobke | 2014-06-14 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #8978 from owncloud/movie_preview_improvements | Morris Jobke | 2014-06-14 | 1 | -8/+17 |
| |\ | | | | | movie previews: use file directly when it's stored locally and encryption is not enabled | ||||
| | * | movie previews: use file directly when it's stored locally and encryption is ↵ | Georg Ehrke | 2014-06-10 | 1 | -8/+17 |
| | | | | | | | | | not enabled, fixes #7756 | ||||
| * | | Merge pull request #9025 from owncloud/fix-mail-settings | Volkan Gezer | 2014-06-13 | 1 | -2/+2 |
| |\ \ | | | | | | | fix mail settings save function - ref #8854 | ||||
| | * | | fix mail settings save function - ref #8854 | Morris Jobke | 2014-06-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #9018 from owncloud/dbms-socket-support | Frank Karlitschek | 2014-06-13 | 2 | -26/+20 |
| |\ \ \ | |/ / |/| | | Refactor OC_DB::connect() to properly support sockets. | ||||
| | * | | Don't specify host when using a socket. | Andreas Fischer | 2014-06-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Rename variable to indicate that it can be port and socket. | Andreas Fischer | 2014-06-12 | 1 | -4/+4 |
| | | | | |||||
| | * | | No need to check the port number as this will fail anyway. | Andreas Fischer | 2014-06-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Move getValue() to where required. This actually is not required "global data". | Andreas Fischer | 2014-06-12 | 1 | -9/+5 |
| | | | | |||||
| | * | | Move check for : to where it belongs, getting rid of $socket = false; | Andreas Fischer | 2014-06-12 | 1 | -8/+5 |
| | | | | |||||
| | * | | Extract common variables of $connectionParams. | Andreas Fischer | 2014-06-12 | 1 | -11/+8 |
| | | | | |||||
| | * | | Inline $port expression, getting rid of $port variable. | Andreas Fischer | 2014-06-12 | 1 | -2/+1 |
| | | | | |||||
| | * | | Fixes based on suggestions | josh4trunks | 2014-06-11 | 1 | -11/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I use the term socket for any extension, either unix socket, or internet socket (port). I check if the socket is all digits * only integers 0 and larger would pass this test. I then check if the string is less than or equal to the maximum port number. By using "if($socket)" I make sure socket isn't false, empty, or the string '0'. I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks | ||||
| | * | | Update notes on dbhost | josh4trunks | 2014-06-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix variable not always being defined. | josh4trunks | 2014-06-04 | 1 | -0/+2 |
| | | | | |||||
| | * | | Work with MySQL Sockets | josh4trunks | 2014-06-04 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | This passes anything that is not a valid port (0<int<65535) as a unix socket. I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues. To use a unix socket, even one different than PHP's mysql.default_socket.. * Database Host = localhost:/path/to/socket | ||||
| * | | | Merge pull request #9010 from owncloud/fix_8941_admin_settings_message | Morris Jobke | 2014-06-13 | 10 | -457/+0 |
| |\ \ \ | | | | | | | | | move mail template settings to templateeditor repo | ||||
| | * | | | move mail template editor from core to standalone templateeditor repo | Jörn Friedrich Dreyer | 2014-06-13 | 10 | -457/+0 |
| | | | | | |||||
| | * | | | access admin settings result message correctly | Jörn Friedrich Dreyer | 2014-06-13 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #8714 from owncloud/minor-fixes | Morris Jobke | 2014-06-13 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | fix some minor issues | ||||
| | * | | | fix some minor issues | Volkan Gezer | 2014-06-13 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-13 | 42 | -186/+263 |
| | | | | | |||||
| * | | | | Merge pull request #9017 from owncloud/maxheartbeatinterval | Morris Jobke | 2014-06-13 | 2 | -1/+28 |
| |\ \ \ \ | |/ / / |/| | | | Added max heartbeat interval to prevent integer overflow | ||||
| | * | | | Added unit tests for heartbeat interval min/max values | Vincent Petry | 2014-06-12 | 1 | -1/+23 |
| | | | | | |||||
| | * | | | Added max heartbeat interval to prevent integer overflow | Vincent Petry | 2014-06-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 00ec5fc1935c946e846a8ff28491e5b5b017b3d7 from stable6. | ||||
| * | | | | Merge pull request #8968 from owncloud/scanner-parent-repair | Vincent Petry | 2014-06-12 | 2 | -39/+89 |
| |\ \ \ \ | |/ / / |/| | | | Repair broken parent link in the scanner | ||||
| | * | | | remove unused argument | Robin Appelman | 2014-06-10 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | add some comments | Robin Appelman | 2014-06-10 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Repair broken parent link in the scanner | Robin Appelman | 2014-06-10 | 2 | -36/+85 |
| | | |/ | |/| | |||||
| * | | | Revert "Merge pull request #8998 from macjohnny/master" | Morris Jobke | 2014-06-12 | 2 | -13/+6 |
| | | | | | | | | | | | | | | | | This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3. | ||||
| * | | | Merge pull request #9004 from owncloud/cleanup-storages | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
| |\ \ \ | | | | | | | | | Added check and cleanup for storage/filecache | ||||
| | * | | | Added check and cleanup for storage/filecache | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge pull request #8998 from macjohnny/master | macjohnny | 2014-06-12 | 2 | -6/+13 |
| |\ \ \ \ | | | | | | | | | | | drastic speedup for nested ldap groups | ||||
| | * | | | | Update manager.php | macjohnny | 2014-06-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update group.php | macjohnny | 2014-06-12 | 1 | -6/+0 |
| | | | | | | |||||
| | * | | | | drastic speedup for nested ldap groups | macjohnny | 2014-06-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | Update manager.php | macjohnny | 2014-06-12 | 1 | -0/+12 |
| | |/ / / | | | | | | | | | add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups. | ||||
| * | | | | Merge pull request #9003 from ↵ | Bernhard Posselt | 2014-06-12 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/fix_liskov_in_admin_mail_template_settings fix liskov substitution principle in admin mail template settings | ||||
| | * | | | | fix liskov substitution principle in admin mail template settings, fixes #8997 | Jörn Friedrich Dreyer | 2014-06-12 | 2 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #8999 from owncloud/issue/8996 | Morris Jobke | 2014-06-12 | 4 | -1/+6 |
| |\ \ \ \ | | | | | | | | | | | Issue/8996 IE8 issues with the new menu | ||||
| | * | | | | Move IE8 fixes to fixes.css | Morris Jobke | 2014-06-12 | 2 | -1/+5 |
| | | | | | | |||||
| | * | | | | Fix missing caret in header menu for IE8 | Joas Schilling | 2014-06-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix header menu background in IE8 | Joas Schilling | 2014-06-12 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Reduce size of png files so they match the svg | Joas Schilling | 2014-06-12 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | Fix #8996 | ||||
| * | | | | | Merge pull request #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 3 | -20/+69 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | handle http accept headers more gracefully | ||||
| | * | | | | also handle lowercase headers | Bernhard Posselt | 2014-06-11 | 2 | -22/+31 |
| | | | | | | |||||
| | * | | | | fix indention | Bernhard Posselt | 2014-06-11 | 1 | -6/+6 |
| | | | | | | |||||
| | * | | | | handle http accept headers more gracefully | Bernhard Posselt | 2014-06-11 | 3 | -18/+58 |
| | | | | | | |||||
| * | | | | | Merge pull request #8991 from owncloud/fix-php53-arraycombine | Vincent Petry | 2014-06-12 | 1 | -2/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixed array_combine for PHP 5.3 | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |