]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoImplement hasUpdated() to watch for changes on Google Drive side
Michael Gapczynski [Fri, 31 May 2013 01:45:16 +0000 (21:45 -0400)]
Implement hasUpdated() to watch for changes on Google Drive side

11 years agoReturn null if file size is negative for WebDAV, fix #2013
Michael Gapczynski [Mon, 27 May 2013 15:35:31 +0000 (11:35 -0400)]
Return null if file size is negative for WebDAV, fix #2013

11 years agoFix require_once for 3rdparty in google ajax frontend
Michael Gapczynski [Sat, 18 May 2013 18:51:25 +0000 (14:51 -0400)]
Fix require_once for 3rdparty in google ajax frontend

11 years agoInclude 3rdparty Google Drive SDK 0.6.2
Michael Gapczynski [Fri, 17 May 2013 18:33:37 +0000 (14:33 -0400)]
Include 3rdparty Google Drive SDK 0.6.2

11 years agoFix constant in last commit
Michael Gapczynski [Fri, 17 May 2013 18:03:25 +0000 (14:03 -0400)]
Fix constant in last commit

11 years agoPrepare for #2013 fix
Michael Gapczynski [Fri, 17 May 2013 15:42:14 +0000 (11:42 -0400)]
Prepare for #2013 fix

11 years agoSetting Redirect URI is not required here
Michael Gapczynski [Fri, 17 May 2013 00:35:07 +0000 (20:35 -0400)]
Setting Redirect URI is not required here

11 years agoSwitch to using Google Drive SDK, closes #2047
Michael Gapczynski [Fri, 17 May 2013 00:09:32 +0000 (20:09 -0400)]
Switch to using Google Drive SDK, closes #2047

11 years agofix whitespacing
Thomas Müller [Fri, 2 Aug 2013 14:33:30 +0000 (16:33 +0200)]
fix whitespacing

11 years agoMake default language configurable via config.php
Lennart Rosam [Fri, 2 Aug 2013 07:41:31 +0000 (09:41 +0200)]
Make default language configurable via config.php

Conflicts:
config/config.sample.php

11 years agoUse old database methods for caclulateFolderSize
Michael Gapczynski [Fri, 2 Aug 2013 14:02:47 +0000 (10:02 -0400)]
Use old database methods for caclulateFolderSize

11 years agoUse query to calculate folder size
Michael Gapczynski [Mon, 29 Jul 2013 14:22:44 +0000 (10:22 -0400)]
Use query to calculate folder size

11 years agoFix calculating size for empty folders
Michael Gapczynski [Sun, 28 Jul 2013 20:14:49 +0000 (16:14 -0400)]
Fix calculating size for empty folders

Conflicts:
lib/files/cache/cache.php

11 years agouse fixed OC.Breadcrumb.push()
Jörn Friedrich Dreyer [Fri, 2 Aug 2013 09:44:53 +0000 (11:44 +0200)]
use fixed OC.Breadcrumb.push()

Conflicts:
core/js/js.js

11 years agoMerge pull request #4260 from owncloud/stable5_search_result_scrollbar
Jörn Friedrich Dreyer [Fri, 2 Aug 2013 09:55:43 +0000 (02:55 -0700)]
Merge pull request #4260 from owncloud/stable5_search_result_scrollbar

Stable5 search result scrollbar

11 years agoMerge pull request #4276 from owncloud/Respect-table-prefixes
Thomas Müller [Fri, 2 Aug 2013 07:28:08 +0000 (00:28 -0700)]
Merge pull request #4276 from owncloud/Respect-table-prefixes

[stable5] Skip non-oc tables on upgrade

11 years agoAdd a CLI script for manually triggering checking a folder for updates
Robin Appelman [Sun, 23 Jun 2013 15:49:38 +0000 (17:49 +0200)]
Add a CLI script for manually triggering checking a folder for updates

