summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_jsblizzz2013-05-312-2/+8
|\
| * 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
|\ \
| * | LDAP: fix possible recursionArthur Schiwon2013-05-251-0/+7
| * | LDAP: fix handling when LDAP Host is offlineArthur Schiwon2013-05-251-3/+2
* | | Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fixFlorinPeter2013-05-312-0/+11
|\ \ \ | |_|/ |/| |
| * | 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-318-177/+194
| |\ \ | |/ / |/| |
* | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixesFlorinPeter2013-05-318-177/+194
|\ \ \
| * | | added our own file extension .part will not work here if we use file_get_cont...Florin Peter2013-05-302-5/+5
| * | | prevent files_versions from calling file proxy which calls files_encryption a...Florin Peter2013-05-301-0/+17
| * | | 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
| * | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3018-725/+767
| |\ \ \
| * | | | fixes for pgsqlFlorin Peter2013-05-291-4/+4
| * | | | changed deprecated classFlorin Peter2013-05-291-1/+1
| * | | | fixed typoFlorin Peter2013-05-291-1/+1
| * | | | fixes if cache returns falseFlorin Peter2013-05-291-6/+16
| * | | | fix $parent/$source typoFlorin Peter2013-05-291-2/+1
| * | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-29573-2123/+2248
| |\ \ \ \
| * | | | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| * | | | | fix indentionBjörn Schießle2013-05-291-5/+5
| * | | | | remove unnecessary variableBjörn Schießle2013-05-291-2/+1
| * | | | | use public API for error handling; improved while conditionBjörn Schießle2013-05-291-23/+20
| * | | | | for external storages we never reach the path 'files', instead we need to lea...Björn Schießle2013-05-291-1/+2
| * | | | | if one public link share was found, we don't have to check it for the other f...Björn Schießle2013-05-291-10/+12
| * | | | | check list of users with access to the file from the bottom to the top. This ...Björn Schießle2013-05-292-9/+15
| * | | | | 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-31552-1103/+1124
* | | | | LDAP: fix generation of alternate internal name on conflicts. Use also smalle...Arthur Schiwon2013-05-301-2/+2
* | | | | Merge pull request #3509 from owncloud/update_jquery_to_1_10Jörn Friedrich Dreyer2013-05-304-5/+10
|\ \ \ \ \
| * | | | | Update jquery to 1.10.0 & add jquery-migrate 1.2.1kondou2013-05-274-5/+10
* | | | | | Merge pull request #3529 from owncloud/folder-permissionsicewind19912013-05-304-12/+62
|\ \ \ \ \ \
| * | | | | | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846Michael Gapczynski2013-05-292-1/+31
| * | | | | | Only retrieve the current user's permissionsMichael Gapczynski2013-05-292-5/+6
| * | | | | | Cache: provide a function to get the permissions of all files in a folder wit...Robin Appelman2013-05-292-11/+30
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-30624-1663/+2479
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #3533 from owncloud/signature-delimiterThomas Tanghus2013-05-291-1/+1
|\ \ \ \ \ \
| * | | | | | fix wrong signature delimiter - fix #3523Morris Jobke2013-05-291-1/+1
* | | | | | | Merge pull request #3507 from owncloud/remove_unused_varsMorris Jobke2013-05-2916-722/+761
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | reformat codeFlorin Peter2013-05-292-16/+16
| * | | | | | changed " to 'Florin Peter2013-05-293-13/+13
| * | | | | | Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-292-23/+34
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3532 from owncloud/scan-updateMichael Gapczynski2013-05-291-6/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Organize conditionals in a better orderMichael Gapczynski2013-05-291-8/+4
| * | | | | | Only update metadata that has changedMichael Gapczynski2013-05-291-2/+9
* | | | | | | Merge pull request #3530 from owncloud/cache-mimeiconicewind19912013-05-291-17/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Style fixesMichael Gapczynski2013-05-291-21/+21
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 13:16:21 +0000