summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | adding backticks to satisfy OracleThomas Müller2013-10-231-1/+1
| |/ / / / /
| * | / / / backport of https://github.com/owncloud/core/pull/5247Bjoern Schiessle2013-10-211-1/+4
| | |/ / / | |/| | | | | | | | | | | | | ensure the view's root is a subfolder of the the default root, not only starting the same
| * | | | Use display name from magic cookie, fixes #4884Arthur Schiwon2013-10-181-0/+1
| | | | |
| * | | | Merge pull request #5229 from owncloud/more-link-expiration-stable5Thomas Müller2013-10-161-1/+12
| |\ \ \ \ | | | | | | | | | | | | Backport of #4856 to stable5: Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
| | * | | | Perform expiration date checking before returning share data for token.Andreas Fischer2013-10-091-1/+12
| | | | | |
| * | | | | Merge pull request #5185 from owncloud/Update-feedThomas Müller2013-10-161-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | [stable5] Fixes for update feed fetching and parsing
| | * | | | | Improve empty data checkVictor Dubiniuk2013-10-101-1/+1
| | | | | | |
| | * | | | | Do not write current time before checking if cache is expiredVictor Dubiniuk2013-10-071-1/+0
| | | | | | |
| * | | | | | streamCopy() should return proper structure.Thomas Müller2013-10-141-3/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers of streamCopy() expect an array to be returned containing count and result. Conflicts: lib/helper.php tests/lib/helper.php
| * | | | | Merge pull request #5218 from owncloud/no_passwordsBjörn Schießle2013-10-111-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | remove password before writing it to the log file
| | * | | | | remove username/passswords from URLs before writing the to the log fileBjoern Schiessle2013-10-081-0/+2
| | | | | | |
| * | | | | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from #5173 and #5219
| * | | | | | make sure that we only find file/folder sharesBjoern Schiessle2013-10-111-4/+4
| | | | | | |
| * | | | | | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise the returned internalPath will not match followup calls to e.g. Cache::getID() Conflicts: tests/lib/files/view.php
| * | | | | | Merge pull request #5208 from owncloud/fix_5126_stable5Björn Schießle2013-10-092-4/+18
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | [stable5] fix upload to /Shared
| | * | | | Backport of https://github.com/owncloud/core/pull/5193/Bjoern Schiessle2013-10-082-4/+18
| | | |/ / | | |/| | | | | | | | | | | | write the part file to the users root folder if the updated file is located in /Shared because we can't create new files in Shared/
| * | | | Merge pull request #5190 from owncloud/stable5-numRows-no-limitAndreas Fischer2013-10-091-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare(). * owncloud/stable5-numRows-no-limit: Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().
| | * | | Do not pass PDO::FETCH_NUM (integer 3) as limit parameter to OC_DB::prepare().Andreas Fischer2013-10-081-1/+1
| | |/ /
| * | | Merge pull request #5112 from owncloud/backport-4969-stable5Thomas Müller2013-10-081-0/+11
| |\ \ \ | | |/ / | |/| | [backport-stable5] adding privilege check on move and rename operations
| | * | adding privilege check on move and rename operationsThomas Müller2013-10-041-0/+11
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/objecttree.php
| * | | Merge pull request #5110 from owncloud/pg_install_dbBart Visscher2013-10-041-1/+7
| |\ \ \ | | |/ / | |/| | postgresql connect with specify db if 'postgres' does not work
| | * | Try connection with specified db when postgres does not workMorris Jobke2013-10-041-1/+7
| | |/
| * | Merge pull request #5096 from owncloud/backport-4960-stable5Thomas Müller2013-10-042-2/+15
| |\ \ | | |/ | |/| Backport of #4960 to stable5
| | * duplicate code :sigh: - will fix this in a second prThomas Müller2013-10-021-1/+8
| | |
| | * adding file_exists check just to be on the save sideThomas Müller2013-10-021-1/+2
| | |
| | * handle error situation of rename properThomas Müller2013-10-021-1/+6
| | |
| * | 5.0.12v5.0.12Frank Karlitschek2013-10-031-2/+2
| |/
| * check every enabled app if the remember login feature needs to be disabledBjoern Schiessle2013-09-301-3/+13
| |
| * introduce OC_Util::rememberLoginAllowed()Bjoern Schiessle2013-09-302-3/+14
| | | | | | | | | | | | Conflicts: core/templates/login.php lib/util.php
| * don't remember login if the encrypion app is enabled because the userBjoern Schiessle2013-09-302-5/+23
| | | | | | | | | | | | | | | | needs to log-in again in order to decrypt his private key with his password Conflicts: core/templates/login.php lib/util.php
* | Cherry-pick of 5d671a8 onto stable5.Andreas Fischer2013-09-292-2/+25
|/ | | | | | | | recreate an etag within the scanner if the cache contains an empty etag Conflicts: lib/files/cache/cache.php tests/lib/files/cache/scanner.php
* 5.0.12 RC1Frank Karlitschek2013-09-271-2/+2
|
* remove deleted files while scanningRobin Appelman2013-09-231-0/+2
|
* make sure that both $permissions and $oldPermissions have the same typeBjoern Schiessle2013-09-231-1/+1
|
* only remember password if the user changes the permissions, otherwise the ↵Bjoern Schiessle2013-09-231-3/+6
| | | | | | | user disabled the password protection Conflicts: lib/public/share.php
* some is_resource tests have been missing in #4701Thomas Müller2013-09-132-17/+21
|
* also emit hooks for views that are a subfolder of the user folderRobin Appelman2013-09-101-32/+57
|
* 5.0.11v5.0.11Frank Karlitschek2013-09-061-2/+2
|
* remove some more debug outputBjoern Schiessle2013-09-061-2/+0
|
* Merge branch 'stable5' into fix_4533Bjoern Schiessle2013-09-0611-50/+92
|\
| * 5.0.11 RC2Frank Karlitschek2013-09-011-2/+2
| |
| * Merge pull request #4701 from owncloud/fix_4667blizzz2013-09-048-47/+70
| |\ | | | | | | Always check variable type before using readdir to avoid surprises, fixes #4667 #4658 and #4613
| | * one check is enoughArthur Schiwon2013-09-041-7/+5
| | |
| | * fix unknown var in if clauseArthur Schiwon2013-09-021-1/+2
| | |
| | * Check variable type before using readdir to avoid surprises and fix #4667 ↵Arthur Schiwon2013-09-028-52/+76
| | | | | | | | | | | | #4658 and #4613
| * | Merge pull request #4700 from owncloud/stable5_ocp_files_searchbymimeBart Visscher2013-09-031-0/+10
| |\ \ | | | | | | | | Stable5 ocp files searchbymime
| | * | add searchByMime to public apiJörn Friedrich Dreyer2013-09-021-0/+10
| | |/
| * / backport autoloader magic trying to find class in lib folderJörn Friedrich Dreyer2013-09-021-1/+10
| |/
* | remove some error_logsBjoern Schiessle2013-09-051-1/+0
| |
* | remove error logsBjoern Schiessle2013-09-051-2/+2
| |