Thomas Müller
|
9fac95c2ab
|
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
lib/private/appconfig.php
|
2014-02-14 23:03:27 +01:00 |
Jörn Friedrich Dreyer
|
2a6a9a8cef
|
polish documentation based on scrutinizer patches
|
2014-02-06 17:02:21 +01:00 |
Georg Ehrke
|
6f21da12e8
|
encode imagePath and fix documentation of loadFromFile
|
2014-01-11 12:07:28 +01:00 |
|
Georg Ehrke
|
059c3c8708
|
fix issue with logging non utf8 chars
|
2013-12-16 15:38:55 +01:00 |
Bjoern Schiessle
|
aeefe48cba
|
Revert "use relative paths to create images from a file. This way it also works if"
This reverts commit 3488f0b77a.
|
2013-11-22 18:01:44 +01:00 |
|
Bjoern Schiessle
|
3488f0b77a
|
use relative paths to create images from a file. This way it also works if
no user is logged in (e.g. public gallery share)
|
2013-11-22 12:26:01 +01:00 |
|
Thomas Müller
|
9c9dc276b7
|
move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
lib/private/vcategories.php
|
2013-09-30 16:36:59 +02:00 |