summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | [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
|\ \ \ \ \
| * | | | | 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 publ...Jan-Christoph Borchardt2013-12-031-0/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #5931 from owncloud/fix-time-field-properlyThomas Müller2013-12-031-2/+2
|\ \ \ \ \
| * | | | | fix time input field properly, detailsJan-Christoph Borchardt2013-11-181-2/+2
* | | | | | Merge pull request #6153 from owncloud/extstorage-s3Vincent Petry2013-12-033-9/+12
|\ \ \ \ \ \
| * | | | | | Fixed test function for S3Vincent Petry2013-12-031-2/+4
| * | | | | | Fixed Amazon S3 ext storage config UIVincent Petry2013-12-032-6/+7
| * | | | | | Fixed placeholder after page reloadVincent Petry2013-12-031-1/+1
| | |/ / / / | |/| | | |
* | | | | | Revert "[fix] Center Share Dropdown & Versions Dropdown"zombiehugs2013-12-033-3/+3
* | | | | | [fix] Center Share Dropdown & Versions Dropdownzombiehugs2013-12-033-3/+3
* | | | | | request a bit more data for bug reportsFrank Karlitschek2013-12-031-1/+7
|/ / / / /
* | | | | Merge pull request #5929 from owncloud/code_check_onFrank Karlitschek2013-12-031-2/+1
|\ \ \ \ \
| * | | | | switch code checker on by default. apps are not allowed to access some of the...Frank Karlitschek2013-11-181-2/+1
| |/ / / /
* | | | | Merge pull request #6158 from owncloud/rmdir-checkThomas Müller2013-12-021-2/+6
|\ \ \ \ \
| * | | | | check if a directory exists before we try to remove itRobin Appelman2013-12-021-2/+6
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-02181-629/+791
* | | | | Merge pull request #6151 from owncloud/trash_fix_selectBjörn Schießle2013-12-025-40/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
|\ \ \ \ | |/ / / |/| | |