11 years agoalso adjust template properly for log date fix
Bernhard Posselt [Wed, 17 Apr 2013 13:31:05 +0000 (15:31 +0200)]
also adjust template properly for log date fix

11 years agofix admin log display and use a more readable format
Bernhard Posselt [Wed, 17 Apr 2013 12:05:51 +0000 (14:05 +0200)]
fix admin log display and use a more readable format

11 years agouse date and time instead of timestamp
Bernhard Posselt [Wed, 17 Apr 2013 10:24:18 +0000 (12:24 +0200)]
use date and time instead of timestamp

11 years agofix test and make warning translatable
Bjoern Schiessle [Thu, 1 Aug 2013 12:19:33 +0000 (14:19 +0200)]
fix test and make warning translatable

11 years agocancel sharing if some users doesn't have a working encryption set-up.
Bjoern Schiessle [Thu, 1 Aug 2013 11:04:55 +0000 (13:04 +0200)]
cancel sharing if some users doesn't have a working encryption set-up.

Conflicts:
lib/public/share.php

11 years agoUse prefixes while reading old Db structure
Victor Dubiniuk [Thu, 1 Aug 2013 13:42:37 +0000 (16:42 +0300)]
Use prefixes while reading old Db structure

11 years agoupdate css properties with px based values
Jörn Friedrich Dreyer [Wed, 31 Jul 2013 15:05:24 +0000 (17:05 +0200)]
update css properties with px based values

11 years agoadd overflow-y scroll and clean up indents
Jörn Friedrich Dreyer [Wed, 31 Jul 2013 14:52:53 +0000 (16:52 +0200)]
add overflow-y scroll and clean up indents

11 years agofixes #4026
Thomas Müller [Tue, 30 Jul 2013 08:26:42 +0000 (10:26 +0200)]
fixes #4026

11 years agoScanner test: ensure mtime in the cache is the same as on the storage to prevent...
Robin Appelman [Fri, 5 Jul 2013 12:51:22 +0000 (14:51 +0200)]
Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures

11 years agoreplace external storage status images with CSS, also use form to distinguish, fix...
Jan-Christoph Borchardt [Thu, 18 Jul 2013 21:00:04 +0000 (23:00 +0200)]
replace external storage status images with CSS, also use form to distinguish, fix #3910

11 years agoMerge pull request #4222 from owncloud/backport-3459-stable5
Kondou [Mon, 29 Jul 2013 13:59:44 +0000 (06:59 -0700)]
Merge pull request #4222 from owncloud/backport-3459-stable5

Backport 3459 stable5

11 years agomanual backport of changes related to #3459
Thomas Müller [Mon, 29 Jul 2013 08:00:17 +0000 (10:00 +0200)]
manual backport of changes related to #3459

11 years agoMove check so the variable will never be undefined
Michael Gapczynski [Sun, 28 Jul 2013 19:32:48 +0000 (15:32 -0400)]
Move  check so the variable will never be undefined

11 years agouse output buffering when including the irods libraries
Robin Appelman [Wed, 24 Jul 2013 14:10:14 +0000 (16:10 +0200)]
use output buffering when including the irods libraries

11 years agoShow generic error when there is no error
Victor Dubiniuk [Mon, 22 Jul 2013 18:02:18 +0000 (21:02 +0300)]
Show generic error when there is no error

11 years agoCreate an array entry before filling it
Victor Dubiniuk [Mon, 22 Jul 2013 18:02:56 +0000 (21:02 +0300)]
Create an array entry before filling it

11 years agoMerge pull request #4166 from owncloud/ext-fs-irods-stable5
Thomas Müller [Wed, 24 Jul 2013 11:48:08 +0000 (04:48 -0700)]
Merge pull request #4166 from owncloud/ext-fs-irods-stable5

Ext fs irods stable5

11 years agomark test as incomplete because I can't reproduce jenkins failure
Morris Jobke [Sun, 21 Jul 2013 09:28:06 +0000 (11:28 +0200)]
mark test as incomplete because I can't reproduce jenkins failure

