summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9065 from owncloud/migrator-keepprimaryindexnameVincent Petry2014-06-171-1/+7
|\ | | | | Do not rename primary key index when renaming table
| * Do not rename primary key index when renaming tableVincent Petry2014-06-171-1/+7
| | | | | | | | | | | | | | When the migrator renames a table, for example for upgrade simulation, it should not rename the primary key to avoid messing up with the diff because the MySQL Doctrine code expects that index to always be called "primary".
* | We obviously have to pass the hostname as is when there is no ':' in the ↵Andreas Fischer2014-06-171-1/+1
| | | | | | | | | | | | hostname. This reverts commit 73062040e68212ac6e92d36211ca0bef91777589.
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1738-148/+116
| |
* | Add deprecation notice to load* functionsLukas Reschke2014-06-161-2/+6
| | | | | | | | | | | | This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way. Port of https://github.com/owncloud/core/pull/9033
* | add new keynote mimetypeJörn Friedrich Dreyer2014-06-161-0/+1
| |
* | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstoreGeorg Ehrke2014-06-163-197/+410
|\ \ | |/ |/| Make shipped apps updatable via appstore
| * disable code check for shipped appsGeorg Ehrke2014-06-161-1/+1
| |
| * don't skip code check for skipped appsGeorg Ehrke2014-06-131-1/+1
| | | | | | those apps will have to use the public api
| * skip certain tests for shipped appsGeorg Ehrke2014-06-131-6/+10
| |
| * don't show update button when appstore is disabled or no writable dir existsGeorg Ehrke2014-06-101-0/+15
| |
| * fix php doc blockGeorg Ehrke2014-06-101-0/+2
| |
| * always return a bool in OC_App::updateAppGeorg Ehrke2014-06-101-1/+1
| |
| * fix php doc blockGeorg Ehrke2014-06-101-3/+1
| |
| * remove unnecessary @returnGeorg Ehrke2014-06-101-1/+0
| |
| * some additional type checksGeorg Ehrke2014-06-062-3/+3
| |
| * add additional type checkGeorg Ehrke2014-06-061-1/+1
| |
| * Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-06-05117-1213/+1518
| |\ | | | | | | | | | | | | | | | Conflicts: lib/private/app.php settings/templates/apps.php
| * | reenable checkCode()Thomas Müller2014-06-051-1/+0
| | |
| * | add unit testGeorg Ehrke2014-06-041-16/+25
| | |
| * | update autoloaderGeorg Ehrke2014-06-041-6/+5
| | |
| * | use isset() instead of array_key_exists()Georg Ehrke2014-06-031-1/+1
| | |
| * | various fixes as requested by pr reviewersGeorg Ehrke2014-06-022-22/+18
| | |
| * | read ocsid from shipped apps on installGeorg Ehrke2014-05-311-0/+3
| | |
| * | add button for properly uninstalling appsGeorg Ehrke2014-05-312-11/+17
| | |
| * | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-31209-2219/+4393
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/app.php lib/private/installer.php
| * | | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-312-174/+358
| | | |
* | | | Merge pull request #8917 from owncloud/repair-routine-baseVincent Petry2014-06-163-43/+152
|\ \ \ \ | | | | | | | | | | Add support for repair step classes
| * | | | Fixed instanceof to use interface instead of classVincent Petry2014-06-121-1/+2
| | | | |
| * | | | Added RepairStep interface and default repair step listsVincent Petry2014-06-123-63/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add support for repair step classesVincent Petry2014-06-121-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | This also makes it possible to unit test each repair step class individually
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-161-0/+2
| | | | |
* | | | | Merge pull request #9022 from owncloud/speedup-nested-ldap-groupsmacjohnny2014-06-162-6/+13
|\ \ \ \ \ | | | | | | | | | | | | drastic speedup for nested ldap groups
| * | | | | drastic speedup for nested ldap groupsmacjohnny2014-06-132-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-151-0/+8
| | | | | |
* | | | | | Merge pull request #8978 from owncloud/movie_preview_improvementsMorris Jobke2014-06-141-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 Ehrke2014-06-101-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not enabled, fixes #7756
* | | | | | | Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-131-25/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor OC_DB::connect() to properly support sockets.
| * | | | | | | Don't specify host when using a socket.Andreas Fischer2014-06-121-1/+1
| | | | | | | |
| * | | | | | | Rename variable to indicate that it can be port and socket.Andreas Fischer2014-06-121-4/+4
| | | | | | | |
| * | | | | | | No need to check the port number as this will fail anyway.Andreas Fischer2014-06-121-1/+1
| | | | | | | |
| * | | | | | | Move getValue() to where required. This actually is not required "global data".Andreas Fischer2014-06-121-9/+5
| | | | | | | |
| * | | | | | | Move check for : to where it belongs, getting rid of $socket = false;Andreas Fischer2014-06-121-8/+5
| | | | | | | |
| * | | | | | | Extract common variables of $connectionParams.Andreas Fischer2014-06-121-11/+8
| | | | | | | |
| * | | | | | | Inline $port expression, getting rid of $port variable.Andreas Fischer2014-06-121-2/+1
| | | | | | | |
| * | | | | | | Fixes based on suggestionsjosh4trunks2014-06-111-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.josh4trunks2014-06-041-0/+2
| | | | | | | |
| * | | | | | | Work with MySQL Socketsjosh4trunks2014-06-041-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 transifexJenkins for ownCloud2014-06-131-1/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-121-37/+40
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Repair broken parent link in the scanner