summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-131-0/+3
|
* Merge branch 'master' of github.com:owncloud/core into ↵Tom Needham2013-10-126-1/+92
|\ | | | | | | fix-unlogged-session-error
| * Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-116-1/+92
| |\ | | | | | | [OC6] file upload exception handling
| | * fixing status code and formattingThomas Müller2013-10-082-18/+17
| | |
| | * catch specific file exceptions and convert them to proper http status code ↵Thomas Müller2013-10-081-5/+12
| | | | | | | | | | | | via webdav
| | * adding additional exceptions for special cases where creating a file might ↵Thomas Müller2013-10-076-0/+85
| | | | | | | | | | | | not be allowed
* | | Include exception message in log entry when session fails to startTom Needham2013-10-121-1/+1
| | |
* | | Handle ownCloud logging when data dir not createdTom Needham2013-10-112-7/+7
| | |
* | | Log the session exception when ownCloud is not installedTom Needham2013-10-111-3/+6
|/ /
* | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-111-4/+4
|\ \ | | | | | | only encrypt file to users with encryption keys
| * | make sure that we only find file/folder sharesBjoern Schiessle2013-10-091-4/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-102-0/+10
| | |
* | | Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-101-1/+3
|\ \ \ | | | | | | | | Proper behavior of resolvePath()
| * | | 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()
* | | | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+7
|\ \ \ \ | | | | | | | | | | On an auth failure the uid and the IP address should be logged to the st...
| * | | | changed the argument to false for getValue , reformated else statementAxel Roenn2013-10-101-3/+2
| | | | |
| * | | | Changed default behaviour to not log IP address in case of an auth failure. ↵Axel Roenn2013-09-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be configured in OC conf now. Log level changed to warning .
| * | | | On an auth failure the uid and the IP address should be logged to the ↵Axel Roenn2013-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standard log file. This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header instead of the remote address.
* | | | | merge master into hooks-view-same-startRobin Appelman2013-10-106-320/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-103-312/+7
| |\ \ \ \ | | | | | | | | | | | | fixing php 5.3 compatibility
| | * | | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainerThomas Müller2013-10-081-2/+3
| | | | | |
| | * | | | php 5.3 compatibility for \OC\Files\StorageThomas Müller2013-10-081-279/+0
| | | | | |
| | * | | | fixing php 5.3 compatibilityThomas Müller2013-10-081-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
| * | | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-101-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | find users which are in the same group
| | * | | | | find users which are in the same groupBjoern Schiessle2013-10-081-1/+1
| | | | | | |
| * | | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-masterFrank Karlitschek2013-10-101-6/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | due to internal implementations touch will always be successful - $mtime...
| | * | | | | | due to internal implementations touch will always be successful - $mtime ↵Thomas Müller2013-10-091-6/+0
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will be stored in the cache from desktop client perspective it is necessary to set the mtime under every condition
| * / | | | | don't trigger the create hooks when if the file already exists for ↵Robin Appelman2013-10-091-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | file_put_contents
* / / / / / ensure the view's root is a subfolder of the the default root, not only ↵Robin Appelman2013-10-091-1/+4
|/ / / / / | | | | | | | | | | | | | | | starting the same
* | | | | Merge pull request #5219 from owncloud/catch_wrong_timezoneBjörn Schießle2013-10-091-2/+6
|\ \ \ \ \ | | | | | | | | | | | | catch unknown timezone and fall-back to UTC
| * | | | | changed default time format to ISO8601Bjoern Schiessle2013-10-091-1/+1
| | | | | |
| * | | | | catch unknown timezone and fall-back to UTCBjoern Schiessle2013-10-081-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #5032 from owncloud/fixing-5006-masterAndreas Fischer2013-10-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. * owncloud/fixing-5006-master: Use strict comparison === instead of ==. Adjust return value tests for checkPassword() to what OC_User_Example says. Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. Use parent:: in Test_User_Database::getUser(). Test_User_Backend::getUser() does not return an array, it returns a string. Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
| * | | | | Use strict comparison === instead of ==.Andreas Fischer2013-10-081-1/+1
| | | | | |
| * | | | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.Andreas Fischer2013-10-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | The user id has to be returned.
* | | | | Merge pull request #5188 from owncloud/master-delete-userThomas Müller2013-10-081-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | User::delete should return bool
| * | | | User::delete should return boolVictor Dubiniuk2013-10-071-0/+4
| | | | |
* | | | | Merge pull request #5173 from owncloud/set_timezone_for_logBjörn Schießle2013-10-081-3/+5
|\ \ \ \ \ | | | | | | | | | | | | let admin specify timezone for log file entries
| * | | | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-071-3/+5
| | | | | |
* | | | | | Merge pull request #5146 from guruz/cache_enabled_apps_listFrank Karlitschek2013-10-081-3/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | OC_App: Cache list of enabled apps
| * | | | | OC_App: Cache list of enabled appsMarkus Goetz2013-10-051-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my test here 1 SELECT instead of 5 (when doing a DAV request, probably similar for other requests)
* | | | | | Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-081-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding check isDeletable() on $sourcePath
| * | | | | | adding check isDeletable() on $sourcePathThomas Müller2013-10-081-0/+3
| | | | | | |
* | | | | | | Merge pull request #5193 from owncloud/fix_5126_2Björn Schießle2013-10-082-2/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix upload to /Shared
| * | | | | | | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| | | | | | | |
| * | | | | | | updating a existing large file creates new file chunks. Therefore ↵Bjoern Schiessle2013-10-081-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
| * | | | | | | If a existing file in Shared/ with update permissions gets updated we need ↵Bjoern Schiessle2013-10-081-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | to write the .part file to a different place because we can't create new files in the Shared folder
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-081-0/+1
|/ / / / / /
* | | | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-masterMorris Jobke2013-10-071-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fixing broken chunked upload due to #4974
| * | | | | the path for reassembling was created the wrong wayThomas Müller2013-10-071-2/+2
| | | | | |