Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-07 | 41 | -82/+3362 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 32 | -164/+214 |
| | |||||
* | Merge pull request #6031 from s0taka/master | Morris Jobke | 2014-01-05 | 2 | -2/+5 |
|\ | | | | | No decimal points for Kilobyte and Byte #5371. | ||||
| * | spaces to tabs | Simon Könnecke | 2013-12-18 | 1 | -1/+1 |
| | | |||||
| * | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 2 | -2/+5 |
| | | |||||
* | | Merge pull request #6580 from monreal/master | Thomas Müller | 2014-01-05 | 1 | -1/+1 |
|\ \ | | | | | | | Silence output of 'which' command used in smbclient detection | ||||
| * | | Silence output of 'which' command used in smbclient detection | Michael Monreal | 2013-12-27 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 32 | -154/+203 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 25 | -46/+51 |
| | | | |||||
* | | | Merge pull request #6610 from owncloud/apcu-clear | icewind1991 | 2014-01-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCu::clear | ||||
| * | | | Fix APCIterator syntax in \OC\Memcache\APCU::clear | Robin Appelman | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | see http://www.php.net/manual/en/apciterator.construct.php | ||||
* | | | | Merge pull request #6605 from owncloud/free_space_disabled | Thomas Müller | 2014-01-02 | 1 | -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 Appelman | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | space on a local storage | ||||
* | | | | | Merge pull request #6609 from owncloud/avatar-test-user | Thomas Müller | 2014-01-02 | 1 | -5/+13 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Make OC_Avatar unit tests independent of currently loggedin user | ||||
| * | | | | Make OC_Avatar unit tests independent of currently loggedin user | Robin Appelman | 2014-01-02 | 1 | -5/+13 |
|/ / / / | |||||
* | | | | Merge pull request #6513 from owncloud/user-no-change-displayname | icewind1991 | 2014-01-02 | 4 | -15/+54 |
|\ \ \ \ | |/ / / |/| | | | Re-add the config options to remove the ability for users to change their displayname | ||||
| * | | | Pass config object in testGetHomeNotSupported | Robin Appelman | 2013-12-20 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into user-no-change-displayname | Robin Appelman | 2013-12-19 | 137 | -597/+1550 |
| |\ \ \ | |||||
| * | | | | Replace static usage of OC_Config and OC_Preferences with the injected ↵ | Robin Appelman | 2013-12-18 | 1 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | \OC\ConfigAll | ||||
| * | | | | fix the config option to remove the ability for users to set their displayname | Robin Appelman | 2013-12-18 | 3 | -9/+37 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 40 | -852/+1545 |
| | | | | | |||||
* | | | | | Merge pull request #6601 from AdamWill/pimple-include | Thomas Müller | 2014-01-01 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | don't specify path to 3rdparty directory when registering Pimple autoloader | ||||
| * | | | | | don't specify path to 3rdparty directory when registering Pimple autoloader | Adam Williamson | 2014-01-01 | 1 | -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/master | Thomas Müller | 2014-01-01 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add support mimetype | ||||
| * | | | | | | Add support mimetype | lolozere | 2014-01-01 | 1 | -0/+3 |
|/ / / / / / | | | | | | | | | | | | | Add support mimetype for extension .sh, .bash and .sh-lib | ||||
* | | | | | | Revert "Added support for extra backends (see pull request #5043)" | Niklas Sombert | 2014-01-01 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d75914f2a97cbfd34ae7c2ef27f5bd8185b81eb, reversing changes made to 760fa9ea3005e7df81a1fac54f207dbe7d8ef312. | ||||
* | | | | | | Added support for extra backends (see pull request #5043) | Niklas Sombert | 2014-01-01 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | Somebody had forgotten "OC_User::setupBackends();"... | ||||
| * | | | | | Added support for extra backends | elchi | 2013-09-30 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Somebody had forgotten "OC_User::setupBackends();"... | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-31 | 20 | -181/+263 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-30 | 28 | -14/+3290 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 28 | -309/+472 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-28 | 21 | -95/+151 |
| |_|_|/ / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-27 | 18 | -72/+84 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-26 | 16 | -79/+115 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-25 | 17 | -49/+49 |
| | | | | | |||||
* | | | | | Merge pull request #6520 from owncloud/tests-testcleanuplistener | Thomas Müller | 2013-12-24 | 4 | -1/+159 |
|\ \ \ \ \ | | | | | | | | | | | | | Added test cleanup listener to detect untidy tests | ||||
| * | | | | | Added test cleanup listener to detect untidy tests | Vincent Petry | 2013-12-19 | 4 | -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-appsorderfix | Thomas Müller | 2013-12-24 | 4 | -6/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed apps loading order | ||||
| * | | | | | | Fixed apps loading order | Vincent Petry | 2013-12-20 | 4 | -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/master | Thomas Müller | 2013-12-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Made admin password field required on client side | ||||
| * | | | | | | | Made password field required on client side | Vladimir Sapronov | 2013-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19 | ||||
* | | | | | | | | Merge pull request #6554 from owncloud/fix_5982 | Thomas Müller | 2013-12-24 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix preview for reshared file | ||||
| * | | | | | | | | fix preview for reshared file | Georg Ehrke | 2013-12-22 | 1 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-24 | 42 | -267/+326 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #6460 from owncloud/remove-numRows | Frank Karlitschek | 2013-12-23 | 4 | -33/+13 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Remove OC_DB_StatementWrapper::numRows() | ||||
| * | | | | | | | Remove all uses of numRows(). | Andreas Fischer | 2013-12-21 | 3 | -14/+13 |
| | | | | | | | | |||||
| * | | | | | | | Remove OC_DB_StatementWrapper::numRows(). | Andreas Fischer | 2013-12-21 | 1 | -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 transifex | Jenkins for ownCloud | 2013-12-22 | 31 | -116/+182 |
|/ / / / / / / | |||||
* / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-21 | 22 | -59/+77 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #6262 from nickvergessen/issue/4375 | Frank Karlitschek | 2013-12-20 | 2 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | correctly mark app management active |