summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-016-1/+28
|
* Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
|\ | | | | Fix ldap sqlite n js
| * LDAP: sqlite compatibility for emptyiing tablesArthur Schiwon2013-05-311-1/+7
| |
| * LDAP: fix setting value of checkbox after loading configurationArthur Schiwon2013-05-311-1/+1
| |
* | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handlingblizzz2013-05-311-3/+9
|\ \ | | | | | | Fix ldap offline host handling
| * | LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| | |
| * | LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
| | |
* | | also fix login errors while filesystem is not loaded in app.phpFlorin Peter2013-05-311-0/+6
| | |
* | | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-317-142/+145
|\ \ \ | | |/ | |/|
| * | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixesFlorinPeter2013-05-317-142/+145
| |\ \ | | | | | | | | File encryption external storage fixes
| | * | added our own file extension .part will not work here if we use ↵Florin Peter2013-05-302-5/+5
| | | | | | | | | | | | | | | | file_get_contents so we used our own extension '.etmp'
| | * | prevent files_versions from calling file proxy which calls files_encryption ↵Florin Peter2013-05-301-0/+17
| | | | | | | | | | | | | | | | and do unnecessary load and file operations
| | * | fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
| | | |
| | * | fixed problems with file_get_contents and file_put_contents this problem was ↵Florin Peter2013-05-303-127/+92
| | | | | | | | | | | | | | | | related to text editor with big text files
| | * | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3016-718/+757
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php
| | * | | fixed typoFlorin Peter2013-05-291-1/+1
| | | | |
| | * | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-2911-34/+40
| | |\ \ \
| | * | | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| | | | | |
| | * | | | check list of users with access to the file from the bottom to the top. This ↵Björn Schießle2013-05-291-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 storageFlorin Peter2013-05-281-1/+1
| | | | | |
* | | | | | fix login errors while filesystem is not loadedFlorin Peter2013-05-311-0/+5
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-316-0/+19
| | | | |
* | | | | LDAP: fix generation of alternate internal name on conflicts. Use also ↵Arthur Schiwon2013-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | smaller number for better user experience on e.g. *DAV links
* | | | | Merge pull request #3529 from owncloud/folder-permissionsicewind19912013-05-302-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 #2846Michael Gapczynski2013-05-292-1/+31
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-3013-18/+44
| |_|/ / |/| | |
* | | | reformat codeFlorin Peter2013-05-292-16/+16
| | | |
* | | | changed " to 'Florin Peter2013-05-293-13/+13
| | | |
* | | | changed l10n to full sentencesFlorin Peter2013-05-291-14/+25
| | | |
* | | | changes l10n after reviewFlorin Peter2013-05-291-5/+5
| | | |
* | | | changes after reviewFlorin Peter2013-05-291-1/+5
| | | |
* | | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-2911-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 transifexJenkins for ownCloud2013-05-293-2/+12
| | | |
| * | | fixed missing convert to new session handlerFlorin Peter2013-05-281-3/+2
| | | |
| * | | fixed encryption session namespace to avoid problemsFlorin Peter2013-05-285-11/+11
| | | |
| * | | merge master into sessionclassRobin Appelman2013-05-285-15/+70
| |\| |
| * | | fix syntax errorRobin Appelman2013-05-281-1/+1
| | | |
| * | | Use the new session wrapperRobin Appelman2013-05-284-20/+14
| | | |
* | | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-285-21/+71
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php
| * | | fix for undefined indexFlorin Peter2013-05-281-1/+1
| | | |
| * | | fix for losing private key while being logged in and accessing a public linkFlorin Peter2013-05-283-16/+55
| | | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-282-1/+14
| |/ /
* | | $_POST["adminEnableRecovery"] is a stringBjörn Schießle2013-05-281-1/+1
| | |
* | | changed to public log apiFlorin Peter2013-05-274-16/+16
| | |
* | | replace == with === and replace != with !==Florin Peter2013-05-279-58/+52
| | |
* | | changed basic auth to test userFlorin Peter2013-05-271-3/+3
| | |
* | | Merge branch 'master' into remove_unused_varsBjörn Schießle2013-05-274-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 publicBjörn Schießle2013-05-271-1/+1
| | |
| * | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ↵Björn Schießle2013-05-274-6/+6
| | | | | | | | | | | | classes
| * | fix migration from old to new encryptionBjörn Schießle2013-05-272-3/+1
| | |