summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix file summary to use the whole file listVincent Petry2014-04-2812-138/+342
* Added infinite scrolling (in-memory list)Vincent Petry2014-04-282-6/+71
* Merge pull request #8381 from owncloud/files_irodsThomas Müller2014-04-2882-8015/+0
|\
| * drop files_irods from apps_externalThomas Müller2014-04-2882-8015/+0
* | Merge pull request #8309 from DavidPrevot/chosenThomas Müller2014-04-281-1/+1
|\ \ | |/ |/|
| * Adapt chosen (css) pathDavid Prévot2014-04-221-1/+1
* | Merge pull request #8327 from owncloud/l10n-files_external-fieldsThomas Müller2014-04-282-66/+67
|\ \
| * | fix single quote sanitizationVolkan Gezer2014-04-261-1/+1
| * | Add translatable mount configsVolkan Gezer2014-04-231-65/+66
| |/
* | Merge pull request #7473 from owncloud/append-error-documentThomas Müller2014-04-283-48/+14
|\ \
| * \ Merge branch 'master' into append-error-documentThomas Müller2014-04-021730-59460/+97173
| |\ \
| * | | A version bump is not necessary hereLukas Reschke2014-02-281-1/+1
| * | | Typo + use regular assignmentLukas Reschke2014-02-281-2/+2
| * | | Remove .htaccess creation codeLukas Reschke2014-02-284-49/+15
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-28162-742/+1289
* | | | Merge pull request #8372 from owncloud/give-admins-a-hintLukas Reschke2014-04-271-1/+1
|\ \ \ \
| * | | | Remove an added t by the github webeditorLukas Reschke2014-04-271-1/+1
| * | | | Grammatical fixesLukas Reschke2014-04-271-2/+2
| * | | | Clarify the trusted_domain error pageLukas Reschke2014-04-261-1/+1
* | | | | [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 configLukas Reschke2014-04-261-1/+1
|/ / / /
* | | | Merge pull request #8343 from owncloud/fix-statusLukas Reschke2014-04-261-1/+1
|\ \ \ \
| * | | | "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
* | | | | Merge pull request #8353 from owncloud/publicshare-webdavicewind19912014-04-264-2/+131
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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 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
| |\ \ \ \ \ \ \