Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | adding backticks to satisfy Oracle | Thomas Müller | 2013-10-23 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | / / / | backport of https://github.com/owncloud/core/pull/5247 | Bjoern Schiessle | 2013-10-21 | 1 | -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 #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #5229 from owncloud/more-link-expiration-stable5 | Thomas Müller | 2013-10-16 | 1 | -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 Fischer | 2013-10-09 | 1 | -1/+12 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #5185 from owncloud/Update-feed | Thomas Müller | 2013-10-16 | 1 | -2/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | [stable5] Fixes for update feed fetching and parsing | |||||
| | * | | | | | Improve empty data check | Victor Dubiniuk | 2013-10-10 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Do not write current time before checking if cache is expired | Victor Dubiniuk | 2013-10-07 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | streamCopy() should return proper structure. | Thomas Müller | 2013-10-14 | 1 | -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_passwords | Björn Schießle | 2013-10-11 | 1 | -0/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | remove password before writing it to the log file | |||||
| | * | | | | | remove username/passswords from URLs before writing the to the log file | Bjoern Schiessle | 2013-10-08 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | let admin specify timezone for log file entries | Bjoern Schiessle | 2013-10-11 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from #5173 and #5219 | |||||
| * | | | | | | make sure that we only find file/folder shares | Bjoern Schiessle | 2013-10-11 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 1 | -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_stable5 | Björn Schießle | 2013-10-09 | 2 | -4/+18 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | | [stable5] fix upload to /Shared | |||||
| | * | | | | Backport of https://github.com/owncloud/core/pull/5193/ | Bjoern Schiessle | 2013-10-08 | 2 | -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-limit | Andreas Fischer | 2013-10-09 | 1 | -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 Fischer | 2013-10-08 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Merge pull request #5112 from owncloud/backport-4969-stable5 | Thomas Müller | 2013-10-08 | 1 | -0/+11 | |
| |\ \ \ | | |/ / | |/| | | [backport-stable5] adding privilege check on move and rename operations | |||||
| | * | | adding privilege check on move and rename operations | Thomas Müller | 2013-10-04 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/objecttree.php | |||||
| * | | | Merge pull request #5110 from owncloud/pg_install_db | Bart Visscher | 2013-10-04 | 1 | -1/+7 | |
| |\ \ \ | | |/ / | |/| | | postgresql connect with specify db if 'postgres' does not work | |||||
| | * | | Try connection with specified db when postgres does not work | Morris Jobke | 2013-10-04 | 1 | -1/+7 | |
| | |/ | ||||||
| * | | Merge pull request #5096 from owncloud/backport-4960-stable5 | Thomas Müller | 2013-10-04 | 2 | -2/+15 | |
| |\ \ | | |/ | |/| | Backport of #4960 to stable5 | |||||
| | * | duplicate code :sigh: - will fix this in a second pr | Thomas Müller | 2013-10-02 | 1 | -1/+8 | |
| | | | ||||||
| | * | adding file_exists check just to be on the save side | Thomas Müller | 2013-10-02 | 1 | -1/+2 | |
| | | | ||||||
| | * | handle error situation of rename proper | Thomas Müller | 2013-10-02 | 1 | -1/+6 | |
| | | | ||||||
| * | | 5.0.12v5.0.12 | Frank Karlitschek | 2013-10-03 | 1 | -2/+2 | |
| |/ | ||||||
| * | check every enabled app if the remember login feature needs to be disabled | Bjoern Schiessle | 2013-09-30 | 1 | -3/+13 | |
| | | ||||||
| * | introduce OC_Util::rememberLoginAllowed() | Bjoern Schiessle | 2013-09-30 | 2 | -3/+14 | |
| | | | | | | | | | | | | Conflicts: core/templates/login.php lib/util.php | |||||
| * | don't remember login if the encrypion app is enabled because the user | Bjoern Schiessle | 2013-09-30 | 2 | -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 Fischer | 2013-09-29 | 2 | -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 RC1 | Frank Karlitschek | 2013-09-27 | 1 | -2/+2 | |
| | ||||||
* | remove deleted files while scanning | Robin Appelman | 2013-09-23 | 1 | -0/+2 | |
| | ||||||
* | make sure that both $permissions and $oldPermissions have the same type | Bjoern Schiessle | 2013-09-23 | 1 | -1/+1 | |
| | ||||||
* | only remember password if the user changes the permissions, otherwise the ↵ | Bjoern Schiessle | 2013-09-23 | 1 | -3/+6 | |
| | | | | | | | user disabled the password protection Conflicts: lib/public/share.php | |||||
* | some is_resource tests have been missing in #4701 | Thomas Müller | 2013-09-13 | 2 | -17/+21 | |
| | ||||||
* | also emit hooks for views that are a subfolder of the user folder | Robin Appelman | 2013-09-10 | 1 | -32/+57 | |
| | ||||||
* | 5.0.11v5.0.11 | Frank Karlitschek | 2013-09-06 | 1 | -2/+2 | |
| | ||||||
* | remove some more debug output | Bjoern Schiessle | 2013-09-06 | 1 | -2/+0 | |
| | ||||||
* | Merge branch 'stable5' into fix_4533 | Bjoern Schiessle | 2013-09-06 | 11 | -50/+92 | |
|\ | ||||||
| * | 5.0.11 RC2 | Frank Karlitschek | 2013-09-01 | 1 | -2/+2 | |
| | | ||||||
| * | Merge pull request #4701 from owncloud/fix_4667 | blizzz | 2013-09-04 | 8 | -47/+70 | |
| |\ | | | | | | | Always check variable type before using readdir to avoid surprises, fixes #4667 #4658 and #4613 | |||||
| | * | one check is enough | Arthur Schiwon | 2013-09-04 | 1 | -7/+5 | |
| | | | ||||||
| | * | fix unknown var in if clause | Arthur Schiwon | 2013-09-02 | 1 | -1/+2 | |
| | | | ||||||
| | * | Check variable type before using readdir to avoid surprises and fix #4667 ↵ | Arthur Schiwon | 2013-09-02 | 8 | -52/+76 | |
| | | | | | | | | | | | | #4658 and #4613 | |||||
| * | | Merge pull request #4700 from owncloud/stable5_ocp_files_searchbymime | Bart Visscher | 2013-09-03 | 1 | -0/+10 | |
| |\ \ | | | | | | | | | Stable5 ocp files searchbymime | |||||
| | * | | add searchByMime to public api | Jörn Friedrich Dreyer | 2013-09-02 | 1 | -0/+10 | |
| | |/ | ||||||
| * / | backport autoloader magic trying to find class in lib folder | Jörn Friedrich Dreyer | 2013-09-02 | 1 | -1/+10 | |
| |/ | ||||||
* | | remove some error_logs | Bjoern Schiessle | 2013-09-05 | 1 | -1/+0 | |
| | | ||||||
* | | remove error logs | Bjoern Schiessle | 2013-09-05 | 1 | -2/+2 | |
| | |