Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-07 | 65 | -81/+62 |
| | |||||
* | Merge pull request #6220 from owncloud/debug_oracle_errors | Björn Schießle | 2013-12-06 | 1 | -18/+21 |
|\ | | | | | cherry-picks from #5884, just for debugging purpose | ||||
| * | Don't try to encrypt a file when the temp file isn't created | Bart Visscher | 2013-12-06 | 1 | -18/+21 |
| | | |||||
* | | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode | blizzz | 2013-12-06 | 1 | -1/+1 |
|\ \ | | | | | | | correctly propagate the return value of ldap_set_option | ||||
| * | | correctly propagate the return value of ldap_set_option | root | 2013-12-06 | 1 | -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 Schiessle | 2013-12-06 | 1 | -1/+1 |
| |/ |/| | | | | | gets re-calculated if encryption was enabled again | ||||
* | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire | Björn Schießle | 2013-12-06 | 1 | -2/+6 |
|\ \ | | | | | | | Sharing etag propagation on expire | ||||
| * | | get owner from share item, if we expire a share while the user updates his ↵ | Bjoern Schiessle | 2013-12-05 | 1 | -2/+6 |
| | | | | | | | | | | | | /Shared folder than the owner is different from the currently logged in user | ||||
* | | | it is not possible to unshare files | Bjoern Schiessle | 2013-12-06 | 1 | -14/+5 |
| | | | |||||
* | | | fix typo | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | only create new key on password change if a recovery key exists or if the ↵ | Bjoern Schiessle | 2013-12-06 | 1 | -23/+28 |
| | | | | | | | | | | | | user don't have any private/public keys | ||||
* | | | show change password form if key couldn't be decrypted | Bjoern Schiessle | 2013-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | add method to check if users private/public key exists | Bjoern Schiessle | 2013-12-06 | 1 | -4/+13 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-05 | 1 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-04 | 5 | -0/+8 |
| | | | |||||
* | | | LDAP Wizard: don't generate filter when not allowed | Arthur Schiwon | 2013-12-04 | 1 | -1/+3 |
| | | | |||||
* | | | some equals are more equal than other equals | Arthur Schiwon | 2013-12-04 | 1 | -2/+2 |
| | | | |||||
* | | | LDAP Wizard: return correct var | Arthur Schiwon | 2013-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | LDAP Wizard: make sure auto-detected suggestions are really applied ↵ | Arthur Schiwon | 2013-12-04 | 1 | -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 Schiwon | 2013-12-04 | 1 | -0/+2 |
| | | | | | | | | | | | | inactive connections cannot be tested properly | ||||
* | | | LDAP: set default value for login filter to empty, otherwise the wizard ↵ | Arthur Schiwon | 2013-12-04 | 1 | -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 Schiwon | 2013-12-04 | 1 | -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 Schiwon | 2013-12-04 | 1 | -3/+10 |
| | | | | | | | | | | | | just opening the admin page | ||||
* | | | LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143 | Arthur Schiwon | 2013-12-04 | 1 | -0/+12 |
|/ / | |||||
* | | Merge pull request #6181 from owncloud/auto_expire_trash | Björn Schießle | 2013-12-04 | 1 | -1/+6 |
|\ \ | |/ |/| | config switch to disable auto expire for the trash bin | ||||
| * | config switch to disable auto expire for the trash bin | Bjoern Schiessle | 2013-12-04 | 1 | -1/+6 |
| | | |||||
* | | Revert "Adjust files_encryption requirements to the new core requirement ↵ | Morris Jobke | 2013-12-04 | 1 | -1/+8 |
|/ | | | | | | (PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd. | ||||
* | Merge pull request #5946 from owncloud/public-page-details | Vincent Petry | 2013-12-03 | 1 | -11/+18 |
|\ | | | | | Public page details | ||||
| * | fix public page - gallery view issues | Morris Jobke | 2013-12-03 | 1 | -1/+1 |
| | | |||||
| * | fix trashbin and pbulic page controls | Morris Jobke | 2013-12-03 | 2 | -1/+5 |
| | | |||||
| * | fix and cleanup CSS for public page | Morris Jobke | 2013-12-03 | 1 | -3/+2 |
| | | |||||
| * | change different shades of grey for public share page to white | Jan-Christoph Borchardt | 2013-12-03 | 1 | -10/+14 |
| | | |||||
| * | remove app specific code | Jan-Christoph Borchardt | 2013-12-03 | 1 | -4/+0 |
| | | |||||
| * | fix details for buttons in header and controls bar | Jan-Christoph Borchardt | 2013-12-03 | 1 | -1/+5 |
| | | |||||
* | | Fixed test function for S3 | Vincent Petry | 2013-12-03 | 1 | -2/+4 |
| | | | | | | | | Fixes #5752 | ||||
* | | Fixed Amazon S3 ext storage config UI | Vincent Petry | 2013-12-03 | 2 | -6/+7 |
| | | | | | | | | | | | | Optional parameters are now really optional Fixes #5861 | ||||
* | | Fixed placeholder after page reload | Vincent Petry | 2013-12-03 | 1 | -1/+1 |
|/ | | | | The placeholder somehow had too many characters stripping from it... | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-02 | 64 | -33/+124 |
| | |||||
* | make it possible to select folders | Bjoern Schiessle | 2013-12-02 | 5 | -40/+20 |
| | |||||
* | Merge pull request #6148 from owncloud/fix_trash_restore | Vincent Petry | 2013-12-02 | 4 | -18/+39 |
|\ | | | | | Fix restore anbd delete operations in trash bin | ||||
| * | check explicitely all possible dir values | Bjoern Schiessle | 2013-12-02 | 1 | -2/+3 |
| | | |||||
| * | set delete all to true if a complete folder was deleted | Bjoern Schiessle | 2013-12-02 | 1 | -1/+2 |
| | | |||||
| * | fix delete files from trash bin | Bjoern Schiessle | 2013-12-02 | 3 | -16/+34 |
| | | |||||
| * | fix restore from files in sub-folders | Bjoern Schiessle | 2013-11-29 | 2 | -2/+3 |
| | | |||||
* | | Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). | Andreas Fischer | 2013-11-29 | 1 | -8/+1 |
| | | |||||
* | | Merge pull request #6123 from owncloud/extstorage-deletedirs2 | Vincent Petry | 2013-11-29 | 3 | -7/+33 |
|\ \ | | | | | | | Fixed FTP and SMB to use rmdir() when deleting folders | ||||
| * | | Fixed FTP and SMB to use rmdir() when deleting folders | Vincent Petry | 2013-11-29 | 3 | -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 transifex | Jenkins for ownCloud | 2013-11-29 | 8 | -3/+23 |
| | | |||||
* | | Merge pull request #6111 from owncloud/non-floating-trash-button-chrome | Frank Karlitschek | 2013-11-29 | 1 | -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 Jobke | 2013-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | .update class fixes #6108 |