Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling | blizzz | 2013-05-31 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | LDAP: fix possible recursion | Arthur Schiwon | 2013-05-25 | 1 | -0/+7 | |
| * | | | | | | | | LDAP: fix handling when LDAP Host is offline | Arthur Schiwon | 2013-05-25 | 1 | -3/+2 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix | FlorinPeter | 2013-05-31 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | also fix login errors while filesystem is not loaded in app.php | Florin Peter | 2013-05-31 | 1 | -0/+6 | |
| * | | | | | | | Merge branch 'master' into files_encryption_fs_loaded_fix | Florin Peter | 2013-05-31 | 8 | -177/+194 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes | FlorinPeter | 2013-05-31 | 8 | -177/+194 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | added our own file extension .part will not work here if we use file_get_cont... | Florin Peter | 2013-05-30 | 2 | -5/+5 | |
| * | | | | | | | | prevent files_versions from calling file proxy which calls files_encryption a... | Florin Peter | 2013-05-30 | 1 | -0/+17 | |
| * | | | | | | | | fix share and un-share for single file | Florin Peter | 2013-05-30 | 1 | -23/+13 | |
| * | | | | | | | | fixed problems with file_get_contents and file_put_contents this problem was ... | Florin Peter | 2013-05-30 | 3 | -127/+92 | |
| * | | | | | | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 18 | -725/+767 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixes for pgsql | Florin Peter | 2013-05-29 | 1 | -4/+4 | |
| * | | | | | | | | | changed deprecated class | Florin Peter | 2013-05-29 | 1 | -1/+1 | |
| * | | | | | | | | | fixed typo | Florin Peter | 2013-05-29 | 1 | -1/+1 | |
| * | | | | | | | | | fixes if cache returns false | Florin Peter | 2013-05-29 | 1 | -6/+16 | |
| * | | | | | | | | | fix $parent/$source typo | Florin Peter | 2013-05-29 | 1 | -2/+1 | |
| * | | | | | | | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 573 | -2123/+2248 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix for share folder on external storage | Florin Peter | 2013-05-29 | 2 | -2/+33 | |
| * | | | | | | | | | | fix indention | Björn Schießle | 2013-05-29 | 1 | -5/+5 | |
| * | | | | | | | | | | remove unnecessary variable | Björn Schießle | 2013-05-29 | 1 | -2/+1 | |
| * | | | | | | | | | | use public API for error handling; improved while condition | Björn Schießle | 2013-05-29 | 1 | -23/+20 | |
| * | | | | | | | | | | for external storages we never reach the path 'files', instead we need to lea... | Björn Schießle | 2013-05-29 | 1 | -1/+2 | |
| * | | | | | | | | | | if one public link share was found, we don't have to check it for the other f... | Björn Schießle | 2013-05-29 | 1 | -10/+12 | |
| * | | | | | | | | | | check list of users with access to the file from the bottom to the top. This ... | Björn Schießle | 2013-05-29 | 2 | -9/+15 | |
| * | | | | | | | | | | fixed if fopen returns false typically on external storage | Florin Peter | 2013-05-28 | 1 | -1/+1 | |
| | | | * | | | | | | | fix login errors while filesystem is not loaded | Florin Peter | 2013-05-31 | 1 | -0/+5 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-31 | 552 | -1103/+1124 | |
* | | | | | | | | | | LDAP: fix generation of alternate internal name on conflicts. Use also smalle... | Arthur Schiwon | 2013-05-30 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #3509 from owncloud/update_jquery_to_1_10 | Jörn Friedrich Dreyer | 2013-05-30 | 4 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update jquery to 1.10.0 & add jquery-migrate 1.2.1 | kondou | 2013-05-27 | 4 | -5/+10 | |
* | | | | | | | | | | | Merge pull request #3529 from owncloud/folder-permissions | icewind1991 | 2013-05-30 | 4 | -12/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 | Michael Gapczynski | 2013-05-29 | 2 | -1/+31 | |
| * | | | | | | | | | | | Only retrieve the current user's permissions | Michael Gapczynski | 2013-05-29 | 2 | -5/+6 | |
| * | | | | | | | | | | | Cache: provide a function to get the permissions of all files in a folder wit... | Robin Appelman | 2013-05-29 | 2 | -11/+30 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 624 | -1663/+2479 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #3533 from owncloud/signature-delimiter | Thomas Tanghus | 2013-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix wrong signature delimiter - fix #3523 | Morris Jobke | 2013-05-29 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #3507 from owncloud/remove_unused_vars | Morris Jobke | 2013-05-29 | 16 | -722/+761 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | reformat code | Florin Peter | 2013-05-29 | 2 | -16/+16 | |
| * | | | | | | | | | | | changed " to ' | Florin Peter | 2013-05-29 | 3 | -13/+13 | |
| * | | | | | | | | | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 2 | -23/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3532 from owncloud/scan-update | Michael Gapczynski | 2013-05-29 | 1 | -6/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Organize conditionals in a better order | Michael Gapczynski | 2013-05-29 | 1 | -8/+4 | |
| * | | | | | | | | | | | Only update metadata that has changed | Michael Gapczynski | 2013-05-29 | 1 | -2/+9 | |
* | | | | | | | | | | | | Merge pull request #3530 from owncloud/cache-mimeicon | icewind1991 | 2013-05-29 | 1 | -17/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Style fixes | Michael Gapczynski | 2013-05-29 | 1 | -21/+21 | |
| * | | | | | | | | | | | Cache mimetype icons | Robin Appelman | 2013-05-29 | 1 | -7/+15 | |
|/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | changed l10n to full sentences | Florin Peter | 2013-05-29 | 1 | -14/+25 | |
| | * | | | | | | | | | changes l10n after review | Florin Peter | 2013-05-29 | 1 | -5/+5 |