Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14936 from owncloud/fix-setup-config | Morris Jobke | 2015-03-16 | 1 | -1/+1 |
|\ | | | | | Fix setup config namespace | ||||
| * | Fix setup config | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #14923 from owncloud/fix-preference-key-definition | Vincent Petry | 2015-03-16 | 6 | -1/+6 |
|\ | | | | | Fix user preference key definition for insertIfNotExists() | ||||
| * | Also add a note that clob does not work in the compare array | Joas Schilling | 2015-03-16 | 5 | -0/+5 |
| | | |||||
| * | The key is over configkey, user and app, not the value | Joas Schilling | 2015-03-16 | 1 | -1/+1 |
| | | | | | | | | stupid me :( | ||||
* | | Merge pull request #13733 from ↵ | Thomas Müller | 2015-03-16 | 1 | -0/+5 |
|\ \ | | | | | | | | | | | | | mmattel/Try_to_write_logtimezone_during_installation Write the parameter 'logtimezone' into config.php during setup | ||||
| * | | Write the parameter 'logtimezone' into config.php during setup | Martin | 2015-01-28 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #14877 from owncloud/smb-constructor-noconnect | Vincent Petry | 2015-03-16 | 8 | -23/+81 |
|\ \ \ | |_|/ |/| | | Wait with getting the timezone from the smb server until we need it | ||||
| * | | Wait with getting the timezone from the smb server until we need it | Robin Appelman | 2015-03-13 | 8 | -23/+81 |
| | | | |||||
* | | | Merge pull request #14883 from owncloud/imagepng_expects_resource_issue | Thomas Müller | 2015-03-16 | 2 | -1/+9 |
|\ \ \ | | | | | | | | | validate resource's integrity before using it | ||||
| * | | | validate resource's integrity before using it | Georg Ehrke | 2015-03-16 | 2 | -1/+9 |
| | | | | |||||
* | | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-poc | Morris Jobke | 2015-03-16 | 13 | -138/+236 |
|\ \ \ \ | | | | | | | | | | | Allow specifying the compare-array for insertIfNotExists() | ||||
| * | | | | Also use all keys for an empty array, just in case | Joas Schilling | 2015-03-12 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Throw a RuntimeException in the cache aswell | Joas Schilling | 2015-03-11 | 2 | -4/+9 |
| | | | | | |||||
| * | | | | Fix doc blocks of insertIfNotExists() method | Joas Schilling | 2015-03-11 | 6 | -62/+48 |
| | | | | | |||||
| * | | | | Add test for UniqueConstraintViolationException on wrong key | Joas Schilling | 2015-03-10 | 1 | -0/+32 |
| | | | | | |||||
| * | | | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵ | Thomas Müller | 2015-03-09 | 8 | -57/+25 |
| | | | | | | | | | | | | | | | | | | | | real exception | ||||
| * | | | | Adding unit test which shows insertIfNotExists to fall apart in certain ↵ | Thomas Müller | 2015-03-09 | 2 | -11/+91 |
| | | | | | | | | | | | | | | | | | | | | situations | ||||
| * | | | | Get the id before using it | Joas Schilling | 2015-03-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Better save then sorry | Joas Schilling | 2015-03-09 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | insertIfNotExists() for storage insertion | Joas Schilling | 2015-03-09 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Only check unique keys for the comparison on filecache insert & update otherwise | Joas Schilling | 2015-03-09 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Allow specifying the compare-array for insertIfNotExists() | Joas Schilling | 2015-03-09 | 8 | -21/+34 |
| | | | | | |||||
* | | | | | Merge pull request #14133 from rullzer/fix_10600 | Thomas Müller | 2015-03-16 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Always display max upload size in admin panel | ||||
| * | | | | | Always display max upload size in admin panel | Roeland Jago Douma | 2015-02-13 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #14644 from owncloud/trash-expire-command | Thomas Müller | 2015-03-16 | 5 | -32/+167 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Expire files from the trash in the background | ||||
| * | | | | | | don't rely on \OCP\User::getUser() - it is not set properly in case of async ↵ | Thomas Müller | 2015-03-10 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations | ||||
| * | | | | | | tearDown the filesystem right before setting it up again | Thomas Müller | 2015-03-10 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Expire files from the trash in the background | Robin Appelman | 2015-03-02 | 3 | -15/+75 |
| | | | | | | | |||||
| * | | | | | | Allow running the async commands from unit tests | Robin Appelman | 2015-03-02 | 2 | -7/+83 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14776 from owncloud/fix-14629-master | Thomas Müller | 2015-03-16 | 4 | -0/+54 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | verify the file name length not to exceed 255 characters + verify path d... | ||||
| * | | | | | | | verify the file name length not to exceed 255 characters + verify path ↵ | Thomas Müller | 2015-03-12 | 4 | -0/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during rename | ||||
* | | | | | | | | Merge pull request #14848 from owncloud/kill-curl-fallback-master | Thomas Müller | 2015-03-16 | 9 | -179/+66 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | drop any fallback code related to curl | ||||
| * | | | | | | | | drop any fallback code related to curl - refs ↵ | Thomas Müller | 2015-03-12 | 9 | -179/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/14838#issuecomment-78586447 | ||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-16 | 116 | -104/+92 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #14899 from owncloud/setupwarning-text | Morris Jobke | 2015-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Put notice about checking logs in setup warning | ||||
| * | | | | | | | | | Put notice about checking logs in setup warning | Robin McCorkell | 2015-03-15 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-15 | 6 | -14/+18 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object | Joas Schilling | 2015-03-14 | 3 | -29/+49 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix getting the avatar of a non-existing user | ||||
| * | | | | | | | | | No user no avatar easy as that | Joas Schilling | 2015-03-13 | 1 | -6/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Color avatars of non-existing users gray and display X instead | Joas Schilling | 2015-03-13 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix order of expected and actual on assertEquals() calls | Joas Schilling | 2015-03-13 | 1 | -19/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix getting the avatar of a non-existing user | Joas Schilling | 2015-03-13 | 2 | -10/+29 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-14 | 4 | -0/+14 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #14871 from owncloud/use-proper-error-type | Thomas Müller | 2015-03-13 | 1 | -18/+24 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use proper error type and clean-up code | ||||
| * | | | | | | | | | Use proper error type and clean-up code | Lukas Reschke | 2015-03-13 | 1 | -18/+24 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #14880 from owncloud/drop-example-backend | Thomas Müller | 2015-03-13 | 2 | -72/+0 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Drop example user backend | ||||
| * | | | | | | | | | Remove outdated comment | Lukas Reschke | 2015-03-13 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Drop example user backend | Lukas Reschke | 2015-03-13 | 1 | -70/+0 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already provide an interface for application developers, this file is outdated and thus should get removed. Addresses No. 3 from https://github.com/owncloud/core/issues/14847 | ||||
* | | | | | | | | | Merge pull request #14867 from owncloud/drop-OC_User_HTTP | Morris Jobke | 2015-03-13 | 1 | -120/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove OC_User_HTTP |