summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* php 5.3 compatibility regarding OC\DB\Connection fixedThomas Müller2013-10-213-2/+96
* Merge pull request #5249 from owncloud/activities-apiThomas Müller2013-10-212-0/+80
|\
| * Merge branch 'master' into activities-apiThomas Müller2013-10-1612-335/+212
| |\
| * \ Merge branch 'master' into activities-apiThomas Müller2013-10-1618-356/+195
| |\ \
| * | | adding OC6 public API for activitiesThomas Müller2013-10-091-0/+69
| * | | Merge branch 'master' into activities-apiThomas Müller2013-10-091-0/+12
* | | | New OCS route:Thomas Müller2013-10-211-2/+11
* | | | dispayNamesInGroup(s) should always return uid as key in the result attr, fix...Arthur Schiwon2013-10-201-1/+1
* | | | the logfile shoudn't be world readable.Frank Karlitschek2013-10-181-0/+1
* | | | Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-181-0/+6
* | | | Merge pull request #5395 from owncloud/more_check_optionsVincent Petry2013-10-181-0/+7
|\ \ \ \
| * | | | add options to disable the check for a working .htaccess file in data and for...Frank Karlitschek2013-10-171-0/+7
* | | | | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeoutVincent Petry2013-10-182-1/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed spacesVincent Petry2013-10-171-3/+3
| * | | | Added timeout value to WebDAV post setup checkVincent Petry2013-10-161-1/+3
| * | | | Added DAV client wrapper that support timeout valuesVincent Petry2013-10-161-0/+46
* | | | | Merge pull request #5394 from owncloud/sabre-server-locationThomas Müller2013-10-171-0/+235
|\ \ \ \ \
| * | | | | Move OC_Connector_Sabre_Server to expected location.Andreas Fischer2013-10-171-0/+235
* | | | | | fix commentGeorg Ehrke2013-10-171-1/+1
* | | | | | only call shell_exec if enabledGeorg Ehrke2013-10-172-3/+3
|/ / / / /
* | | | | Merge pull request #5385 from owncloud/generate-sql-migration-masterMorris Jobke2013-10-171-1/+21
|\ \ \ \ \
| * | | | | new console command to generate sql migration scriptsThomas Müller2013-10-171-1/+21
* | | | | | Merge pull request #5379 from owncloud/undefined-shippedFrank Karlitschek2013-10-171-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix undefined "shipped"Morris Jobke2013-10-171-5/+5
* | | | | | Merge pull request #5237 from owncloud/coverage-on-windows-masterThomas Müller2013-10-173-111/+126
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | any preview requiring the which command will not be used on WindowsThomas Müller2013-10-153-111/+126
* | | | | | Merge pull request #4949 from owncloud/improve_unknown_preview_backendFrank Karlitschek2013-10-172-5/+33
|\ \ \ \ \ \
| * | | | | | resize svg without loosing qualityThomas Müller2013-10-111-0/+8
| * | | | | | fix indentationMorris Jobke2013-10-071-6/+6
| * | | | | | fix wrong variable nameGeorg Ehrke2013-10-071-1/+1
| * | | | | | fix doc block of OC\Preview\Provider::getThumbnail()Georg Ehrke2013-10-071-3/+9
| * | | | | | check if svg of filetype icon existsGeorg Ehrke2013-10-071-2/+2
| * | | | | | use readImage instead of readImageBlobGeorg Ehrke2013-10-071-2/+1
| * | | | | | fix new extensionGeorg Ehrke2013-10-071-2/+2
| * | | | | | use svg to generate filetype icon if imagick availableGeorg Ehrke2013-10-071-1/+16
* | | | | | | Merge pull request #5276 from owncloud/fixing-5170-masterMorris Jobke2013-10-161-23/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | accept text/markdown as wellThomas Müller2013-10-161-1/+1
| * | | | | | Merge branch 'master' into fixing-5170-masterThomas Müller2013-10-1613-34/+178
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | implement previews for markdownGeorg Ehrke2013-10-141-0/+10
| * | | | | | remove php and js previewsGeorg Ehrke2013-10-111-20/+0
| * | | | | | only text/plain is now used to generate text previewsThomas Müller2013-10-111-11/+10
* | | | | | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-1621-368/+251
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-163-7/+6
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-013-7/+6
| * | | | | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backendThomas Müller2013-10-161-5/+1
| |\ \ \ \ \ \ \
| | * | | | | | | there shall be tabsThomas Müller2013-10-141-1/+1
| | * | | | | | | file system is now initialized with apache authentication as wellThomas Müller2013-10-141-6/+2
| * | | | | | | | Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-161-4/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-156-22/+78
| | |\ \ \ \ \ \ \
| | * | | | | | | | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | | |/ / / / / / | | |/| | | | | |