11 years agoupdate to latest master
Thomas Mueller [Thu, 6 Jun 2013 21:28:08 +0000 (23:28 +0200)]
update to latest master

11 years agoRead configuratons for external filesystem test from a private place.
Thomas Mueller [Thu, 6 Jun 2013 22:04:46 +0000 (00:04 +0200)]
Read configuratons for external filesystem test from a private place.

This will help not to accidentially push private data and enable testing on our ci server.

11 years agofixing / adding comments
Thomas Müller [Tue, 16 Jul 2013 09:35:48 +0000 (11:35 +0200)]
fixing / adding comments

11 years agoupdate copy right
Thomas Müller [Fri, 12 Jul 2013 13:28:01 +0000 (15:28 +0200)]
update copy right

11 years ago update .gitignore
Thomas Müller [Fri, 12 Jul 2013 13:16:30 +0000 (15:16 +0200)]
 update .gitignore

11 years agoincorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
Thomas Müller [Fri, 12 Jul 2013 13:08:13 +0000 (15:08 +0200)]
incorporate development branch of  ssh://irodsguest@code.renci.org/gitroot/irodsphp

Conflicts:
.gitignore

11 years ago- implement touch() to at least create a file which doesn't exist
Thomas Mueller [Thu, 6 Jun 2013 21:20:39 +0000 (23:20 +0200)]
- implement touch() to at least create a file which doesn't exist
- implement a work around for folder mtimes - irods doesn't provide updated mtimes

11 years agoadding auth mode to ui and the url
Thomas Mueller [Fri, 26 Apr 2013 15:37:41 +0000 (17:37 +0200)]
adding auth mode to ui and the url

11 years agoadding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS
Thomas Mueller [Fri, 26 Apr 2013 15:05:10 +0000 (17:05 +0200)]
adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS

11 years agotest case for iRODS storage added
Thomas Mueller [Tue, 23 Apr 2013 21:19:11 +0000 (23:19 +0200)]
test case for iRODS storage added

11 years agocheckbox in settings ui
Thomas Mueller [Thu, 18 Apr 2013 20:20:52 +0000 (22:20 +0200)]
checkbox in settings ui

11 years agoin order to use the ownCloud login credentials we use a login hook to grab uid and...
Thomas Mueller [Thu, 18 Apr 2013 20:12:53 +0000 (22:12 +0200)]
in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session.
The stored credentials will be used for and interactions with the iRODS server.

Within the config UI a check box can be used to enable the credential reuse.

11 years agoinitial integration with iRODS www.irods.org
Thomas Mueller [Fri, 12 Apr 2013 13:51:58 +0000 (15:51 +0200)]
initial integration with iRODS www.irods.org
The used PHP API is hosted at https://code.renci.org/gf/project/irodsphp/

11 years agoreturn empty array instead of 0
Georg Ehrke [Mon, 15 Jul 2013 14:58:30 +0000 (16:58 +0200)]
return empty array instead of 0

11 years agoSquashed commit of the following:
Thomas Müller [Mon, 22 Jul 2013 11:08:59 +0000 (13:08 +0200)]
Squashed commit of the following:

commit 7e875ff47ae1a3e546c74fb12895b2bfbeedabdf
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Sun Jul 14 21:58:08 2013 +0200

    No admin option to enable public upload in case encryption is enabled
    No upload on pubic page if public upload is disabled

commit 4939d9a668c13cdd74e8bb8e305bdd7a59661c4d
Author: Thomas Mueller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 21:34:38 2013 +0200

    change anonymous to public

commit c3bda8654d911383ae0acf9e41adda7117cb79f8
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:51:01 2013 +0200

    fixing Undefined index: publicUploadEnabled

commit 98861afde443c12a2ef5290c83c63fd12b7b196d
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:05:58 2013 +0200

    in case the encryption app is enabled we cannot yet allow anonymous upload

commit 974f09629d0e8bf5d90cf8546fa4a82738ebdebe
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Jul 12 17:03:51 2013 +0200

    new admin setting added which allows to turn off anonymous uploads

11 years agoMerge pull request #4140 from sezuan/fix_wrong_found_http_code
Morris Jobke [Sun, 21 Jul 2013 08:33:47 +0000 (01:33 -0700)]
Merge pull request #4140 from sezuan/fix_wrong_found_http_code

changed HTTP FOUND code to the correct value 302

11 years agochanged HTTP FOUND code to the correct value 302
Matthias Rieber [Sat, 20 Jul 2013 17:08:51 +0000 (19:08 +0200)]
changed HTTP FOUND code to the correct value 302

11 years agodeactivate show password toggle for IE
Jan-Christoph Borchardt [Fri, 19 Jul 2013 13:17:28 +0000 (15:17 +0200)]
deactivate show password toggle for IE

Conflicts:

core/css/styles.css

11 years agoMerge pull request #3778 from owncloud/fix_3528
Bart Visscher [Fri, 19 Jul 2013 16:36:19 +0000 (09:36 -0700)]
Merge pull request #3778 from owncloud/fix_3528

LDAP: fix background job, resolves #3528

11 years agoBackport #3779, makes setuped backends are REALLY remembered and not instanciated...
shkdee [Tue, 18 Jun 2013 18:47:47 +0000 (21:47 +0300)]
Backport #3779, makes setuped backends are REALLY remembered and not instanciated many times

11 years agoMerge pull request #4072 from owncloud/non_ajax_upgrade_script
blizzz [Thu, 18 Jul 2013 20:31:57 +0000 (13:31 -0700)]
Merge pull request #4072 from owncloud/non_ajax_upgrade_script

non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 404...

11 years agoMerge pull request #4047 from owncloud/backport_3617
blizzz [Thu, 18 Jul 2013 20:30:07 +0000 (13:30 -0700)]
Merge pull request #4047 from owncloud/backport_3617

Backport 3963

11 years agofixing UNIX_TIMESTAMP() for mssql
Thomas Mueller [Wed, 17 Jul 2013 11:18:46 +0000 (13:18 +0200)]
fixing UNIX_TIMESTAMP() for mssql

Conflicts:
lib/db.php

11 years agoAdd message about completed update
Arthur Schiwon [Wed, 17 Jul 2013 15:32:43 +0000 (17:32 +0200)]
Add message about completed update

11 years agoAdjust to latest changes in PR #4047
Arthur Schiwon [Wed, 17 Jul 2013 15:30:47 +0000 (17:30 +0200)]
Adjust to latest changes in PR #4047

11 years agoRerename \OC\Updater to OC_Updater, fixes broken admin page
Arthur Schiwon [Wed, 17 Jul 2013 15:19:59 +0000 (17:19 +0200)]
Rerename \OC\Updater to OC_Updater, fixes broken admin page

11 years agoWebDAV Auth Connector: Check if already logged in
Markus Goetz [Fri, 12 Jul 2013 11:42:01 +0000 (13:42 +0200)]
WebDAV Auth Connector: Check if already logged in

11 years agoUse transifex.com on link to translations
rolandgeider [Sun, 14 Jul 2013 09:54:39 +0000 (11:54 +0200)]
Use transifex.com on link to translations
Conflicts:
settings/templates/personal.php

11 years agonon-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.
Arthur Schiwon [Mon, 15 Jul 2013 16:07:43 +0000 (18:07 +0200)]
non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.

11 years agoOnly emit permissions hook for files and and include path
Michael Gapczynski [Mon, 8 Jul 2013 21:28:18 +0000 (17:28 -0400)]
Only emit permissions hook for files and and include path

Conflicts:
lib/public/share.php

11 years ago5.0.9 v5.0.9
Frank Karlitschek [Sun, 14 Jul 2013 11:36:22 +0000 (13:36 +0200)]
5.0.9

11 years agoMerge pull request #4039 from owncloud/webdav_create_new_file
Thomas Müller [Sun, 14 Jul 2013 20:42:18 +0000 (13:42 -0700)]
Merge pull request #4039 from owncloud/webdav_create_new_file

[webdav client] if the file doesn't exists; create a new one

11 years agoMerge pull request #4044 from owncloud/more_ie8_fixes
Thomas Müller [Sun, 14 Jul 2013 20:10:46 +0000 (13:10 -0700)]
Merge pull request #4044 from owncloud/more_ie8_fixes

More ie8 fixes

11 years agoRemoved the preview warning. This is only a simple text change
Frank Karlitschek [Sat, 13 Jul 2013 11:28:22 +0000 (13:28 +0200)]
Removed the preview warning. This is only a simple text change

11 years agoStable5 adjustements (incl copy of lib/hooks/ from master) to make backport of #3963...
Arthur Schiwon [Fri, 12 Jul 2013 19:42:46 +0000 (21:42 +0200)]
Stable5 adjustements (incl copy of lib/hooks/ from master) to make backport of #3963 work

11 years agofix typo
Robin Appelman [Mon, 8 Jul 2013 19:13:23 +0000 (21:13 +0200)]
fix typo

11 years agobackport: Updater: pass update url as argument to update check
Robin Appelman [Sat, 6 Jul 2013 15:05:38 +0000 (17:05 +0200)]
backport: Updater: pass update url as argument to update check

Conflicts:
lib/updater.php

11 years agobackport: split upgrade logic from ajax file
Robin Appelman [Sat, 6 Jul 2013 15:00:00 +0000 (17:00 +0200)]
backport: split upgrade logic from ajax file

Conflicts:
core/ajax/update.php
lib/updater.php

11 years agoIE8 Show delete icon
Victor Dubiniuk [Fri, 12 Jul 2013 14:51:20 +0000 (17:51 +0300)]
IE8 Show delete icon

11 years agoSome styling to user list
Victor Dubiniuk [Fri, 12 Jul 2013 14:29:08 +0000 (17:29 +0300)]
Some styling to user list

11 years agoIe8 specific multiselect
Victor Dubiniuk [Fri, 12 Jul 2013 14:13:50 +0000 (17:13 +0300)]
Ie8 specific multiselect

11 years agoif the file doesn't exists; create a new one. We use this to create new text files...
Björn Schießle [Fri, 12 Jul 2013 11:25:37 +0000 (13:25 +0200)]
if the file doesn't exists; create a new one. We use this to create new text files in the web interface

11 years agoMerge pull request #3859 from owncloud/versioning_improved_expire_function
Björn Schießle [Fri, 12 Jul 2013 09:22:31 +0000 (02:22 -0700)]
Merge pull request #3859 from owncloud/versioning_improved_expire_function

call expire function before writing the new version to make sure to have...

11 years agoMerge pull request #3965 from dphi/fix_2846
Thomas Müller [Fri, 12 Jul 2013 09:00:14 +0000 (02:00 -0700)]
Merge pull request #3965 from dphi/fix_2846

speedup for propfinds on shared folders

11 years agoMerge pull request #4014 from owncloud/fixing-4005-stable5
Thomas Müller [Thu, 11 Jul 2013 21:00:31 +0000 (14:00 -0700)]
Merge pull request #4014 from owncloud/fixing-4005-stable5

EventSource and update fixes

11 years agoMerge pull request #3984 from owncloud/enable_oci_testing_stable5
Thomas Müller [Thu, 11 Jul 2013 09:40:17 +0000 (02:40 -0700)]
Merge pull request #3984 from owncloud/enable_oci_testing_stable5

Enable oci testing stable5

