Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-10 | 471 | -5964/+4005 |
| | |||||
* | Merge pull request #5263 from owncloud/fixing-5255-master | VicDeo | 2013-10-10 | 2 | -1/+37 |
|\ | | | | | Proper behavior of resolvePath() | ||||
| * | the path need to be normalized before putting it into resolvePath() | Thomas Müller | 2013-10-10 | 2 | -1/+37 |
| | | | | | | | | 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 | 2 | -0/+10 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | Added the config option to log ip addresses , default false | Axel Roenn | 2013-10-09 | 1 | -0/+3 |
| | | | |||||
| * | | 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 pull request #5247 from owncloud/hooks-view-same-start | icewind1991 | 2013-10-10 | 2 | -1/+22 |
|\ \ \ | | | | | | | | | ensure the view's root is a subfolder of the the default root, not only ... | ||||
| * \ \ | merge master into hooks-view-same-start | Robin Appelman | 2013-10-10 | 9 | -323/+40 |
| |\ \ \ | |||||
| * | | | | ensure the view's root is a subfolder of the the default root, not only ↵ | Robin Appelman | 2013-10-09 | 2 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | starting the same | ||||
* | | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken | Morris Jobke | 2013-10-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed files view regular file actions in IE8 | ||||
| * | | | | | Fixed files view regular file actions in IE8 | Vincent Petry | 2013-10-10 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5256 A missing closing span broken the container in IE8 which prevented the file actions to be appended properly. | ||||
* | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 6 | -2/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix password screen for public shares | ||||
| * | | | | | Optimize confirm.[svg|png] with optipng and scour | kondou | 2013-10-08 | 2 | -63/+4 |
| | | | | | | |||||
| * | | | | | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 6 | -2/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998 | ||||
* | | | | | | Merge pull request #5244 from owncloud/more-css-fixes | Morris Jobke | 2013-10-10 | 5 | -2/+7 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | More css fixes | ||||
| * | | | | | fix web interface showing very small when accessed on smartphone | Jan-Christoph Borchardt | 2013-10-06 | 3 | -0/+3 |
| | | | | | | |||||
| * | | | | | properly indent contents of folders for app styles, to line up with text | Jan-Christoph Borchardt | 2013-10-06 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | improve clickability of footer link | Jan-Christoph Borchardt | 2013-10-06 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groups | blizzz | 2013-10-10 | 6 | -152/+107 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | LDAP: allow different UUID attributes for groups and users | ||||
| * | | | | | LDAP: allow different UUID attributes for groups and users | Arthur Schiwon | 2013-10-04 | 6 | -152/+107 |
| | | | | | | |||||
* | | | | | | Merge pull request #5221 from owncloud/fixing-5217-master | VicDeo | 2013-10-10 | 4 | -314/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 Test_Files_Sharing_Api | Thomas Müller | 2013-10-08 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | 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 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | find users which are in the same group | ||||
| * | | | | | | | find users which are in the same group | Bjoern Schiessle | 2013-10-08 | 2 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | 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 | ||||
* | | | | | | | | | Merge pull request #5245 from owncloud/file_put_contents-no-create | Frank Karlitschek | 2013-10-10 | 2 | -1/+27 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | don't trigger the create hooks when if the file already exists for file_put_contents | ||||
| * | | | | | | | | don't trigger the create hooks when if the file already exists for ↵ | Robin Appelman | 2013-10-09 | 2 | -1/+27 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | file_put_contents | ||||
* | | | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbroken | Vincent Petry | 2013-10-09 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | ||||
| * | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb | Vincent Petry | 2013-10-04 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some apps like the files_trashbin app do not set a directory on its "home" breadcrumb link. This fix makes sure that the click event doesn't do anything in that case and lets the browser open the link. This fixes the "home" icon in the trashbin app which now correctly reopens the files app. | ||||
* | | | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixes | Björn Schießle | 2013-10-09 | 3 | -149/+128 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Trashbin fixes | ||||
| * | | | | | | | | update file summary after group delete/restore | Bjoern Schiessle | 2013-10-09 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix checkbox | Bjoern Schiessle | 2013-10-09 | 1 | -37/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | fix indention | Bjoern Schiessle | 2013-10-09 | 1 | -99/+99 |
| | | | | | | | | | |||||
| * | | | | | | | | fix group delete/restore | Bjoern Schiessle | 2013-10-09 | 2 | -19/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | fix delete/restore individual files | Bjoern Schiessle | 2013-10-09 | 1 | -26/+23 |
| | | | | | | | | | |||||
| * | | | | | | | | fix trashbin layout | Bjoern Schiessle | 2013-10-09 | 1 | -0/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | 6.0 alpha 1 | Frank Karlitschek | 2013-10-09 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #5183 from owncloud/login-warningstyle | Vincent Petry | 2013-10-09 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed login warning style | ||||
| * | | | | | | | | | Fixed login warning style #5065 | Vincent Petry | 2013-10-09 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed bold so it takes less space and set alignment to left. | ||||
* | | | | | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixes | Thomas Müller | 2013-10-09 | 3 | -15/+40 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Various fixes for the streamwrapper based SMB backend | ||||
| * | | | | | | | | | extend test case | Robin Appelman | 2013-10-02 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix recursive delete for smb | Robin Appelman | 2013-10-01 | 1 | -0/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fix using touch to create a file for smb | Robin Appelman | 2013-10-01 | 1 | -12/+16 |
| | | | | | | | | | | |||||
| * | | | | | | | | | return the correct result when doing an smb rename | Robin Appelman | 2013-10-01 | 2 | -2/+9 |
| | | | | | | | | | |