Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-01 | 6 | -1/+28 |
| | |||||
* | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js | blizzz | 2013-05-31 | 2 | -2/+8 |
|\ | | | | | Fix ldap sqlite n js | ||||
| * | LDAP: sqlite compatibility for emptyiing tables | Arthur Schiwon | 2013-05-31 | 1 | -1/+7 |
| | | |||||
| * | LDAP: fix setting value of checkbox after loading configuration | Arthur Schiwon | 2013-05-31 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling | blizzz | 2013-05-31 | 1 | -3/+9 |
|\ \ | | | | | | | Fix ldap offline host handling | ||||
| * | | 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 |
| | | | |||||
* | | | 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 | 7 | -142/+145 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes | FlorinPeter | 2013-05-31 | 7 | -142/+145 |
| |\ \ | | | | | | | | | File encryption external storage fixes | ||||
| | * | | added our own file extension .part will not work here if we use ↵ | Florin Peter | 2013-05-30 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | file_get_contents so we used our own extension '.etmp' | ||||
| | * | | prevent files_versions from calling file proxy which calls files_encryption ↵ | Florin Peter | 2013-05-30 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | and do unnecessary load and file operations | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | related to text editor with big text files | ||||
| | * | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 16 | -718/+757 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php | ||||
| | * | | | fixed typo | Florin Peter | 2013-05-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 11 | -34/+40 |
| | |\ \ \ | |||||
| | * | | | | fix for share folder on external storage | Florin Peter | 2013-05-29 | 2 | -2/+33 |
| | | | | | | |||||
| | * | | | | check list of users with access to the file from the bottom to the top. This ↵ | Björn Schießle | 2013-05-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages | ||||
| | * | | | | 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 | 6 | -0/+19 |
| | | | | | |||||
* | | | | | LDAP: fix generation of alternate internal name on conflicts. Use also ↵ | Arthur Schiwon | 2013-05-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | smaller number for better user experience on e.g. *DAV links | ||||
* | | | | | Merge pull request #3529 from owncloud/folder-permissions | icewind1991 | 2013-05-30 | 2 | -1/+31 |
|\ \ \ \ \ | | | | | | | | | | | | | Cache: provide a function to get the permissions of all files in a folder with one query | ||||
| * | | | | | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 | Michael Gapczynski | 2013-05-29 | 2 | -1/+31 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 13 | -18/+44 |
| |_|/ / |/| | | | |||||
* | | | | reformat code | Florin Peter | 2013-05-29 | 2 | -16/+16 |
| | | | | |||||
* | | | | changed " to ' | Florin Peter | 2013-05-29 | 3 | -13/+13 |
| | | | | |||||
* | | | | 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 |
| | | | | |||||
* | | | | changes after review | Florin Peter | 2013-05-29 | 1 | -1/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 11 | -39/+45 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/proxy.php apps/files_encryption/lib/session.php apps/files_encryption/lib/stream.php | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 3 | -2/+12 |
| | | | | |||||
| * | | | fixed missing convert to new session handler | Florin Peter | 2013-05-28 | 1 | -3/+2 |
| | | | | |||||
| * | | | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 5 | -11/+11 |
| | | | | |||||
| * | | | merge master into sessionclass | Robin Appelman | 2013-05-28 | 5 | -15/+70 |
| |\| | | |||||
| * | | | fix syntax error | Robin Appelman | 2013-05-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 4 | -20/+14 |
| | | | | |||||
* | | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 5 | -21/+71 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php | ||||
| * | | | fix for undefined index | Florin Peter | 2013-05-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 3 | -16/+55 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-28 | 2 | -1/+14 |
| |/ / | |||||
* | | | $_POST["adminEnableRecovery"] is a string | Björn Schießle | 2013-05-28 | 1 | -1/+1 |
| | | | |||||
* | | | changed to public log api | Florin Peter | 2013-05-27 | 4 | -16/+16 |
| | | | |||||
* | | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 9 | -58/+52 |
| | | | |||||
* | | | changed basic auth to test user | Florin Peter | 2013-05-27 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into remove_unused_vars | Björn Schießle | 2013-05-27 | 4 | -15/+13 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php | ||||
| * | | legacyBlockDecryprt() needs to be public | Björn Schießle | 2013-05-27 | 1 | -1/+1 |
| | | | |||||
| * | | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ↵ | Björn Schießle | 2013-05-27 | 4 | -6/+6 |
| | | | | | | | | | | | | classes | ||||
| * | | fix migration from old to new encryption | Björn Schießle | 2013-05-27 | 2 | -3/+1 |
| | | |