summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-10471-5964/+4005
|
* Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-102-1/+37
|\ | | | | Proper behavior of resolvePath()
| * the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-102-1/+37
| | | | | | | | otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
* | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-102-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 statementAxel Roenn2013-10-101-3/+2
| | |
| * | Added the config option to log ip addresses , default falseAxel Roenn2013-10-091-0/+3
| | |
| * | 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 pull request #5247 from owncloud/hooks-view-same-starticewind19912013-10-102-1/+22
|\ \ \ | | | | | | | | ensure the view's root is a subfolder of the the default root, not only ...
| * \ \ merge master into hooks-view-same-startRobin Appelman2013-10-109-323/+40
| |\ \ \
| * | | | ensure the view's root is a subfolder of the the default root, not only ↵Robin Appelman2013-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | starting the same
* | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed files view regular file actions in IE8
| * | | | | Fixed files view regular file actions in IE8Vincent Petry2013-10-101-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-screenMorris Jobke2013-10-106-2/+40
|\ \ \ \ \ | | | | | | | | | | | | Fix password screen for public shares
| * | | | | Optimize confirm.[svg|png] with optipng and scourkondou2013-10-082-63/+4
| | | | | |
| * | | | | Fix password screen for public sharesMorris Jobke2013-10-076-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-fixesMorris Jobke2013-10-105-2/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | More css fixes
| * | | | | fix web interface showing very small when accessed on smartphoneJan-Christoph Borchardt2013-10-063-0/+3
| | | | | |
| * | | | | properly indent contents of folders for app styles, to line up with textJan-Christoph Borchardt2013-10-061-2/+2
| | | | | |
| * | | | | improve clickability of footer linkJan-Christoph Borchardt2013-10-061-0/+2
| | | | | |
* | | | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groupsblizzz2013-10-106-152/+107
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | LDAP: allow different UUID attributes for groups and users
| * | | | | LDAP: allow different UUID attributes for groups and usersArthur Schiwon2013-10-046-152/+107
| | | | | |
* | | | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-104-314/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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 Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
| | | | | | |
| * | | | | | 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-102-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | find users which are in the same group
| * | | | | | | find users which are in the same groupBjoern Schiessle2013-10-082-2/+2
| | | | | | | |
* | | | | | | | 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
* | | | | | | | | Merge pull request #5245 from owncloud/file_put_contents-no-createFrank Karlitschek2013-10-102-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 Appelman2013-10-092-1/+27
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | file_put_contents
* | | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumb
| * | | | | | | | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-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_fixesBjörn Schießle2013-10-093-149/+128
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Trashbin fixes
| * | | | | | | | update file summary after group delete/restoreBjoern Schiessle2013-10-091-0/+2
| | | | | | | | |
| * | | | | | | | fix checkboxBjoern Schiessle2013-10-091-37/+15
| | | | | | | | |
| * | | | | | | | fix indentionBjoern Schiessle2013-10-091-99/+99
| | | | | | | | |
| * | | | | | | | fix group delete/restoreBjoern Schiessle2013-10-092-19/+18
| | | | | | | | |
| * | | | | | | | fix delete/restore individual filesBjoern Schiessle2013-10-091-26/+23
| | | | | | | | |
| * | | | | | | | fix trashbin layoutBjoern Schiessle2013-10-091-0/+3
| | | | | | | | |
* | | | | | | | | 6.0 alpha 1Frank Karlitschek2013-10-091-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #5183 from owncloud/login-warningstyleVincent Petry2013-10-091-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed login warning style
| * | | | | | | | | Fixed login warning style #5065Vincent Petry2013-10-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed bold so it takes less space and set alignment to left.
* | | | | | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixesThomas Müller2013-10-093-15/+40
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Various fixes for the streamwrapper based SMB backend
| * | | | | | | | | extend test caseRobin Appelman2013-10-021-0/+1
| | | | | | | | | |
| * | | | | | | | | fix recursive delete for smbRobin Appelman2013-10-011-0/+8
| | | | | | | | | |
| * | | | | | | | | fix using touch to create a file for smbRobin Appelman2013-10-011-12/+16
| | | | | | | | | |
| * | | | | | | | | return the correct result when doing an smb renameRobin Appelman2013-10-012-2/+9
| | | | | | | | | |