summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
* block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
* Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-115-37/+11
|\
| * don't cache if the encryption is enabled, this can lead to problems during un...Bjoern Schiessle2013-10-101-27/+1
| * make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| * make sure that we only find file/folder sharesBjoern Schiessle2013-10-091-4/+4
| * only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-10471-5964/+4005
* | Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-102-1/+37
|\ \
| * | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-102-1/+37
* | | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-102-0/+10
|\ \ \
| * | | 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. C...Axel Roenn2013-09-101-2/+8
| * | | On an auth failure the uid and the IP address should be logged to the standar...Axel Roenn2013-09-091-0/+2
* | | | Merge pull request #5247 from owncloud/hooks-view-same-starticewind19912013-10-102-1/+22
|\ \ \ \
| * \ \ \ 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 start...Robin Appelman2013-10-092-1/+22
* | | | | | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed files view regular file actions in IE8Vincent Petry2013-10-101-1/+1
| |/ / / / /
* | | | | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-106-2/+40
|\ \ \ \ \ \
| * | | | | | Optimize confirm.[svg|png] with optipng and scourkondou2013-10-082-63/+4
| * | | | | | Fix password screen for public sharesMorris Jobke2013-10-076-2/+99
* | | | | | | Merge pull request #5244 from owncloud/more-css-fixesMorris Jobke2013-10-105-2/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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 usersArthur Schiwon2013-10-046-152/+107
* | | | | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-104-314/+11
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-102-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 will...Thomas Müller2013-10-091-6/+0
* | | | | | | | | | 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_c...Robin Appelman2013-10-092-1/+27
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
* | | | | | | | | | Merge pull request #5230 from owncloud/trashbin_fixesBjörn Schießle2013-10-093-149/+128
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 20:07:06 +0000