Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-15 | 1 | -0/+8 |
| | |||||
* | 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 #9018 from owncloud/dbms-socket-support | Frank Karlitschek | 2014-06-13 | 1 | -25/+19 |
|\ \ | | | | | | | 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 | ||||
| * | | 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 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-13 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #8968 from owncloud/scanner-parent-repair | Vincent Petry | 2014-06-12 | 1 | -37/+40 |
|\ \ \ | | | | | | | | | 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 | 1 | -34/+36 |
| | |/ | |/| | |||||
* | | | 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 #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 #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 2 | -20/+37 |
|\ \ \ \ | |/ / / |/| | | | handle http accept headers more gracefully | ||||
| * | | | also handle lowercase headers | Bernhard Posselt | 2014-06-11 | 1 | -22/+22 |
| | | | | |||||
| * | | | fix indention | Bernhard Posselt | 2014-06-11 | 1 | -6/+6 |
| | | | | |||||
| * | | | handle http accept headers more gracefully | Bernhard Posselt | 2014-06-11 | 2 | -18/+35 |
| |/ / | |||||
* | | | Merge pull request #8991 from owncloud/fix-php53-arraycombine | Vincent Petry | 2014-06-12 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | Fixed array_combine for PHP 5.3 | ||||
| * | | | Fixed array_combine for PHP 5.3 | Vincent Petry | 2014-06-11 | 1 | -2/+7 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-12 | 2 | -1/+11 |
| | | | | |||||
* | | | | Merge pull request #8901 from owncloud/permissions-update-cache | Vincent Petry | 2014-06-11 | 1 | -12/+12 |
|\ \ \ \ | |/ / / |/| | | | Save the permissions in the filecache if it's not saved yet | ||||
| * | | | Save the permissions in the filecache if it's not saved yet | Robin Appelman | 2014-06-09 | 1 | -12/+12 |
| | | | | |||||
* | | | | Added ORDER BY to enforce share entry order | Vincent Petry | 2014-06-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes MySQL decides to return the shares in the wrong order, but some parts of the code seem to require the order to be known, at least so that the parent shares come before the children shares. This fix adds an ORDER BY clause to force the order by id. | ||||
* | | | | Merge pull request #8966 from owncloud/fix_failing_tests_on_master | Vincent Petry | 2014-06-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix failing tests on master | ||||
| * | | | | call self::getNumericStorageId() to get the numeric ID | Bjoern Schiessle | 2014-06-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-11 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | make text preview backend use imagettftext, fixes #8087 | Georg Ehrke | 2014-06-10 | 1 | -2/+6 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-10 | 1 | -0/+2 |
| |/ / |/| | | |||||
* | | | set logger before registrate to an error handler | Morris Jobke | 2014-06-09 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-09 | 2 | -2/+60 |
| | | | |||||
* | | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix | Morris Jobke | 2014-06-08 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | Added hacky fix for long path cleanup routine | ||||
| * | | | Added hacky fix for long path cleanup routine | Vincent Petry | 2014-06-06 | 1 | -0/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-08 | 5 | -4/+9 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-07 | 68 | -189/+3 |
| |/ / |/| | | |||||
* | | | Merge pull request #8927 from owncloud/expire_only_link_shares | Björn Schießle | 2014-06-06 | 2 | -36/+79 |
|\ \ \ | | | | | | | | | only expire link shares | ||||
| * | | | only expire link shares | Bjoern Schiessle | 2014-06-06 | 2 | -36/+79 |
| | | | | |||||
* | | | | Merge pull request #8253 from owncloud/pk-on-all-tables-master | Thomas Müller | 2014-06-06 | 2 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Primary keys on all tables master | ||||
| * | | | | adding PK to table encryption | Thomas Müller | 2014-06-06 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually |