summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-175-1/+18
* Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadc...Frank Karlitschek2013-12-172-11/+9
|\
| * always show home breadcrumb in files viewBjoern Schiessle2013-12-161-7/+5
| * always show 'Deleted Files' breadcrumbBjoern Schiessle2013-12-131-4/+4
* | Merge pull request #6183 from owncloud/enc_testsBjörn Schießle2013-12-163-20/+92
|\ \
| * | update file cache for target fileBjoern Schiessle2013-12-161-0/+9
| * | only remove encryption keys if a real file gets deleted, skip this method if ...Bjoern Schiessle2013-12-162-9/+67
| * | call set password hook because it doesn't get triggered during test execution...Bjoern Schiessle2013-12-161-3/+12
| * | enable more testsBjoern Schiessle2013-12-041-8/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-135-4/+40
* | | Merge pull request #6321 from sevoku/masterVincent Petry2013-12-131-1/+1
|\ \ \
| * | | fix smbclient directory listing parserVsevolod Kukol2013-12-111-1/+1
* | | | LDAP: fix method behind save button on advancend and expert tabs, fixes at le...Arthur Schiwon2013-12-131-5/+6
| |_|/ |/| |
* | | toggle select all checkboxBjoern Schiessle2013-12-121-0/+8
* | | LDAP: the browser shall not autofill userdn and password, usually login crede...Arthur Schiwon2013-12-121-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-114-1/+21
* | | Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfixVincent Petry2013-12-112-1/+124
|\ \ \ | |/ / |/| |
| * | Added unit test for sharing permissionsVincent Petry2013-12-101-0/+110
| * | Fixed sharing results to include the correct permissionsVincent Petry2013-12-091-1/+14
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-094-1/+37
|/ /
* | [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
|\ \
| * | 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_optionroot2013-12-061-1/+1
* | | | set unencrypted_size to 0 after decryption... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
| |/ / |/| |
* | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-061-2/+6
|\ \ \
| * | | get owner from share item, if we expire a share while the user updates his /S...Bjoern Schiessle2013-12-051-2/+6
| | |/ | |/|
* | | 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 use...Bjoern Schiessle2013-12-061-23/+28
* | | 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 initially...Arthur Schiwon2013-12-041-3/+54
* | | LDAP: on testing configuration, set active property to true, otherwise inacti...Arthur Schiwon2013-12-041-0/+2
* | | LDAP: set default value for login filter to empty, otherwise the wizard signa...Arthur Schiwon2013-12-041-1/+1
* | | LDAP Wizard: don't send ldap_tls change back to the interface as the element ...Arthur Schiwon2013-12-041-1/+0
* | | LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by ju...Arthur Schiwon2013-12-041-3/+10
* | | 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 binBjoern Schiessle2013-12-041-1/+6
* | Revert "Adjust files_encryption requirements to the new core requirement (PHP...Morris Jobke2013-12-041-1/+8
|/
* Merge pull request #5946 from owncloud/public-page-detailsVincent Petry2013-12-031-11/+18
|\
| * fix public page - gallery view issuesMorris Jobke2013-12-031-1/+1
| * fix trashbin and pbulic page controlsMorris Jobke2013-12-032-1/+5