summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* combineFilterWithAnd recently moved to Accessroot2013-12-081-3/+3
|
* add support for nested groupsroot2013-12-063-10/+73
|
* 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-0585-195/+219
|
* Revert "Merge pull request #6210 from owncloud/fix-5865"Morris Jobke2013-12-051-14/+13
| | | | | This reverts commit f12363d90b31e03a9f2e95911dda54af728a2df6, reversing changes made to eba35d28cd974507f9e81e15430d3d33dbbd9973.
* Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
| | | | This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973.
* Merge pull request #6210 from owncloud/fix-5865pdessauw2013-12-051-13/+14
|\ | | | | #5865 Multiselect animation is too slow patch
| * 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
| | | | This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b.
* Merge pull request #6199 from nicokaiser/fix-5306-masterMorris Jobke2013-12-051-1/+0
|\ | | | | Fix user's displayName being overwritten by (old) cookie. #3694
| * 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 outdated
| * 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 ↵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-042-3/+11
|\ | | | | config switch to disable auto expire for the trash bin
| * 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 ↵Morris Jobke2013-12-041-1/+8
| | | | | | | | | | | | (PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
* | Merge pull request #6169 from owncloud/php_version_warningMorris Jobke2013-12-043-2/+25
|\ \ | |/ |/| PHP version warning
| * 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() method of ext storage
| * | Added unit test for the test() methodVincent Petry2013-12-032-0/+15
| | | | | | | | | | | | This is to make sure that method isn't broken
* | | Merge pull request #6076 from owncloud/fix-6073-masterThomas Müller2013-12-032-24/+43
|\ \ \ | | | | | | | | Correct property name. It's just 'tableprefix', without the 'db' prefix.
| * | | 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
|\ \ \ \ | | | | | | | | | | Public page details
| * | | | fix public page - gallery view issuesMorris Jobke2013-12-032-3/+3
| | | | |
| * | | | 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
| | | | |
| * | | | account for shift of controls bar due to app navigation, do not shift on ↵Jan-Christoph Borchardt2013-12-031-0/+7
| | |_|/ | |/| | | | | | | | | | public page
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 02:36:55 +0000