summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 5.0.9v5.0.9Frank Karlitschek2013-07-141-2/+2
|
* Merge pull request #3965 from dphi/fix_2846Thomas Müller2013-07-122-9/+29
|\ | | | | speedup for propfinds on shared folders
| * Only retrieve the current user's permissionsMichael Gapczynski2013-07-062-5/+6
| |
| * Cache: provide a function to get the permissions of all files in a folder ↵Robin Appelman2013-07-062-9/+28
| | | | | | | | | | | | | | with one query Conflicts: lib/files/view.php
* | - eventsource.php: in case of potential CSRF attack we send an error message ↵Thomas Müller2013-07-111-4/+5
| | | | | | | | | | | | | | | | from the EventSource to the browser - eventsource.js: handle undefined data on event - update.js: in case of error we close the event source - advise the user to reload the page - update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
* | 5.0.8v5.0.8Frank Karlitschek2013-07-101-2/+2
| |
* | Merge pull request #3893 from owncloud/backport_1872Bart Visscher2013-07-081-6/+7
|\ \ | | | | | | Backport #1872
| * | request.php: add type check to the not empty check of a stringherbrechtsmeier2013-06-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The not equal comparison (<>) of a variable with an empty string could lead to false positive results as the compare do not check the type and thereby could not make sure that the checked variable is a string. The usage of the not identical comparison operator (!==) make sure that the variable is a string and not empty.
| * | Overwrite host and webroot when forcessl is enabledherbrechtsmeier2013-06-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | This patch enables the use of forcessl together with a multiple domains reverse SSL proxy (owncloud/core#1099) which have different hostname and webroot for http and https access. The code assumes that the ssl proxy (https) hostname and webroot is configured via overwritehost and overwritewebroot.
* | | Merge pull request #3970 from owncloud/backport-3946-stable5Thomas Müller2013-07-081-11/+23
|\ \ \ | | | | | | | | Backport 3946 to stable5
| * | | Squashed commit of the following:Thomas Müller2013-07-081-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 70e6ad56ed5d00aeea8fe82b45047998dac92f80 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Sat Jul 6 00:11:42 2013 +0200 fixing check if public share is a folder or not commit 8e74ecec3f43a52a9a55871954171ef4073eab9d Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Sat Jul 6 00:04:01 2013 +0200 removing unused getSharedItem() commit 60ac0f274bbaa926dcec1800e952f2e0b1f05a50 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 17:39:41 2013 +0200 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function Conflicts: apps/files/ajax/upload.php commit f071f7439568ffd8b785cd96035cc2e616f61b01 Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 11:30:53 2013 +0200 fixing Notice: Undefined index: isPublic commit d2f2c7e9b896fd0ac57fb8047501205fc37b2abc Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Jul 5 09:58:41 2013 +0200 handle anonymous upload to reshared folder
* | | | Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixesJörn Friedrich Dreyer2013-07-084-28/+121
|\ \ \ \ | |/ / / |/| | | Stable5 oracle testsuite fixes
| * | | fix insertIfNotExist return value, update doc and corresponding testJörn Friedrich Dreyer2013-07-051-12/+27
| | | |
| * | | Oracle doesn't know & as bitwise ANDBart Visscher2013-07-041-6/+8
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/share.php
| * | | for oracle use BITAND() instead of & in sharing permissions sqlJörn Friedrich Dreyer2013-07-041-3/+7
| | | |
| * | | fix type of numeric columnsJörn Friedrich Dreyer2013-07-041-0/+24
| | | |
| * | | check item id is setJörn Friedrich Dreyer2013-07-041-1/+1
| | | |
| * | | add missing backticksJörn Friedrich Dreyer2013-07-041-1/+1
| | | |
| * | | manuall calculate unix_timestamp for oracleJörn Friedrich Dreyer2013-07-041-0/+1
| | | |
| * | | one if lessJörn Friedrich Dreyer2013-07-041-5/+2
| | | |
| * | | fix numRows usage in core libJörn Friedrich Dreyer2013-07-042-2/+2
| | | |
| * | | 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-083-16/+27
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-1/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | eddition string should be empty by defaultBjörn Schießle2013-07-031-1/+1
| |
* | add public apiBjörn Schießle2013-07-031-0/+108
| |
* | move to non-static OC_DefaultsBjörn Schießle2013-07-033-58/+61
| |
* | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-032-9/+26
| |
* | 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
* | | introduce pre-disable-app hook and use it for the encryption app to reset ↵Björn Schießle2013-07-021-0/+1
| | | | | | | | | | | | migration status if the app was disabled
* | | Public upload featureRoman Geber2013-07-011-1/+1
| | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
* | | Merge pull request #3802 from owncloud/stable5_backport_oracle_fixesJörn Friedrich Dreyer2013-07-015-11/+39
|\ \ \ | |/ / |/| | backport oracle related changes, mostly comments, but also setup related...
| * | backport oracle related changes, mostly comments, but also setup related fixesJörn Friedrich Dreyer2013-06-205-11/+39
| | |
* | | Merge pull request #3863 from owncloud/improved_footerBjörn Schießle2013-07-012-34/+67
|\ \ \ | | | | | | | | Improved footer
| * | | set default logo claim to ''Björn Schießle2013-07-011-1/+1
| | | |
| * | | PHP Strict standards: Non-static method OC_Defaults::themeExist() should ↵Thomas Mueller2013-06-281-1/+1
| | | | | | | | | | | | | | | | not be called statically
| * | | add logo claim to defaults.phpBjörn Schießle2013-06-281-0/+9
| | | |
| * | | make mail footer aware of different themesBjörn Schießle2013-06-271-2/+2
| | | |
| * | | remove unneeded if conditionBjörn Schießle2013-06-271-5/+1
| | | |
| * | | lib/defaults.php should only contain the default strings and read the other ↵Björn Schießle2013-06-271-38/+44
| | | | | | | | | | | | | | | | strings directly from the theme
| * | | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-06-261-1/+23
| | | |
* | | | Squashed commit of the following:Thomas Müller2013-07-011-5/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 557df5cc5e62fab80125d1ea86f8ed56ad3b10cc Author: Thomas Mueller <thomas.mueller@tmit.eu> Date: Fri Jun 28 15:17:54 2013 +0200 session_life_time -> session_lifetime default session_lifetime is 24hrs recreation of session is triggered at 50% of the session life time Conflicts: lib/base.php commit fcd2e91459ef2ff41d9ca3d07e325c358ded091a Author: Thomas Mueller <thomas.mueller@tmit.eu> Date: Wed Jun 26 09:19:19 2013 +0200 session life time is now configurable and set to the same value Conflicts: lib/base.php
* / / Fix ugly error style on installMarkus Goetz2013-06-251-1/+1
|/ / | | | | | | | | | | By initializing the template engine first we can show the 'Can't write into config directory 'config'' error in a nice way instead of plain unstyled HTML.
* | remove deleted files when re-scanning a folderRobin Appelman2013-06-201-0/+14
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-13 05:34:06 +0000