Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-27 | 26 | -46/+59 |
| | |||||
* | Merge pull request #8371 from owncloud/example-config | Thomas Müller | 2014-04-26 | 1 | -1/+1 |
|\ | | | | | Add another example to the trusted_domains config | ||||
| * | Add another example to the trusted_domains config | Lukas Reschke | 2014-04-26 | 1 | -1/+1 |
|/ | | | | Users often ask in IRC or the forum how to add another domain. Hopefully they will be able to find it out on their own if we have an example with two domains. | ||||
* | Merge pull request #8343 from owncloud/fix-status | Lukas Reschke | 2014-04-26 | 1 | -1/+1 |
|\ | | | | | Use echo since print_unescaped is not defined | ||||
| * | "echo" is a language construct. Don't treat it like a function. | Andreas Fischer | 2014-04-26 | 1 | -1/+1 |
| | | |||||
| * | Use echo since print_unescaped is not defined | Lukas Reschke | 2014-04-24 | 1 | -1/+1 |
| | | | | | | Fixes https://github.com/owncloud/core/issues/8342 | ||||
* | | Merge pull request #8353 from owncloud/publicshare-webdav | icewind1991 | 2014-04-26 | 4 | -2/+131 |
|\ \ | | | | | | | Expose public shares over webdav | ||||
| * | | Expose public shares over webdav | Robin Appelman | 2014-04-25 | 4 | -2/+131 |
| | | | |||||
* | | | Merge pull request #8341 from owncloud/template-tests-output-buffering | Lukas Reschke | 2014-04-26 | 1 | -35/+15 |
|\ \ \ | | | | | | | | | Improve Template Tests by Removing Manual Output Buffering | ||||
| * | | | Use PHPUnit's expectOutputString() instead of performing output buffering. | Andreas Fischer | 2014-04-24 | 1 | -26/+11 |
| | | | | |||||
| * | | | Split testP() tests into multiple methods. | Andreas Fischer | 2014-04-24 | 1 | -1/+3 |
| | | | | |||||
| * | | | Remove redundant test case for non-HTML string. | Andreas Fischer | 2014-04-24 | 1 | -9/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-26 | 163 | -679/+810 |
| | | | | |||||
* | | | | Merge pull request #8355 from owncloud/l10n-expire | Andreas Fischer | 2014-04-26 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo fix, by translators on transifex * owncloud/l10n-expire: typo fix, by translators on transifex | ||||
| * | | | | typo fix, by translators on transifex | Volkan Gezer | 2014-04-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #8356 from owncloud/fix-external-css | icewind1991 | 2014-04-26 | 1 | -1/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | fix layout of external storage config table | ||||
| * | | | | fix layout of external storage config table | Morris Jobke | 2014-04-25 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #8350 from owncloud/share-search-mime | icewind1991 | 2014-04-25 | 2 | -6/+10 |
|\ \ \ \ | |_|/ / |/| | | | fix search by mime for shared single files | ||||
| * | | | Merge branch 'master' into share-search-mime | Robin Appelman | 2014-04-25 | 15 | -23/+12 |
| |\ \ \ | |||||
| * | | | | Also fixed the returned internal path when getting the root shared item by id | Robin Appelman | 2014-04-25 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Correct the path returned by getFolderContent for substorages | Robin Appelman | 2014-04-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix search by mime for shared single files | Robin Appelman | 2014-04-25 | 1 | -3/+7 |
| | | | | | |||||
* | | | | | Merge pull request #7504 from owncloud/webdav-injection | icewind1991 | 2014-04-25 | 15 | -322/+351 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Proper injection of filesystem view into the webdav connector | ||||
| * | | | | remove outdated test | Robin Appelman | 2014-04-25 | 1 | -18/+0 |
| | | | | | |||||
| * | | | | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 731 | -15337/+45723 |
| |\| | | | |||||
| * | | | | properly quote etags | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Normalize paths when moving properties | Robin Appelman | 2014-04-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixing typos and PHPDoc | Thomas Müller | 2014-04-23 | 5 | -8/+22 |
| | | | | | |||||
| * | | | | Revert changes to OC_Connector_Sabre_Server | Robin Appelman | 2014-04-23 | 1 | -41/+28 |
| | | | | | |||||
| * | | | | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | merge master into webdav-injection | Robin Appelman | 2014-04-22 | 538 | -7398/+8062 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 15 | -153/+195 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 1202 | -33331/+49081 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master into webdav-injection | Robin Appelman | 2014-03-26 | 1625 | -52321/+90858 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | don't throw errors in getType | Robin Appelman | 2014-03-07 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | merge master into webdav-injection | Robin Appelman | 2014-03-06 | 85 | -535/+1255 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix encryption webdav tests | Robin Appelman | 2014-03-05 | 2 | -6/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | update test case | Robin Appelman | 2014-03-04 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove the need for a custom SabreDav server constructor | Robin Appelman | 2014-03-04 | 3 | -18/+20 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update unit tests to use the new injection | Robin Appelman | 2014-03-03 | 5 | -47/+120 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Make path for dummy fileinfo absolute | Robin Appelman | 2014-03-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix FileInfo->getType | Robin Appelman | 2014-03-03 | 2 | -3/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Pass the filesystem view as argument in the sabredav connectors and use the ↵ | Robin Appelman | 2014-02-25 | 8 | -277/+231 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileinfo object | ||||
* | | | | | | | | | | Merge pull request #8351 from owncloud/search-mime-substorage | icewind1991 | 2014-04-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fix paths of searchByMime results on substorages | ||||
| * | | | | | | | | | | fix paths of searchByMime results on substorages | Robin Appelman | 2014-04-25 | 1 | -2/+3 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #8352 from owncloud/icons | Jan-Christoph Borchardt | 2014-04-25 | 14 | -21/+9 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Icon improvements | ||||
| * | | | | | | | | | remove metadata | Morris Jobke | 2014-04-25 | 5 | -45/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | use trash as delete icon to differentiate from close | Jan-Christoph Borchardt | 2014-04-25 | 4 | -11/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | compress view-close icon | Jan-Christoph Borchardt | 2014-04-25 | 1 | -54/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | improve upload and download icons | Jan-Christoph Borchardt | 2014-04-22 | 4 | -6/+21 |
| | | | | | | | | | |