Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-13 | 1 | -0/+3 |
| | |||||
* | Merge branch 'master' of github.com:owncloud/core into ↵ | Tom Needham | 2013-10-12 | 6 | -1/+92 |
|\ | | | | | | | fix-unlogged-session-error | ||||
| * | Merge pull request #5207 from owncloud/fixing-4011-part2-master | Thomas Müller | 2013-10-11 | 6 | -1/+92 |
| |\ | | | | | | | [OC6] file upload exception handling | ||||
| | * | fixing status code and formatting | Thomas Müller | 2013-10-08 | 2 | -18/+17 |
| | | | |||||
| | * | catch specific file exceptions and convert them to proper http status code ↵ | Thomas Müller | 2013-10-08 | 1 | -5/+12 |
| | | | | | | | | | | | | via webdav | ||||
| | * | adding additional exceptions for special cases where creating a file might ↵ | Thomas Müller | 2013-10-07 | 6 | -0/+85 |
| | | | | | | | | | | | | not be allowed | ||||
* | | | Include exception message in log entry when session fails to start | Tom Needham | 2013-10-12 | 1 | -1/+1 |
| | | | |||||
* | | | Handle ownCloud logging when data dir not created | Tom Needham | 2013-10-11 | 2 | -7/+7 |
| | | | |||||
* | | | Log the session exception when ownCloud is not installed | Tom Needham | 2013-10-11 | 1 | -3/+6 |
|/ / | |||||
* | | Merge pull request #5233 from owncloud/enc_filter_users | Björn Schießle | 2013-10-11 | 1 | -4/+4 |
|\ \ | | | | | | | only encrypt file to users with encryption keys | ||||
| * | | make sure that we only find file/folder shares | Bjoern Schiessle | 2013-10-09 | 1 | -4/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 2 | -0/+10 |
| | | | |||||
* | | | Merge pull request #5263 from owncloud/fixing-5255-master | VicDeo | 2013-10-10 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Proper behavior of resolvePath() | ||||
| * | | | 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() | ||||
* | | | | Merge pull request #4780 from AxelRb/master | Morris Jobke | 2013-10-10 | 1 | -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 statement | Axel Roenn | 2013-10-10 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Changed default behaviour to not log IP address in case of an auth failure. ↵ | Axel Roenn | 2013-09-10 | 1 | -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 Roenn | 2013-09-09 | 1 | -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-start | Robin Appelman | 2013-10-10 | 6 | -320/+10 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 3 | -312/+7 |
| |\ \ \ \ | | | | | | | | | | | | | fixing php 5.3 compatibility | ||||
| | * | | | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer | Thomas Müller | 2013-10-08 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | php 5.3 compatibility for \OC\Files\Storage | Thomas Müller | 2013-10-08 | 1 | -279/+0 |
| | | | | | | |||||
| | * | | | | fixing php 5.3 compatibility | Thomas Müller | 2013-10-08 | 1 | -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_fix | Björn Schießle | 2013-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | find users which are in the same group | ||||
| | * | | | | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-master | Frank Karlitschek | 2013-10-10 | 1 | -6/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | due to internal implementations touch will always be successful - $mtime... | ||||
| | * | | | | | | due to internal implementations touch will always be successful - $mtime ↵ | Thomas Müller | 2013-10-09 | 1 | -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 Appelman | 2013-10-09 | 1 | -1/+2 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | file_put_contents | ||||
* / / / / / | ensure the view's root is a subfolder of the the default root, not only ↵ | Robin Appelman | 2013-10-09 | 1 | -1/+4 |
|/ / / / / | | | | | | | | | | | | | | | | starting the same | ||||
* | | | | | Merge pull request #5219 from owncloud/catch_wrong_timezone | Björn Schießle | 2013-10-09 | 1 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | catch unknown timezone and fall-back to UTC | ||||
| * | | | | | changed default time format to ISO8601 | Bjoern Schiessle | 2013-10-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | catch unknown timezone and fall-back to UTC | Bjoern Schiessle | 2013-10-08 | 1 | -1/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5032 from owncloud/fixing-5006-master | Andreas Fischer | 2013-10-08 | 1 | -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 Fischer | 2013-10-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. | Andreas Fischer | 2013-10-08 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | | | | The user id has to be returned. | ||||
* | | | | | Merge pull request #5188 from owncloud/master-delete-user | Thomas Müller | 2013-10-08 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | User::delete should return bool | ||||
| * | | | | User::delete should return bool | Victor Dubiniuk | 2013-10-07 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #5173 from owncloud/set_timezone_for_log | Björn Schießle | 2013-10-08 | 1 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | let admin specify timezone for log file entries | ||||
| * | | | | | let admin specify timezone for log file entries | Bjoern Schiessle | 2013-10-07 | 1 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #5146 from guruz/cache_enabled_apps_list | Frank Karlitschek | 2013-10-08 | 1 | -3/+10 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | OC_App: Cache list of enabled apps | ||||
| * | | | | | OC_App: Cache list of enabled apps | Markus Goetz | 2013-10-05 | 1 | -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-master | Thomas Müller | 2013-10-08 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | adding check isDeletable() on $sourcePath | ||||
| * | | | | | | adding check isDeletable() on $sourcePath | Thomas Müller | 2013-10-08 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5193 from owncloud/fix_5126_2 | Björn Schießle | 2013-10-08 | 2 | -2/+27 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix upload to /Shared | ||||
| * | | | | | | | part file needs to have .part extension | Bjoern Schiessle | 2013-10-08 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | updating a existing large file creates new file chunks. Therefore ↵ | Bjoern Schiessle | 2013-10-08 | 1 | -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 Schiessle | 2013-10-08 | 1 | -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 transifex | Jenkins for ownCloud | 2013-10-08 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-master | Morris Jobke | 2013-10-07 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fixing broken chunked upload due to #4974 | ||||
| * | | | | | the path for reassembling was created the wrong way | Thomas Müller | 2013-10-07 | 1 | -2/+2 |
| | | | | | |