summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-18180-352/+272
* Merge pull request #14972 from owncloud/add-group-styleMorris Jobke2015-03-181-2/+21
|\
| * slight positioning fixes in user mgmt controls barJan-Christoph Borchardt2015-03-171-1/+4
| * improve style of 'Add group' input and buttonJan-Christoph Borchardt2015-03-171-1/+17
* | Merge pull request #14967 from owncloud/checkbox-alignmentMorris Jobke2015-03-181-2/+5
|\ \
| * | add more whitespace to share link options in dropdown for better clickability...Jan-Christoph Borchardt2015-03-171-2/+4
| * | fix checkbox alignment in share dialog, fix #11515Jan-Christoph Borchardt2015-03-171-0/+1
| |/
* | Merge pull request #14968 from owncloud/files-reallowsinglequoteThomas Müller2015-03-172-1/+27
|\ \
| * | Use `FILTER_UNSAFE_RAW` instead of `FILTER_SANITIZE_STRING`Lukas Reschke2015-03-171-1/+1
| * | Add positive test for path verificationVincent Petry2015-03-171-0/+26
| |/
* | Merge pull request #14975 from owncloud/add-smtp-debug-modeThomas Müller2015-03-171-1/+16
|\ \
| * | Add debug mode back to mailerLukas Reschke2015-03-171-1/+16
* | | Merge pull request #14961 from owncloud/onlyrequireinfoBernhard Posselt2015-03-171-3/+3
|\ \ \
| * | | only hard depend on the info.xml and not the app.phpBernhard Posselt2015-03-171-3/+3
* | | | Merge pull request #14954 from owncloud/cache-image-pathRobin McCorkell2015-03-174-24/+51
|\ \ \ \ | |_|/ / |/| | |
| * | | Reuse cache resultLukas Reschke2015-03-171-2/+2
| * | | Read theme only if requiredLukas Reschke2015-03-171-3/+3
| * | | Cache \OC\URLGenerator::imagePathLukas Reschke2015-03-174-24/+51
* | | | Merge pull request #14962 from owncloud/safer-deletionMorris Jobke2015-03-172-3/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | add whitespace to prevent file deletion when wanting to scrollJan-Christoph Borchardt2015-03-172-3/+7
|/ / /
* | | Merge pull request #14957 from owncloud/remove-unused-sectionLukas Reschke2015-03-171-1/+0
|\ \ \
| * | | Remove unused sectionLukas Reschke2015-03-171-1/+0
* | | | Merge pull request #14948 from owncloud/prefix-memcacheThomas Müller2015-03-172-1/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Add version and path to cache prefixLukas Reschke2015-03-172-1/+9
| |/ /
* | | Merge pull request #14952 from owncloud/issue/14881-files-app-follow-upThomas Müller2015-03-173-45/+38
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \ \ \