aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdocMorris Jobke2014-09-161-16/+8
|\
| * Fix unexisting class and PHPDocLukas Reschke2014-09-151-16/+8
* | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspectMorris Jobke2014-09-161-7/+17
|\ \
| * | add phpdocGeorg Ehrke2014-09-151-0/+4
| * | add y to with-aspect naming schemaGeorg Ehrke2014-09-151-7/+13
| |/
* | Merge pull request #10362 from owncloud/preserve_transparency_on_fileloadMorris Jobke2014-09-161-0/+6
|\ \
| * | Preserve transparency when loading from a filekondou2014-09-101-0/+6
* | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-152-22/+0
|\ \ \
| * | | remove obsolete language filesVolkan Gezer2014-09-132-22/+0
* | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayoutMorris Jobke2014-09-151-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Step one, open guest layout for different styles.Lukas Reschke2014-09-111-0/+1
* | | | Merge pull request #10960 from owncloud/use-intl-module-masterLukas Reschke2014-09-152-7/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | use intl's native normalizer_normalize() in case the module is availableThomas Müller2014-09-112-7/+8
| |/ /
* | | Merge pull request #11041 from owncloud/no-size-check-on-lock-masterRaghu Nayyar2014-09-131-1/+1
|\ \ \
| * | | content size checks are not valid for LOCKThomas Müller2014-09-121-1/+1
* | | | Merge pull request #11043 from owncloud/test-againstNullClark Tomlinson2014-09-121-0/+4
|\ \ \ \
| * | | | Return false in case one of the values is nullLukas Reschke2014-09-121-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-121-0/+2
|/ / / /
* | | | Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecause...Thomas Müller2014-09-111-2/+18
|\ \ \ \
| * | | | Add custom hex2bin implementation for 5.3Lukas Reschke2014-09-111-2/+18
* | | | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_overLukas Reschke2014-09-111-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refresh if maintenance mode is overkondou2014-09-091-0/+1
* | | | | Merge pull request #10962 from owncloud/repair_search_luceneLukas Reschke2014-09-113-2/+66
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | repair search lucene before installingJörn Friedrich Dreyer2014-09-103-2/+66
| |/ / /
* | | / [tx-robot] updated from transifexJenkins for ownCloud2014-09-111-12/+114
| |_|/ |/| |
* | | Merge pull request #10988 from owncloud/usetransactions-wrong-nameThomas Müller2014-09-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix method nameRobin Appelman2014-09-101-1/+1
* | | Merge pull request #10929 from owncloud/issue/10514Vincent Petry2014-09-101-0/+1
|\ \ \ | |/ / |/| |
| * | Set overwritewebroot when installing owncloud to avoid problemsJoas Schilling2014-09-081-0/+1
* | | Merge pull request #10972 from ppaysant/routes-defaultsBernhard Posselt2014-09-091-0/+6
|\ \ \
| * | | Allow default values for route parameters.Patrick Paysant2014-09-091-0/+6
* | | | Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-092-3/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typoLukas Reschke2014-09-081-1/+1
| * | | Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-082-3/+32
| |/ /
* | / more sugar for including lists of templatesBernhard Posselt2014-09-091-7/+29
| |/ |/|
* | Merge pull request #10947 from owncloud/html-importsBernhard Posselt2014-09-091-0/+10
|\ \
| * | append .html since componets always use html filesBernhard Posselt2014-09-081-1/+1
| * | add template functions for html importsBernhard Posselt2014-09-081-0/+10
* | | Merge pull request #10949 from owncloud/allow_prefilling_loginJörn Friedrich Dreyer2014-09-091-2/+2
|\ \ \
| * | | allow prefilling loginJörn Friedrich Dreyer2014-09-081-2/+2
| |/ /
* | | Merge pull request #7323 from owncloud/Jonny007-MKD-masterLukas Reschke2014-09-092-6/+19
|\ \ \
| * | | Also update sqliteadapterRobin Appelman2014-07-021-3/+11
| * | | Update adapter.phpJonny007-MKD2014-07-011-3/+8
* | | | Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstoreJörn Friedrich Dreyer2014-09-091-33/+5
|\ \ \ \
| * | | | Keep fileid on move in objectstore, fixes #10848Jörn Friedrich Dreyer2014-09-051-33/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-091-0/+1
* | | | | Merge pull request #10858 from owncloud/issue/10847VicDeo2014-09-091-1/+1
|\ \ \ \ \
| * | | | | Use correct language package so the subject is correctly translatedJoas Schilling2014-09-041-1/+1
* | | | | | Merge pull request #10927 from owncloud/update-nosetupbackendsVincent Petry2014-09-081-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Do not load extra user backends when an upgrade is dueVincent Petry2014-09-081-1/+3
| | |_|_|/ | |/| | |