summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use a closure for the files app entry and deprecate old methodsJoas Schilling2015-03-173-45/+38
* Merge pull request #14944 from owncloud/fix-php-doc-and-coThomas Müller2015-03-171-4/+12
|\
| * Fix PHPDoc and Co.Lukas Reschke2015-03-171-4/+12
* | Merge pull request #14927 from oparoz/raw-mimetypesThomas Müller2015-03-174-2/+137
|\ \
| * | Introducing the Raw mimetypesOlivier Paroz2015-03-164-2/+137
* | | Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-e...Lukas Reschke2015-03-173-4/+182
|\ \ \
| * | | Add tests for the navigation manager (closure) behaviourJoas Schilling2015-03-161-0/+160
| * | | Allow registering closures for navigation entriesJoas Schilling2015-03-162-4/+22
* | | | Merge pull request #12085 from owncloud/add-swift-mailerLukas Reschke2015-03-1719-319/+1027
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't fallback to Plaintext per default for legacy classLukas Reschke2015-03-161-6/+15
| * | | Add debug log message backLukas Reschke2015-03-163-5/+23
| * | | Show more detailed error messageLukas Reschke2015-03-164-35/+16
| * | | Adjust unit testLukas Reschke2015-03-161-1/+6
| * | | Incorporate review changesLukas Reschke2015-03-168-116/+63
| * | | Use new IMailer and add unit-tests for lostcontrollerLukas Reschke2015-03-163-20/+111
| * | | Migrate to SwiftMailLukas Reschke2015-03-1620-286/+943
* | | | Merge pull request #14929 from owncloud/s2s-scanner-warningsVincent Petry2015-03-171-1/+1
|\ \ \ \
| * | | | Fix scanFile signature warningsVincent Petry2015-03-161-1/+1
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-17102-228/+68
* | | | Merge pull request #14936 from owncloud/fix-setup-configMorris Jobke2015-03-161-1/+1
|\ \ \ \
| * | | | Fix setup configVincent Petry2015-03-161-1/+1
|/ / / /
* | | | Merge pull request #14923 from owncloud/fix-preference-key-definitionVincent Petry2015-03-166-1/+6
|\ \ \ \
| * | | | 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
| |/ / /
* | | | Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_instal...Thomas Müller2015-03-161-0/+5
|\ \ \ \
| * | | | 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 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 itGeorg Ehrke2015-03-162-1/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #14766 from owncloud/fix-insertifnotexists-pocMorris Jobke2015-03-1613-138/+236
|\ \ \ \ \
| * | | | | 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 r...Thomas Müller2015-03-098-57/+25
| * | | | | Adding unit test which shows insertIfNotExists to fall apart in certain situa...Thomas Müller2015-03-092-11/+91
| * | | | | 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 panelRoeland Jago Douma2015-02-131-7/+7
* | | | | | | Merge pull request #14644 from owncloud/trash-expire-commandThomas Müller2015-03-165-32/+167
|\ \ \ \ \ \ \
| * | | | | | | don't rely on \OCP\User::getUser() - it is not set properly in case of async ...Thomas Müller2015-03-101-10/+8
| * | | | | | | 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
|\ \ \ \ \ \ \ \