summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-01-0741-82/+3362
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-01-0632-164/+214
|
* Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-052-2/+5
|\ | | | | No decimal points for Kilobyte and Byte #5371.
| * spaces to tabsSimon Könnecke2013-12-181-1/+1
| |
| * No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-252-2/+5
| |
* | Merge pull request #6580 from monreal/masterThomas Müller2014-01-051-1/+1
|\ \ | | | | | | Silence output of 'which' command used in smbclient detection
| * | Silence output of 'which' command used in smbclient detectionMichael Monreal2013-12-271-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0532-154/+203
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0425-46/+51
| | |
* | | Merge pull request #6610 from owncloud/apcu-clearicewind19912014-01-031-1/+1
|\ \ \ | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCu::clear
| * | | Fix APCIterator syntax in \OC\Memcache\APCU::clearRobin Appelman2014-01-021-1/+1
| | | | | | | | | | | | | | | | see http://www.php.net/manual/en/apciterator.construct.php
* | | | Merge pull request #6605 from owncloud/free_space_disabledThomas Müller2014-01-021-1/+1
|\ \ \ \ | | | | | | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled
| * | | | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free ↵Robin Appelman2014-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | space on a local storage
* | | | | Merge pull request #6609 from owncloud/avatar-test-userThomas Müller2014-01-021-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Make OC_Avatar unit tests independent of currently loggedin user
| * | | | Make OC_Avatar unit tests independent of currently loggedin userRobin Appelman2014-01-021-5/+13
|/ / / /
* | | | Merge pull request #6513 from owncloud/user-no-change-displaynameicewind19912014-01-024-15/+54
|\ \ \ \ | |/ / / |/| | | Re-add the config options to remove the ability for users to change their displayname
| * | | Pass config object in testGetHomeNotSupportedRobin Appelman2013-12-201-1/+4
| | | |
| * | | Merge branch 'master' into user-no-change-displaynameRobin Appelman2013-12-19137-597/+1550
| |\ \ \
| * | | | Replace static usage of OC_Config and OC_Preferences with the injected ↵Robin Appelman2013-12-181-5/+13
| | | | | | | | | | | | | | | | | | | | \OC\ConfigAll
| * | | | fix the config option to remove the ability for users to set their displaynameRobin Appelman2013-12-183-9/+37
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0240-852/+1545
| | | | |
* | | | | Merge pull request #6601 from AdamWill/pimple-includeThomas Müller2014-01-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | don't specify path to 3rdparty directory when registering Pimple autoloader
| * | | | | don't specify path to 3rdparty directory when registering Pimple autoloaderAdam Williamson2014-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
* | | | | | Merge pull request #6598 from lolozere/masterThomas Müller2014-01-011-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support mimetype
| * | | | | | Add support mimetypelolozere2014-01-011-0/+3
|/ / / / / / | | | | | | | | | | | | Add support mimetype for extension .sh, .bash and .sh-lib
* | | | | | Revert "Added support for extra backends (see pull request #5043)"Niklas Sombert2014-01-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d75914f2a97cbfd34ae7c2ef27f5bd8185b81eb, reversing changes made to 760fa9ea3005e7df81a1fac54f207dbe7d8ef312.
* | | | | | Added support for extra backends (see pull request #5043)Niklas Sombert2014-01-011-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Somebody had forgotten "OC_User::setupBackends();"...
| * | | | | Added support for extra backendselchi2013-09-301-0/+2
| | | | | | | | | | | | | | | | | | Somebody had forgotten "OC_User::setupBackends();"...
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-3120-181/+263
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-3028-14/+3290
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2928-309/+472
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2821-95/+151
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2718-72/+84
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2616-79/+115
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2517-49/+49
| | | | |
* | | | | Merge pull request #6520 from owncloud/tests-testcleanuplistenerThomas Müller2013-12-244-1/+159
|\ \ \ \ \ | | | | | | | | | | | | Added test cleanup listener to detect untidy tests
| * | | | | Added test cleanup listener to detect untidy testsVincent Petry2013-12-194-1/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After each test suite, detects whether there are stray datafiles, hooks or proxies, then show a warning and clear them.
* | | | | | Merge pull request #6449 from owncloud/core-appsorderfixThomas Müller2013-12-244-6/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed apps loading order
| * | | | | | Fixed apps loading orderVincent Petry2013-12-204-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On SQLite the app order can be arbitrary and cause strange bugs. On MySQL, the app order seems to be always alphabetical. This fix enforces alphabetical order to make sure that all environments behave the same and to reduce bugs related to app loading order. Fixes #6442
* | | | | | | Merge pull request #6561 from syncloud/masterThomas Müller2013-12-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Made admin password field required on client side
| * | | | | | | Made password field required on client sideVladimir Sapronov2013-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19
* | | | | | | | Merge pull request #6554 from owncloud/fix_5982Thomas Müller2013-12-241-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix preview for reshared file
| * | | | | | | | fix preview for reshared fileGeorg Ehrke2013-12-221-1/+3
| |/ / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2442-267/+326
| | | | | | | |
* | | | | | | | Merge pull request #6460 from owncloud/remove-numRowsFrank Karlitschek2013-12-234-33/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove OC_DB_StatementWrapper::numRows()
| * | | | | | | Remove all uses of numRows().Andreas Fischer2013-12-213-14/+13
| | | | | | | |
| * | | | | | | Remove OC_DB_StatementWrapper::numRows().Andreas Fischer2013-12-211-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using this method will result in an unneccesary extra SQL query (which also may return an incorrect result because the underlying table changed in the meantime). In general: If you are performing an UPDATE, DELETE or equivalent query, OC_DB_StatementWrapper::execute() will already give you the number of "affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will not work for SELECT queries, however. If you want to know whether a table contains any rows matching your condition, use "SELECT id FROM ... WHERE ... LIMIT 1". If you want to know whether a table contains any rows matching your condition and you also need the data, use "SELECT ... FROM ... WHERE ...", then use one of the fetch() methods. If you want to count the number of rows matching your condition, use use "SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the fetch() methods.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2231-116/+182
|/ / / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-12-2122-59/+77
|/ / / / / /
* | | | | | Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-202-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | correctly mark app management active