summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #6213 from owncloud/fix-full-name-editVincent Petry2013-12-061-1/+4
|\ \ \ \ \ \
| * | | | | | parent().parent() -> closest()Morris Jobke2013-12-061-1/+1
| * | | | | | Fix full name edit for repetive editMorris Jobke2013-12-051-1/+4
* | | | | | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-062-16/+27
|\ \ \ \ \ \ \
| * | | | | | | add a optional parameter to skip check for expired files, this is necessary t...Bjoern Schiessle2013-12-051-14/+21
| * | | | | | | get owner from share item, if we expire a share while the user updates his /S...Bjoern Schiessle2013-12-051-2/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #6211 from owncloud/fix-5865Morris Jobke2013-12-061-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Slide duration set to 200ms for multiselect (same duration as user menu)unknown2013-12-051-6/+7
| | |/ / / / / | |/| | | | |
* | | | | | | 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-0585-195/+219
|/ / / / / /
* | | | | | Revert "Merge pull request #6210 from owncloud/fix-5865"Morris Jobke2013-12-051-14/+13
* | | | | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
* | | | | | Merge pull request #6210 from owncloud/fix-5865pdessauw2013-12-051-13/+14
|\ \ \ \ \ \
| * | | | | | Changed duration of slideDown, slideUp and fadeOut to 200msunknown2013-12-051-13/+14
|/ / / / / /
* | | | | | Revert "Fix user's displayName being overwritten by (old) cookie"Morris Jobke2013-12-051-0/+1
* | | | | | Merge pull request #6199 from nicokaiser/fix-5306-masterMorris Jobke2013-12-051-1/+0
|\ \ \ \ \ \
| * | | | | | Fix user's displayName being overwritten by (old) cookieNico Kaiser2013-12-051-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6196 from owncloud/installation-error-cssMorris Jobke2013-12-051-5/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix appearance of error message - .errors is outdatedMorris Jobke2013-12-051-5/+6
|/ / / / /
* | | | | master is ownCloud 7 pre alpha nowFrank Karlitschek2013-12-051-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-04125-3427/+4557
* | | | | 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-042-3/+11
|\ \ \ \ | |/ / / |/| | |
| * | | config switch to disable auto expire for the trash binBjoern Schiessle2013-12-042-3/+11
* | | | Revert "Adjust files_encryption requirements to the new core requirement (PHP...Morris Jobke2013-12-041-1/+8
* | | | Merge pull request #6169 from owncloud/php_version_warningMorris Jobke2013-12-043-2/+25
|\ \ \ \ | |/ / / |/| | |
| * | | lower required php version to 5.3.3Frank Karlitschek2013-12-043-2/+25
* | | | Merge pull request #6168 from owncloud/extstorage-testtestmethodFrank Karlitschek2013-12-032-0/+15
|\ \ \ \
| * | | | Added unit test for the test() methodVincent Petry2013-12-032-0/+15
* | | | | Merge pull request #6076 from owncloud/fix-6073-masterThomas Müller2013-12-032-24/+43
|\ \ \ \ \
| * | | | | fixing PHPDoc and spellingThomas Mueller2013-12-022-6/+8
| * | | | | Use getLastError() everywhere.Andreas Fischer2013-11-281-10/+10
| * | | | | Add getLastError()Andreas Fischer2013-11-281-3/+20
| * | | | | No function as oci_last_error. It's oci_error.Andreas Fischer2013-11-281-1/+1
| * | | | | There is no property such as dbusername. It's 'dbuser'.Andreas Fischer2013-11-281-3/+3
| * | | | | Correct property name. It's 'dbpassword', with the 'db' prefix.Andreas Fischer2013-11-281-1/+1
| * | | | | Correct property name. It's just 'tableprefix', without the 'db' prefix.Andreas Fischer2013-11-281-1/+1
* | | | | | Merge pull request #5946 from owncloud/public-page-detailsVincent Petry2013-12-032-12/+26
|\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 06:45:05 +0000