Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | php 5.3 compatibility regarding OC\DB\Connection fixed | Thomas Müller | 2013-10-21 | 3 | -2/+96 |
* | Merge pull request #5249 from owncloud/activities-api | Thomas Müller | 2013-10-21 | 2 | -0/+80 |
|\ | |||||
| * | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 12 | -335/+212 |
| |\ | |||||
| * \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 18 | -356/+195 |
| |\ \ | |||||
| * | | | adding OC6 public API for activities | Thomas Müller | 2013-10-09 | 1 | -0/+69 |
| * | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-09 | 1 | -0/+12 |
* | | | | New OCS route: | Thomas Müller | 2013-10-21 | 1 | -2/+11 |
* | | | | dispayNamesInGroup(s) should always return uid as key in the result attr, fix... | Arthur Schiwon | 2013-10-20 | 1 | -1/+1 |
* | | | | the logfile shoudn't be world readable. | Frank Karlitschek | 2013-10-18 | 1 | -0/+1 |
* | | | | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 1 | -0/+6 |
* | | | | Merge pull request #5395 from owncloud/more_check_options | Vincent Petry | 2013-10-18 | 1 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | add options to disable the check for a working .htaccess file in data and for... | Frank Karlitschek | 2013-10-17 | 1 | -0/+7 |
* | | | | | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout | Vincent Petry | 2013-10-18 | 2 | -1/+49 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixed spaces | Vincent Petry | 2013-10-17 | 1 | -3/+3 |
| * | | | | Added timeout value to WebDAV post setup check | Vincent Petry | 2013-10-16 | 1 | -1/+3 |
| * | | | | Added DAV client wrapper that support timeout values | Vincent Petry | 2013-10-16 | 1 | -0/+46 |
* | | | | | Merge pull request #5394 from owncloud/sabre-server-location | Thomas Müller | 2013-10-17 | 1 | -0/+235 |
|\ \ \ \ \ | |||||
| * | | | | | Move OC_Connector_Sabre_Server to expected location. | Andreas Fischer | 2013-10-17 | 1 | -0/+235 |
* | | | | | | fix comment | Georg Ehrke | 2013-10-17 | 1 | -1/+1 |
* | | | | | | only call shell_exec if enabled | Georg Ehrke | 2013-10-17 | 2 | -3/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #5385 from owncloud/generate-sql-migration-master | Morris Jobke | 2013-10-17 | 1 | -1/+21 |
|\ \ \ \ \ | |||||
| * | | | | | new console command to generate sql migration scripts | Thomas Müller | 2013-10-17 | 1 | -1/+21 |
* | | | | | | Merge pull request #5379 from owncloud/undefined-shipped | Frank Karlitschek | 2013-10-17 | 1 | -5/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix undefined "shipped" | Morris Jobke | 2013-10-17 | 1 | -5/+5 |
* | | | | | | Merge pull request #5237 from owncloud/coverage-on-windows-master | Thomas Müller | 2013-10-17 | 3 | -111/+126 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | any preview requiring the which command will not be used on Windows | Thomas Müller | 2013-10-15 | 3 | -111/+126 |
* | | | | | | Merge pull request #4949 from owncloud/improve_unknown_preview_backend | Frank Karlitschek | 2013-10-17 | 2 | -5/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | resize svg without loosing quality | Thomas Müller | 2013-10-11 | 1 | -0/+8 |
| * | | | | | | fix indentation | Morris Jobke | 2013-10-07 | 1 | -6/+6 |
| * | | | | | | fix wrong variable name | Georg Ehrke | 2013-10-07 | 1 | -1/+1 |
| * | | | | | | fix doc block of OC\Preview\Provider::getThumbnail() | Georg Ehrke | 2013-10-07 | 1 | -3/+9 |
| * | | | | | | check if svg of filetype icon exists | Georg Ehrke | 2013-10-07 | 1 | -2/+2 |
| * | | | | | | use readImage instead of readImageBlob | Georg Ehrke | 2013-10-07 | 1 | -2/+1 |
| * | | | | | | fix new extension | Georg Ehrke | 2013-10-07 | 1 | -2/+2 |
| * | | | | | | use svg to generate filetype icon if imagick available | Georg Ehrke | 2013-10-07 | 1 | -1/+16 |
* | | | | | | | Merge pull request #5276 from owncloud/fixing-5170-master | Morris Jobke | 2013-10-16 | 1 | -23/+12 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | accept text/markdown as well | Thomas Müller | 2013-10-16 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' into fixing-5170-master | Thomas Müller | 2013-10-16 | 13 | -34/+178 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | implement previews for markdown | Georg Ehrke | 2013-10-14 | 1 | -0/+10 |
| * | | | | | | remove php and js previews | Georg Ehrke | 2013-10-11 | 1 | -20/+0 |
| * | | | | | | only text/plain is now used to generate text previews | Thomas Müller | 2013-10-11 | 1 | -11/+10 |
* | | | | | | | Merge branch 'master' into fixing-appframework-master | Thomas Müller | 2013-10-16 | 21 | -368/+251 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #5067 from owncloud/urlParams_fix | Thomas Müller | 2013-10-16 | 3 | -7/+6 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Get urlParams registered before Request is instantiated | Thomas Tanghus | 2013-10-01 | 3 | -7/+6 |
| * | | | | | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend | Thomas Müller | 2013-10-16 | 1 | -5/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | there shall be tabs | Thomas Müller | 2013-10-14 | 1 | -1/+1 |
| | * | | | | | | | file system is now initialized with apache authentication as well | Thomas Müller | 2013-10-14 | 1 | -6/+2 |
| * | | | | | | | | Merge pull request #5333 from owncloud/avater_with_encryption | Björn Schießle | 2013-10-16 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into avater_with_encryption | Bjoern Schiessle | 2013-10-15 | 6 | -22/+78 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | avatars should also work with encryption after pr #5332 was merged | Bjoern Schiessle | 2013-10-14 | 1 | -4/+0 |
| | | |/ / / / / / | | |/| | | | | | |