Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | 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 #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 | 2 | -6/+19 |
|\ \ \ | |||||
| * | | | Also update sqliteadapter | Robin Appelman | 2014-07-02 | 1 | -3/+11 |
| * | | | 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 | 1 | -33/+5 |
|\ \ \ \ | |||||
| * | | | | Keep fileid on move in objectstore, fixes #10848 | Jörn Friedrich Dreyer | 2014-09-05 | 1 | -33/+5 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 1 | -0/+1 |
* | | | | | Merge pull request #10858 from owncloud/issue/10847 | VicDeo | 2014-09-09 | 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 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Do not load extra user backends when an upgrade is due | Vincent Petry | 2014-09-08 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 5 | -47/+103 |
|\ \ \ \ \ | |||||
| * | | | | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 4 | -5/+7 |
| * | | | | | Explicitly cast id and validate type | Robin Appelman | 2014-09-04 | 1 | -3/+6 |
| * | | | | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 1 | -4/+3 |
| * | | | | | Add event source to the public api | Robin Appelman | 2014-09-03 | 4 | -1/+49 |
| * | | | | | Initialize an event source when we start using it, not in the constructor | Robin Appelman | 2014-09-03 | 1 | -42/+46 |
* | | | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 3 | -8/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Match \OC_Helper::linkToPublic() to new links and fit unittests | kondou | 2014-09-04 | 1 | -6/+6 |
| * | | | | | | Readd TOKEN_LENGTH | kondou | 2014-09-04 | 2 | -1/+3 |
| * | | | | | | Use base62 and remove configuration options for link length | kondou | 2014-09-04 | 1 | -7/+2 |
| * | | | | | | Change config.sample entry and use MediumSecurity | kondou | 2014-09-04 | 1 | -1/+1 |
| * | | | | | | Adapt token size to new generation and add an option for free length specific... | kondou | 2014-09-04 | 1 | -16/+5 |
| * | | | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 2 | -3/+20 |
| * | | | | | | Initial work on shorter links | kondou | 2014-09-04 | 1 | -1/+1 |
* | | | | | | | Merge pull request #10938 from owncloud/useSecureMimetype | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use secure mimetype for content delivery | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #10827 from oparoz/patch-2 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | env:UserInstallation was already there in master | Olivier Paroz | 2014-09-03 | 1 | -2/+2 |
| * | | | | | | | Libreoffice config folder needs to be set | Olivier Paroz | 2014-09-03 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #10911 from owncloud/template-funcs | Lukas Reschke | 2014-09-08 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | add shortcut functions for style and script | Bernhard Posselt | 2014-09-06 | 1 | -0/+18 |
* | | | | | | | | Merge pull request #10862 from chli1/master | Vincent Petry | 2014-09-08 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix BadRequest error if CONTENT_LENGTH not set | chli1 | 2014-09-04 | 1 | -5/+8 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #10889 from owncloud/moveTrustedDomainCheck | Lukas Reschke | 2014-09-05 | 1 | -15/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move trusted domain check to init() | Lukas Reschke | 2014-09-05 | 1 | -15/+15 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Remove explicit propagate calls | Robin Appelman | 2014-09-05 | 2 | -19/+7 |
* | | | | | | | Update cache before post hooks | Robin Appelman | 2014-09-05 | 1 | -19/+20 |