summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-245-19/+32
|\
| * Merge pull request #5874 from owncloud/fix-5845Thomas Müller2013-11-242-2/+2
| |\
| | * Compare dirname() results to DIRECTORY_SEPARATOR, not '/'ringmaster2013-11-141-1/+1
| | * Alias the aggregate columns so SQL Server doesn't combine them.ringmaster2013-11-141-1/+1
| * | update PHPDocThomas Mueller2013-11-241-0/+1
| * | fix overwrite host support and make the code a bit more readableFrank Karlitschek2013-11-241-1/+1
| * | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-221-0/+13
| * | Revert "use relative paths to create images from a file. This way it also wor...Bjoern Schiessle2013-11-221-16/+15
* | | Merge branch 'master' into fix-5388-masterThomas Müller2013-11-226-23/+78
|\| |
| * | Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-221-1/+13
| |\ \
| | * | add incognito mode, allows to hide my user ID. For example, this is useful to...Bjoern Schiessle2013-11-221-1/+13
| * | | Merge pull request #5882 from owncloud/preview-movie-5sThomas Müller2013-11-221-4/+6
| |\ \ \
| | * | | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.Thomas Müller2013-11-221-1/+3
| | * | | Working on a chunked video can result in a broken frame index the option -vsy...Thomas Müller2013-11-221-1/+1
| | * | | Movie preview - use frame after 5 secondsMorris Jobke2013-11-151-2/+2
| * | | | Merge pull request #6000 from owncloud/use_relative_path_to_create_imagesRaghu Nayyar2013-11-221-15/+16
| |\ \ \ \
| | * | | | use relative paths to create images from a file. This way it also works ifBjoern Schiessle2013-11-221-15/+16
| | | |/ / | | |/| |
| * | | | Merge pull request #5040 from owncloud/public_api_avatar_masterblizzz2013-11-223-3/+43
| |\ \ \ \
| | * | | | fixing PHPDoc comments and syntaxThomas Müller2013-11-222-3/+5
| | * | | | Round out Avatar Public APIArthur Schiwon2013-11-212-1/+27
| | * | | | Fix a regression (Tags→TagManager)kondou2013-11-071-1/+1
| | * | | | Remove duplicate getAvatarManager()kondou2013-11-071-9/+0
| | * | | | Add public API for \OC\Avatarkondou2013-11-072-2/+23
* | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
|/ / / / /
* | | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-211-2/+9
|\ \ \ \ \
| * | | | | Fixing the warning notificationsThomas Müller2013-11-211-1/+1
| * | | | | Update error messagesBart Visscher2013-11-151-1/+1
| * | | | | Use \Patchwork\Utf8\Bootup::initLocaleBart Visscher2013-11-151-2/+2
| * | | | | Make working en_US.UTF-8 locale a hard requirementBart Visscher2013-11-081-0/+7
* | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-212-8/+30
|\ \ \ \ \ \
| * | | | | | Now using the "Home" storage detection approach for quotaVincent Petry2013-11-212-15/+22
| * | | | | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-211-9/+24
| | |_|/ / / | |/| | | |
* / | | | | fixing spelling and restructure sentenceThomas Müller2013-11-211-1/+1
|/ / / / /
* | | | | Merge pull request #5965 from owncloud/mimetype-only-pathVincent Petry2013-11-204-37/+7
|\ \ \ \ \
| * | | | | Change default mimetype detection for storage backends to only use filenameRobin Appelman2013-11-204-37/+7
* | | | | | always get the right node for the given file pathThomas Müller2013-11-201-0/+2
|/ / / / /
* | | | | Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-3/+5
* | | | | Merge pull request #5927 from owncloud/quota-excludeextstorageMorris Jobke2013-11-184-7/+12
|\ \ \ \ \
| * | | | | External storage space is now not counted in total spaceVincent Petry2013-11-184-7/+12
* | | | | | Root size for home storage is now size of "files" subdirVincent Petry2013-11-181-0/+13
|/ / / / /
* | | | | one tab lessFrank Karlitschek2013-11-181-1/+1
* | | | | fix the version check for downloaded apps. Fixes https://github.com/owncloud/...Frank Karlitschek2013-11-181-2/+9
* | | | | Merge pull request #5789 from ogasser/db_fix_default_for_numericBart Visscher2013-11-151-1/+4
|\ \ \ \ \
| * | | | | treat numeric as an alias for decimalOliver Gasser2013-11-121-0/+3
| * | | | | changed type to decimalOliver Gasser2013-11-121-1/+1
| * | | | | DB: Set correct default value for numeric typesOliver Gasser2013-11-101-1/+1
* | | | | | Merge pull request #5813 from owncloud/fix-4736-masterThomas Müller2013-11-151-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't set a default value when there isn't a default specifiedBart Visscher2013-11-111-1/+1
| |/ / / /
* | | | | Merge branch 'master' into moviepreviewfallbackThomas Müller2013-11-1414-44/+208
|\ \ \ \ \
| * \ \ \ \ Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-141-3/+17
| |\ \ \ \ \