summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-0765-81/+62
|
* Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\ | | | | cherry-picks from #5884, just for debugging purpose
| * Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
| |
* | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncodeblizzz2013-12-061-1/+1
|\ \ | | | | | | correctly propagate the return value of ldap_set_option
| * | correctly propagate the return value of ldap_set_optionroot2013-12-061-1/+1
| | | | | | | | | | | | | | | | | | otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)
* | | set unencrypted_size to 0 after decryption... so that the unencrypted_size ↵Bjoern Schiessle2013-12-061-1/+1
| |/ |/| | | | | gets re-calculated if encryption was enabled again
* | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-061-2/+6
|\ \ | | | | | | Sharing etag propagation on expire
| * | get owner from share item, if we expire a share while the user updates his ↵Bjoern Schiessle2013-12-051-2/+6
| | | | | | | | | | | | /Shared folder than the owner is different from the currently logged in user
* | | it is not possible to unshare filesBjoern Schiessle2013-12-061-14/+5
| | |
* | | fix typoBjoern Schiessle2013-12-061-1/+1
| | |
* | | only create new key on password change if a recovery key exists or if the ↵Bjoern Schiessle2013-12-061-23/+28
| | | | | | | | | | | | user don't have any private/public keys
* | | show change password form if key couldn't be decryptedBjoern Schiessle2013-12-061-1/+1
| | |
* | | add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-051-0/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-045-0/+8
| | |
* | | LDAP Wizard: don't generate filter when not allowedArthur Schiwon2013-12-041-1/+3
| | |
* | | some equals are more equal than other equalsArthur Schiwon2013-12-041-2/+2
| | |
* | | LDAP Wizard: return correct varArthur Schiwon2013-12-041-1/+1
| | |
* | | LDAP Wizard: make sure auto-detected suggestions are really applied ↵Arthur Schiwon2013-12-041-3/+54
| | | | | | | | | | | | initially. Also make initial filter compilation and user counting robust against race conditions.
* | | LDAP: on testing configuration, set active property to true, otherwise ↵Arthur Schiwon2013-12-041-0/+2
| | | | | | | | | | | | inactive connections cannot be tested properly
* | | LDAP: set default value for login filter to empty, otherwise the wizard ↵Arthur Schiwon2013-12-041-1/+1
| | | | | | | | | | | | signals completed configuration too early when it might be not correct, i.e. login won't work
* | | LDAP Wizard: don't send ldap_tls change back to the interface as the element ↵Arthur Schiwon2013-12-041-1/+0
| | | | | | | | | | | | was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner
* | | LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by ↵Arthur Schiwon2013-12-041-3/+10
| | | | | | | | | | | | just opening the admin page
* | | LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143Arthur Schiwon2013-12-041-0/+12
|/ /
* | Merge pull request #6181 from owncloud/auto_expire_trashBjörn Schießle2013-12-041-1/+6
|\ \ | |/ |/| config switch to disable auto expire for the trash bin
| * config switch to disable auto expire for the trash binBjoern Schiessle2013-12-041-1/+6
| |
* | Revert "Adjust files_encryption requirements to the new core requirement ↵Morris Jobke2013-12-041-1/+8
|/ | | | | | (PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
* Merge pull request #5946 from owncloud/public-page-detailsVincent Petry2013-12-031-11/+18
|\ | | | | Public page details
| * fix public page - gallery view issuesMorris Jobke2013-12-031-1/+1
| |
| * fix trashbin and pbulic page controlsMorris Jobke2013-12-032-1/+5
| |
| * fix and cleanup CSS for public pageMorris Jobke2013-12-031-3/+2
| |
| * change different shades of grey for public share page to whiteJan-Christoph Borchardt2013-12-031-10/+14
| |
| * remove app specific codeJan-Christoph Borchardt2013-12-031-4/+0
| |
| * fix details for buttons in header and controls barJan-Christoph Borchardt2013-12-031-1/+5
| |
* | Fixed test function for S3Vincent Petry2013-12-031-2/+4
| | | | | | | | Fixes #5752
* | Fixed Amazon S3 ext storage config UIVincent Petry2013-12-032-6/+7
| | | | | | | | | | | | Optional parameters are now really optional Fixes #5861
* | Fixed placeholder after page reloadVincent Petry2013-12-031-1/+1
|/ | | | The placeholder somehow had too many characters stripping from it...
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-0264-33/+124
|
* make it possible to select foldersBjoern Schiessle2013-12-025-40/+20
|
* Merge pull request #6148 from owncloud/fix_trash_restoreVincent Petry2013-12-024-18/+39
|\ | | | | Fix restore anbd delete operations in trash bin
| * check explicitely all possible dir valuesBjoern Schiessle2013-12-021-2/+3
| |
| * set delete all to true if a complete folder was deletedBjoern Schiessle2013-12-021-1/+2
| |
| * fix delete files from trash binBjoern Schiessle2013-12-023-16/+34
| |
| * fix restore from files in sub-foldersBjoern Schiessle2013-11-292-2/+3
| |
* | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).Andreas Fischer2013-11-291-8/+1
| |
* | Merge pull request #6123 from owncloud/extstorage-deletedirs2Vincent Petry2013-11-293-7/+33
|\ \ | | | | | | Fixed FTP and SMB to use rmdir() when deleting folders
| * | Fixed FTP and SMB to use rmdir() when deleting foldersVincent Petry2013-11-293-7/+33
| |/ | | | | | | | | | | | | | | | | | | | | Some storages need to use different calls for deleting files or folders, usually unlink() and rmdir(). Fixes #4532 (SMB dir deletion) Fixes #5941 (FTP dir deletion) Note that the extra is_dir() should be fast because it's read from the stat cache.
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-298-3/+23
| |
* | Merge pull request #6111 from owncloud/non-floating-trash-button-chromeFrank Karlitschek2013-11-291-1/+1
|\ \ | |/ |/| Fix resize issue for trash button in chrome and overflowing spinner in ....
| * Fix resize issue for trash button in chrome and overflowing spinner in ↵Morris Jobke2013-11-281-1/+1
| | | | | | | | | | | | .update class fixes #6108