Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-11 | 28 | -151/+774 |
* | Merge pull request #10992 from oparoz/patch-3 | Robin McCorkell | 2014-09-10 | 1 | -0/+4 |
|\ | |||||
| * | Create .user.ini for PHP-FPM | Olivier Paroz | 2014-09-10 | 1 | -0/+4 |
* | | 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 #10990 from owncloud/fix-testCallRegister-master | Lukas Reschke | 2014-09-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | requesttoken has now a length of 30 chars | Thomas Müller | 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 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-10 | 39 | -41/+89 |
* | | Merge pull request #9512 from libasys/patch-2 | Lukas Reschke | 2014-09-09 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fix use Sharing Api with calendar | libasys | 2014-07-08 | 1 | -2/+3 |
* | | | Merge pull request #10844 from owncloud/acceptance-enableapps | Lukas Reschke | 2014-09-09 | 4 | -9/+304 |
|\ \ \ | |||||
| * | | | Added acceptance tests for enabling apps | Vincent Petry | 2014-09-03 | 4 | -9/+304 |
* | | | | Merge pull request #10972 from ppaysant/routes-defaults | Bernhard Posselt | 2014-09-09 | 2 | -4/+28 |
|\ \ \ \ | |||||
| * | | | | Allow default values for route parameters. | Patrick Paysant | 2014-09-09 | 2 | -4/+28 |
* | | | | | Merge pull request #10922 from owncloud/explicit-scan-transactions | Lukas Reschke | 2014-09-09 | 5 | -6/+35 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix typo | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| * | | | | Use bigger transactions when doing explicit file system scans | Robin Appelman | 2014-09-08 | 5 | -6/+35 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #10969 from owncloud/set-e | Vincent Petry | 2014-09-09 | 2 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | terminate script execution in case of failure | Thomas Müller | 2014-09-09 | 2 | -0/+5 |
* | | | | | Merge pull request #10964 from owncloud/static-array-functions | Bernhard Posselt | 2014-09-09 | 1 | -7/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | more sugar for including lists of templates | Bernhard Posselt | 2014-09-09 | 1 | -7/+29 |
|/ / / / | |||||
* | | | | Merge pull request #10948 from owncloud/fix-zindex | Lukas Reschke | 2014-09-09 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | fix z-index of header and dropdowns, fix user menu not showing on mobile | Jan-Christoph Borchardt | 2014-09-08 | 1 | -3/+3 |
* | | | | | Merge pull request #10947 from owncloud/html-imports | Bernhard Posselt | 2014-09-09 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | append .html since componets always use html files | Bernhard Posselt | 2014-09-08 | 1 | -1/+1 |
| * | | | | | add template functions for html imports | Bernhard Posselt | 2014-09-08 | 1 | -0/+10 |
* | | | | | | Merge pull request #9753 from owncloud/filepath-css | Thomas Müller | 2014-09-09 | 2 | -1/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add beforeeach and aftereach | Lukas Reschke | 2014-09-09 | 1 | -4/+6 |
| * | | | | | | Add unittest for filePath | Lukas Reschke | 2014-09-09 | 1 | -0/+18 |
| * | | | | | | Remove special case for css in OC.filePath | Robin Appelman | 2014-07-21 | 1 | -1/+1 |
* | | | | | | | Merge pull request #10949 from owncloud/allow_prefilling_login | Jörn Friedrich Dreyer | 2014-09-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | allow prefilling login | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7323 from owncloud/Jonny007-MKD-master | Lukas Reschke | 2014-09-09 | 3 | -6/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Also update sqliteadapter | Robin Appelman | 2014-07-02 | 1 | -3/+11 |
| * | | | | | | | add unit test | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -0/+22 |
| * | | | | | | | Update adapter.php | Jonny007-MKD | 2014-07-01 | 1 | -3/+8 |
* | | | | | | | | Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore | Jörn Friedrich Dreyer | 2014-09-09 | 2 | -33/+88 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | make objectstore tests check fileid on rename | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -0/+83 |
| * | | | | | | | | Keep fileid on move in objectstore, fixes #10848 | Jörn Friedrich Dreyer | 2014-09-05 | 1 | -33/+5 |
* | | | | | | | | | Merge pull request #10928 from owncloud/allow_dot_in_dbname_on_web_install | Lukas Reschke | 2014-09-09 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | allow . in dbname on web install | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -0/+3 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 90 | -156/+206 |
* | | | | | | | | | Merge pull request #10863 from owncloud/removeWarningWhenCheckIsDisabled | VicDeo | 2014-09-09 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't show warning when has_internet_connection is set to false | Lukas Reschke | 2014-09-05 | 2 | -2/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix broken new lines in plain text mail template | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
| * | | | | | | | | | Use correct language package so the subject is correctly translated | Joas Schilling | 2014-09-04 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #10927 from owncloud/update-nosetupbackends | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ |