Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not show exception to the end-user | Lukas Reschke | 2014-09-17 | 5 | -62/+40 |
* | Merge pull request #11009 from owncloud/tobiasKaminsky-route | Lukas Reschke | 2014-09-16 | 1 | -0/+6 |
|\ | |||||
| * | Route for thumbnail generation | tobiasKaminsky | 2014-09-16 | 1 | -0/+6 |
* | | Merge pull request #11102 from owncloud/visit1985-issue_108 | Lukas Reschke | 2014-09-16 | 1 | -24/+38 |
|\ \ | |||||
| * | | simplify mysql user creation flow | Michael Göhler | 2014-09-16 | 1 | -24/+38 |
* | | | Merge pull request #7254 from owncloud/core-sortalgo | Lukas Reschke | 2014-09-16 | 2 | -0/+128 |
|\ \ \ | |||||
| * | | | Fixed sort algo for additional cases | Vincent Petry | 2014-08-11 | 1 | -1/+2 |
| * | | | Fixed file list sorting | Vincent Petry | 2014-08-11 | 2 | -0/+127 |
* | | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheck | Thomas Müller | 2014-09-16 | 1 | -70/+42 |
|\ \ \ \ | |||||
| * | | | | Deduplicate dependency checks | Lukas Reschke | 2014-09-16 | 1 | -70/+42 |
* | | | | | Merge pull request #10754 from cetra3/master | Lukas Reschke | 2014-09-16 | 1 | -7/+37 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/owncloud/core | cetra3 | 2014-09-08 | 56 | -355/+1324 |
| |\ \ \ \ | |||||
| * | | | | | Refactor internal session to write directly to $_SESSION | cetra3 | 2014-08-30 | 1 | -7/+37 |
* | | | | | | Merge pull request #11084 from owncloud/no-migration-for-mssql-master | Lukas Reschke | 2014-09-16 | 2 | -0/+26 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Disable database migrations for MSSQL - scripts have to be applied manually | Thomas Müller | 2014-09-15 | 2 | -0/+26 |
* | | | | | | Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc | Morris Jobke | 2014-09-16 | 1 | -16/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unexisting class and PHPDoc | Lukas Reschke | 2014-09-15 | 1 | -16/+8 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect | Morris Jobke | 2014-09-16 | 1 | -7/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add phpdoc | Georg Ehrke | 2014-09-15 | 1 | -0/+4 |
| * | | | | | | add y to with-aspect naming schema | Georg Ehrke | 2014-09-15 | 1 | -7/+13 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileload | Morris Jobke | 2014-09-16 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Preserve transparency when loading from a file | kondou | 2014-09-10 | 1 | -0/+6 |
* | | | | | | | Merge pull request #11060 from owncloud/rmobslang | Lukas Reschke | 2014-09-15 | 2 | -22/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remove obsolete language files | Volkan Gezer | 2014-09-13 | 2 | -22/+0 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayout | Morris Jobke | 2014-09-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Step one, open guest layout for different styles. | Lukas Reschke | 2014-09-11 | 1 | -0/+1 |
* | | | | | | | Merge pull request #10960 from owncloud/use-intl-module-master | Lukas Reschke | 2014-09-15 | 2 | -7/+8 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | use intl's native normalizer_normalize() in case the module is available | Thomas Müller | 2014-09-11 | 2 | -7/+8 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #11041 from owncloud/no-size-check-on-lock-master | Raghu Nayyar | 2014-09-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | content size checks are not valid for LOCK | Thomas Müller | 2014-09-12 | 1 | -1/+1 |
* | | | | | | | Merge pull request #11043 from owncloud/test-againstNull | Clark Tomlinson | 2014-09-12 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Return false in case one of the values is null | Lukas Reschke | 2014-09-12 | 1 | -0/+4 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-12 | 1 | -0/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecause... | Thomas Müller | 2014-09-11 | 1 | -2/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add custom hex2bin implementation for 5.3 | Lukas Reschke | 2014-09-11 | 1 | -2/+18 |
* | | | | | | | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over | Lukas Reschke | 2014-09-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Refresh if maintenance mode is over | kondou | 2014-09-09 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #10962 from owncloud/repair_search_lucene | Lukas Reschke | 2014-09-11 | 3 | -2/+66 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | repair search lucene before installing | Jörn Friedrich Dreyer | 2014-09-10 | 3 | -2/+66 |
| |/ / / / / / | |||||
* | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-11 | 1 | -12/+114 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #10988 from owncloud/usetransactions-wrong-name | Thomas Müller | 2014-09-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix method name | Robin Appelman | 2014-09-10 | 1 | -1/+1 |
* | | | | | | Merge pull request #10929 from owncloud/issue/10514 | Vincent Petry | 2014-09-10 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Set overwritewebroot when installing owncloud to avoid problems | Joas Schilling | 2014-09-08 | 1 | -0/+1 |
* | | | | | | Merge pull request #10972 from ppaysant/routes-defaults | Bernhard Posselt | 2014-09-09 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow default values for route parameters. | Patrick Paysant | 2014-09-09 | 1 | -0/+6 |
* | | | | | | | Merge pull request #10922 from owncloud/explicit-scan-transactions | Lukas Reschke | 2014-09-09 | 2 | -3/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix typo | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| * | | | | | | Use bigger transactions when doing explicit file system scans | Robin Appelman | 2014-09-08 | 2 | -3/+32 |
| |/ / / / / | |||||
* | / / / / | more sugar for including lists of templates | Bernhard Posselt | 2014-09-09 | 1 | -7/+29 |
| |/ / / / |/| | | | |