aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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 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 tableMorris Jobke2014-04-251-1/+6
|/
* Merge pull request #8350 from owncloud/share-search-mimeicewind19912014-04-252-6/+10
|\
| * 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
|\ \ \ | |_|/ |/| |
| * | 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 f...Robin Appelman2014-02-258-277/+231
* | | | | | | | Merge pull request #8351 from owncloud/search-mime-substorageicewind19912014-04-251-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | improve delete and close iconsJan-Christoph Borchardt2014-04-226-12/+73
| * | | | | | | thinner add iconJan-Christoph Borchardt2014-04-222-3/+11
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-25419-9772/+12829
* | | | | | | | Merge pull request #8338 from owncloud/phpunit-4.0-compatAndreas Fischer2014-04-242-17/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Normalise testcleanuplistener.php indentation and end of file.Andreas Fischer2014-04-241-17/+16
| * | | | | | | | Make PHPUnit_Framework_TestListener implementations compatible to 4.0.Andreas Fischer2014-04-242-0/+6
* | | | | | | | | Merge pull request #8337 from owncloud/flv-to-mimesLukas Reschke2014-04-241-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add flv to known mimetypesVictor Dubiniuk2014-04-241-0/+1
* | | | | | | | | | Merge pull request #8026 from owncloud/remove_shared_folderBjörn Schießle2014-04-2441-880/+913
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove hard-coded shared folderBjoern Schiessle2014-04-231-1/+1
| * | | | | | | | | always allow to rename the share mount pointBjoern Schiessle2014-04-234-2/+26
| * | | | | | | | | split-up the update script and add unit tests for itBjoern Schiessle2014-04-232-21/+92