11 years agoupdate.php: remove event type 'error' as it's unused
Thomas Müller [Wed, 10 Jul 2013 22:26:40 +0000 (00:26 +0200)]
update.php: remove event type 'error' as it's unused
eventsource.js: fixing typos and JSDoc comment

11 years agomissing file
Thomas Müller [Wed, 10 Jul 2013 22:04:43 +0000 (00:04 +0200)]
missing file

11 years ago- eventsource.php: in case of potential CSRF attack we send an error message from...
Thomas Müller [Wed, 10 Jul 2013 22:00:01 +0000 (00:00 +0200)]
- eventsource.php: in case of potential CSRF attack we send an error message 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

11 years ago5.0.8 v5.0.8
Frank Karlitschek [Wed, 10 Jul 2013 06:54:03 +0000 (08:54 +0200)]
5.0.8

11 years agoFallback to border instead of box-shadow
Victor Dubiniuk [Tue, 2 Jul 2013 15:46:37 +0000 (18:46 +0300)]
Fallback to border instead of box-shadow

11 years agoFix lazy styles loading in IE8
Victor Dubiniuk [Tue, 2 Jul 2013 15:44:10 +0000 (18:44 +0300)]
Fix lazy styles loading in IE8

11 years agoenable oci in autotest.sh
Jörn Friedrich Dreyer [Tue, 9 Jul 2013 10:52:40 +0000 (12:52 +0200)]
enable oci in autotest.sh

11 years agoGoing from text to clob is not something we do.
Bart Visscher [Fri, 28 Jun 2013 14:07:22 +0000 (16:07 +0200)]
Going from text to clob is not something we do.

Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html

Conflicts:
tests/lib/dbschema.php

11 years agoMerge pull request #3893 from owncloud/backport_1872
Bart Visscher [Mon, 8 Jul 2013 18:28:33 +0000 (11:28 -0700)]
Merge pull request #3893 from owncloud/backport_1872

Backport #1872

11 years agoMerge pull request #3970 from owncloud/backport-3946-stable5
Thomas Müller [Mon, 8 Jul 2013 13:51:39 +0000 (06:51 -0700)]
Merge pull request #3970 from owncloud/backport-3946-stable5

Backport 3946 to stable5

11 years agoMerge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes
Jörn Friedrich Dreyer [Mon, 8 Jul 2013 10:43:21 +0000 (03:43 -0700)]
Merge pull request #3940 from owncloud/stable5_oracle_testsuite_fixes

Stable5 oracle testsuite fixes

11 years agoSquashed commit of the following:
Thomas Müller [Mon, 8 Jul 2013 09:55:22 +0000 (11:55 +0200)]
Squashed commit of the following:

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

11 years agoMerge https://github.com/owncloud/core/pull/3827
Björn Schießle [Mon, 8 Jul 2013 08:07:57 +0000 (10:07 +0200)]
Merge https://github.com/owncloud/core/pull/3827

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

11 years agoImplement getDirectoryPermissions() in Shared Permissions, fixes #2846
Michael Gapczynski [Wed, 29 May 2013 22:22:54 +0000 (18:22 -0400)]
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846

11 years agoOnly retrieve the current user's permissions
Michael Gapczynski [Wed, 29 May 2013 22:08:18 +0000 (18:08 -0400)]
Only retrieve the current user's permissions

11 years agoCache: provide a function to get the permissions of all files in a folder with one...
Robin Appelman [Wed, 29 May 2013 13:25:42 +0000 (15:25 +0200)]
Cache: provide a function to get the permissions of all files in a folder with one query

Conflicts:
lib/files/view.php

11 years ago5.0.8 RC
Frank Karlitschek [Fri, 5 Jul 2013 15:06:34 +0000 (17:06 +0200)]
5.0.8 RC

11 years agoBackport of #3951 to stable5
Thomas Müller [Fri, 5 Jul 2013 21:47:18 +0000 (23:47 +0200)]
Backport of #3951 to stable5

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