summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix numRows usage in user_ldapJörn Friedrich Dreyer2013-07-042-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/access.php apps/user_ldap/lib/helper.php
| * | | | make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or ↵Jörn Friedrich Dreyer2013-07-041-15/+65
| | | | | | | | | | | | | | | | | | | | DELETE queries, introduces isManipulation() to guess type of query
* | | | | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-084-17/+28
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit eed4b49cebcbcc252a75ed85097730b73213b0da Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:03:23 2013 +0200 initialize OC_Defaults only once commit bf6f07ccc8fb87535a069ca341789a590cb187ee Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 8 10:02:48 2013 +0200 link to doc in error messages commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2 Merge: e41af3d 3c1308f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:56 2013 +0200 Merge branch 'master' into better-messages commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jul 4 11:10:41 2013 +0200 move to non-static defaults.php commit 9e4258b1905244bdf34943a825421f041cbed43d Author: Björn Schießle <schiessle@owncloud.com> Date: Tue Jul 2 10:32:13 2013 +0200 no sprintf here, lets t() handle it commit fe1df349e248667a137f70d78b04225e5b42a111 Merge: d8f6859 cb5811b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:13:38 2013 +0200 Merge branch 'master' into better-messages commit d8f68595df2dc0e0917d916cbde511ec5333010b Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:10:57 2013 +0200 use document base url from defaults.php commit 6c5403748a45717125a2aa375550f05646317d72 Merge: bea6b1c 7b0e3e6 Author: Björn Schießle <schiessle@owncloud.com> Date: Mon Jul 1 11:00:15 2013 +0200 Merge branch 'master' into better-messages commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:21:12 2013 +0200 link to docs in WebDAV message, ref #3791 commit 3119b364a1094769e711283d1ce9014505f64ab9 Author: Jan-Christoph Borchardt <hey@jancborchardt.net> Date: Mon Jun 24 16:10:21 2013 +0200 link to docs in error messages, fix #3819 Conflicts: lib/config.php
* | | | 5.0.8 RCFrank Karlitschek2013-07-051-2/+2
| | | |
* | | | Backport of #3951 to stable5Thomas Müller2013-07-052-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 46c1280e4f2ac61f0b3c5fed9d2a516cb000c009 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 13:45:21 2013 +0200 proper fix for getting the shared item if no user is logged in commit 99e32baec4464444a1a46ae47321e0378e367c3e Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 13:22:38 2013 +0200 php 5.3 compliant now commit 227e5f10016e362ed1302acb4426de391d4d9b4b Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 12:15:47 2013 +0200 get the real physical folder name for anonymous upload
* | | | Backport of #3948 to stable5Thomas Müller2013-07-052-2/+6
| | | |
* | | | for now we disable public upload in case encryption is enabledThomas Mueller2013-07-051-1/+5
| | | |
* | | | adding tipsy to the upload button showing the max upload and restoring ↵Thomas Müller2013-07-052-47/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | client side upload size validation Conflicts: apps/files_sharing/templates/public.php
* | | | remove unneeded bracket, was introduced by the last mergeBjörn Schießle2013-07-051-1/+0
| | | |
* | | | added helper function to escape glob patternBjörn Schießle2013-07-053-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php
* | | | fix getUidAndFilename() testBjörn Schießle2013-07-051-1/+1
| | | |
* | | | only check for external mount points if the external storage app is enabledBjörn Schießle2013-07-051-9/+12
| | | |
* | | | make trash bin aware of system wide mounts with respect to encryption keysBjörn Schießle2013-07-051-7/+21
| | | |
* | | | only escape glob patternBjörn Schießle2013-07-052-4/+9
| | | |
* | | | del share keys from correct locationBjörn Schießle2013-07-051-3/+16
| | | |
* | | | always return normalized pathBjörn Schießle2013-07-051-1/+1
| | | |
* | | | delete file keys from the correct locationBjörn Schießle2013-07-051-1/+8
| | | |
* | | | handle rename correctly for system wide mountsBjörn Schießle2013-07-051-9/+16
| | | |
* | | | move isSystemWideMountPoint() to util.phpBjörn Schießle2013-07-052-19/+19
| | | |
* | | | some performance improvements, check for system wide mounts only once while ↵Björn Schießle2013-07-051-40/+25
| | | | | | | | | | | | | | | | writing share keys
* | | | fix path to OC_Mount_ConfigBjörn Schießle2013-07-052-2/+2
| | | |
* | | | handle system wide mount pointsBjörn Schießle2013-07-052-17/+62
| | | |
* | | | no anonymous upload on read-only foldersThomas Müller2013-07-051-9/+11
| | | |
* | | | Do not add groups if user has no groupsVictor Dubiniuk2013-07-041-2/+4
| | | |
* | | | fix position of 'user shared the folder foldername with you' labelGeorg Ehrke2013-07-041-1/+5
| | | |
* | | | more verbose error messageBjörn Schießle2013-07-041-1/+1
| | | |
* | | | improved error messageBjörn Schießle2013-07-041-1/+1
| | | |
* | | | no ?> at the end of a fileThomas Müller2013-07-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing . Conflicts: apps/files_encryption/files/error.php
* | | | typoThomas Müller2013-07-041-3/+3
| | | |
* | | | cast result to boolBjörn Schießle2013-07-041-1/+1
| | | |
* | | | fix error stringBjörn Schießle2013-07-041-1/+1
| | | |
* | | | add correct php versionBjörn Schießle2013-07-041-1/+1
| | | |
* | | | check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-043-7/+22
|/ / / | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php
* | | Merge pull request #3931 from owncloud/backport_selectRangeJörn Friedrich Dreyer2013-07-041-0/+20
|\ \ \ | | | | | | | | Fixing renaming for stable5
| * | | Add selectRange functionVictor Dubiniuk2013-07-041-0/+20
| | | |
* | | | Merge pull request #3921 from owncloud/init_default_stringsBjörn Schießle2013-07-0410-61/+205
|\ \ \ \ | |/ / / |/| | | Add init funtion to OC_Defaults to be able to wrap translatable strings
| * | | eddition string should be empty by defaultBjörn Schießle2013-07-031-1/+1
| | | |
| * | | add public apiBjörn Schießle2013-07-032-1/+109
| | | |
| * | | move to non-static OC_DefaultsBjörn Schießle2013-07-0310-78/+81
| | | |
| * | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-039-9/+42
|/ / /
* | | Sabre: throw exceptions when delete/create/write operations are not permittedRobin Appelman2013-07-022-3/+27
| | |
* | | use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not setThomas Müller2013-07-021-2/+8
| | |
* | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better ↵Thomas Mueller2013-07-021-7/+7
| | | | | | | | | | | | than nothing
* | | Merge pull request #3905 from owncloud/emit_signals_for_part_filesThomas Müller2013-07-021-3/+21
|\ \ \ | | | | | | | | Emit signals for part files
| * | | don't run hooks for .part filesBjörn Schießle2013-07-011-1/+1
| | | |
| * | | if a part file gets renamed to a real file, that this was the second step of ↵Björn Schießle2013-07-011-2/+20
| | | | | | | | | | | | | | | | a write operation, hence emit a write signal
* | | | add openssl_error_string() output to the owncloud.logBjörn Schießle2013-07-021-6/+5
| | | |
* | | | fix function documentationBjörn Schießle2013-07-021-1/+1
| | | |
* | | | introduce pre-disable-app hook and use it for the encryption app to reset ↵Björn Schießle2013-07-024-0/+26
| | | | | | | | | | | | | | | | migration status if the app was disabled
* | | | Merge pull request #3909 from owncloud/stable5-anon-uploadJörn Friedrich Dreyer2013-07-0213-287/+757
|\ \ \ \ | | | | | | | | | | Stable5 anon upload
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 16:39:49 +0000