aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-2726-46/+59
|
* Merge pull request #8371 from owncloud/example-configThomas Müller2014-04-261-1/+1
|\ | | | | Add another example to the trusted_domains config
| * Add another example to the trusted_domains configLukas Reschke2014-04-261-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-statusLukas Reschke2014-04-261-1/+1
|\ | | | | Use echo since print_unescaped is not defined
| * "echo" is a language construct. Don't treat it like a function.Andreas Fischer2014-04-261-1/+1
| |
| * Use echo since print_unescaped is not definedLukas Reschke2014-04-241-1/+1
| | | | | | Fixes https://github.com/owncloud/core/issues/8342
* | Merge pull request #8353 from owncloud/publicshare-webdavicewind19912014-04-264-2/+131
|\ \ | | | | | | Expose public shares over webdav
| * | Expose public shares over webdavRobin Appelman2014-04-254-2/+131
| | |
* | | Merge pull request #8341 from owncloud/template-tests-output-bufferingLukas Reschke2014-04-261-35/+15
|\ \ \ | | | | | | | | Improve Template Tests by Removing Manual Output Buffering
| * | | Use PHPUnit's expectOutputString() instead of performing output buffering.Andreas Fischer2014-04-241-26/+11
| | | |
| * | | Split testP() tests into multiple methods.Andreas Fischer2014-04-241-1/+3
| | | |
| * | | Remove redundant test case for non-HTML string.Andreas Fischer2014-04-241-9/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-26163-679/+810
| | | |
* | | | Merge pull request #8355 from owncloud/l10n-expireAndreas Fischer2014-04-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo fix, by translators on transifex * owncloud/l10n-expire: typo fix, by translators on transifex
| * | | | typo fix, by translators on transifexVolkan Gezer2014-04-251-2/+2
| | | | |
* | | | | Merge pull request #8356 from owncloud/fix-external-cssicewind19912014-04-261-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | fix layout of external storage config table
| * | | | fix layout of external storage config tableMorris Jobke2014-04-251-1/+6
|/ / / /
* | | | Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-252-6/+10
|\ \ \ \ | |_|/ / |/| | | fix search by mime for shared single files
| * | | Merge branch 'master' into share-search-mimeRobin Appelman2014-04-2515-23/+12
| |\ \ \
| * | | | Also fixed the returned internal path when getting the root shared item by idRobin Appelman2014-04-251-4/+3
| | | | |
| * | | | Correct the path returned by getFolderContent for substoragesRobin Appelman2014-04-251-0/+1
| | | | |
| * | | | fix search by mime for shared single filesRobin Appelman2014-04-251-3/+7
| | | | |
* | | | | Merge pull request #7504 from owncloud/webdav-injectionicewind19912014-04-2515-322/+351
|\ \ \ \ \ | |_|/ / / |/| | | | Proper injection of filesystem view into the webdav connector
| * | | | remove outdated testRobin Appelman2014-04-251-18/+0
| | | | |
| * | | | merge master into webdav-injectionRobin Appelman2014-04-25731-15337/+45723
| |\| | |
| * | | | properly quote etagsRobin Appelman2014-04-241-1/+1
| | | | |
| * | | | Normalize paths when moving propertiesRobin Appelman2014-04-241-1/+1
| | | | |
| * | | | fixing typos and PHPDocThomas Müller2014-04-235-8/+22
| | | | |
| * | | | Revert changes to OC_Connector_Sabre_ServerRobin Appelman2014-04-231-41/+28
| | | | |
| * | | | Prevent error if previously cached data doesn't have an etagRobin Appelman2014-04-222-3/+5
| | | | |
| * | | | merge master into webdav-injectionRobin Appelman2014-04-22538-7398/+8062
| |\ \ \ \
| * \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-1515-153/+195
| |\ \ \ \ \
| * \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-04-151202-33331/+49081
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into webdav-injectionRobin Appelman2014-03-261625-52321/+90858
| |\ \ \ \ \ \ \
| * | | | | | | | don't throw errors in getTypeRobin Appelman2014-03-071-1/+4
| | | | | | | | |
| * | | | | | | | merge master into webdav-injectionRobin Appelman2014-03-0685-535/+1255
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix encryption webdav testsRobin Appelman2014-03-052-6/+19
| | | | | | | | | |
| * | | | | | | | | update test caseRobin Appelman2014-03-041-0/+1
| | | | | | | | | |
| * | | | | | | | | Remove the need for a custom SabreDav server constructorRobin Appelman2014-03-043-18/+20
| | | | | | | | | |
| * | | | | | | | | Update unit tests to use the new injectionRobin Appelman2014-03-035-47/+120
| | | | | | | | | |
| * | | | | | | | | Make path for dummy fileinfo absoluteRobin Appelman2014-03-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix FileInfo->getTypeRobin Appelman2014-03-032-3/+7
| | | | | | | | | |
| * | | | | | | | | Pass the filesystem view as argument in the sabredav connectors and use the ↵Robin Appelman2014-02-258-277/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileinfo object
* | | | | | | | | | Merge pull request #8351 from owncloud/search-mime-substorageicewind19912014-04-251-2/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix paths of searchByMime results on substorages
| * | | | | | | | | | fix paths of searchByMime results on substoragesRobin Appelman2014-04-251-2/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #8352 from owncloud/iconsJan-Christoph Borchardt2014-04-2514-21/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Icon improvements
| * | | | | | | | | remove metadataMorris Jobke2014-04-255-45/+0
| | | | | | | | | |
| * | | | | | | | | use trash as delete icon to differentiate from closeJan-Christoph Borchardt2014-04-254-11/+3
| | | | | | | | | |
| * | | | | | | | | compress view-close iconJan-Christoph Borchardt2014-04-251-54/+11
| | | | | | | | | |
| * | | | | | | | | improve upload and download iconsJan-Christoph Borchardt2014-04-224-6/+21
| | | | | | | | | |