summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14936 from owncloud/fix-setup-configMorris Jobke2015-03-161-1/+1
|\ | | | | Fix setup config namespace
| * Fix setup configVincent Petry2015-03-161-1/+1
|/
* Merge pull request #14923 from owncloud/fix-preference-key-definitionVincent Petry2015-03-166-1/+6
|\ | | | | Fix user preference key definition for insertIfNotExists()
| * Also add a note that clob does not work in the compare arrayJoas Schilling2015-03-165-0/+5
| |
| * The key is over configkey, user and app, not the valueJoas Schilling2015-03-161-1/+1
| | | | | | | | stupid me :(
* | Merge pull request #13733 from ↵Thomas Müller2015-03-161-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 setupMartin2015-01-281-0/+5
| | |
* | | Merge pull request #14877 from owncloud/smb-constructor-noconnectVincent Petry2015-03-168-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 itRobin Appelman2015-03-138-23/+81
| | |
* | | Merge pull request #14883 from owncloud/imagepng_expects_resource_issueThomas Müller2015-03-162-1/+9
|\ \ \ | | | | | | | | validate resource's integrity before using it
| * | | validate resource's integrity before using itGeorg Ehrke2015-03-162-1/+9
| | | |
* | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-pocMorris Jobke2015-03-1613-138/+236
|\ \ \ \ | | | | | | | | | | Allow specifying the compare-array for insertIfNotExists()
| * | | | Also use all keys for an empty array, just in caseJoas Schilling2015-03-122-2/+2
| | | | |
| * | | | Throw a RuntimeException in the cache aswellJoas Schilling2015-03-112-4/+9
| | | | |
| * | | | Fix doc blocks of insertIfNotExists() methodJoas Schilling2015-03-116-62/+48
| | | | |
| * | | | Add test for UniqueConstraintViolationException on wrong keyJoas Schilling2015-03-101-0/+32
| | | | |
| * | | | let insertIfNotExist() throw the native DBALException - no need to hide the ↵Thomas Müller2015-03-098-57/+25
| | | | | | | | | | | | | | | | | | | | real exception
| * | | | Adding unit test which shows insertIfNotExists to fall apart in certain ↵Thomas Müller2015-03-092-11/+91
| | | | | | | | | | | | | | | | | | | | situations
| * | | | Get the id before using itJoas Schilling2015-03-091-1/+2
| | | | |
| * | | | Better save then sorryJoas Schilling2015-03-091-0/+2
| | | | |
| * | | | insertIfNotExists() for storage insertionJoas Schilling2015-03-091-3/+9
| | | | |
| * | | | Only check unique keys for the comparison on filecache insert & update otherwiseJoas Schilling2015-03-091-1/+6
| | | | |
| * | | | Allow specifying the compare-array for insertIfNotExists()Joas Schilling2015-03-098-21/+34
| | | | |
* | | | | Merge pull request #14133 from rullzer/fix_10600Thomas Müller2015-03-161-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Always display max upload size in admin panel
| * | | | | Always display max upload size in admin panelRoeland Jago Douma2015-02-131-7/+7
| | | | | |
* | | | | | Merge pull request #14644 from owncloud/trash-expire-commandThomas Müller2015-03-165-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üller2015-03-101-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | operations
| * | | | | | tearDown the filesystem right before setting it up againThomas Müller2015-03-101-0/+1
| | | | | | |
| * | | | | | Expire files from the trash in the backgroundRobin Appelman2015-03-023-15/+75
| | | | | | |
| * | | | | | Allow running the async commands from unit testsRobin Appelman2015-03-022-7/+83
| | | | | | |
* | | | | | | Merge pull request #14776 from owncloud/fix-14629-masterThomas Müller2015-03-164-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üller2015-03-124-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during rename
* | | | | | | | Merge pull request #14848 from owncloud/kill-curl-fallback-masterThomas Müller2015-03-169-179/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | drop any fallback code related to curl
| * | | | | | | | drop any fallback code related to curl - refs ↵Thomas Müller2015-03-129-179/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/14838#issuecomment-78586447
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-16116-104/+92
| | | | | | | | |
* | | | | | | | | Merge pull request #14899 from owncloud/setupwarning-textMorris Jobke2015-03-151-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Put notice about checking logs in setup warning
| * | | | | | | | | Put notice about checking logs in setup warningRobin McCorkell2015-03-151-1/+1
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-156-14/+18
|/ / / / / / / / /
* | | | | | | | | Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-objectJoas Schilling2015-03-143-29/+49
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix getting the avatar of a non-existing user
| * | | | | | | | | No user no avatar easy as thatJoas Schilling2015-03-131-6/+5
| | | | | | | | | |
| * | | | | | | | | Color avatars of non-existing users gray and display X insteadJoas Schilling2015-03-131-1/+3
| | | | | | | | | |
| * | | | | | | | | Fix order of expected and actual on assertEquals() callsJoas Schilling2015-03-131-19/+19
| | | | | | | | | |
| * | | | | | | | | Fix getting the avatar of a non-existing userJoas Schilling2015-03-132-10/+29
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-144-0/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #14871 from owncloud/use-proper-error-typeThomas Müller2015-03-131-18/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use proper error type and clean-up code
| * | | | | | | | | Use proper error type and clean-up codeLukas Reschke2015-03-131-18/+24
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14880 from owncloud/drop-example-backendThomas Müller2015-03-132-72/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Drop example user backend
| * | | | | | | | | Remove outdated commentLukas Reschke2015-03-131-2/+0
| | | | | | | | | |
| * | | | | | | | | Drop example user backendLukas Reschke2015-03-131-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_HTTPMorris Jobke2015-03-131-120/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove OC_User_HTTP