summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2826-0/+112
|
* Merge pull request #15261 from owncloud/fix-14268-masterThomas Müller2015-03-272-38/+7
|\ | | | | use StreamResponse to download the log file
| * use StreamResponse to download the log file - fixes #14268Thomas Müller2015-03-272-38/+7
| |
* | Merge pull request #15259 from owncloud/fix-change-password-ie8Vincent Petry2015-03-272-1/+15
|\ \ | | | | | | Show label for password change in IE8
| * | Show label for password change in IE8Morris Jobke2015-03-272-1/+15
| | | | | | | | | | | | * fixes #10729
* | | Merge pull request #15258 from owncloud/users-addtofilteredgroupMorris Jobke2015-03-271-0/+4
|\ \ \ | | | | | | | | Don't append user in a filtered list if groups don't match
| * | | Don't append user in a filtered list if groups don't matchVincent Petry2015-03-271-0/+4
| |/ /
* | | Merge pull request #15225 from ↵Morris Jobke2015-03-271-0/+1
|\ \ \ | |_|/ |/| | | | | | | | owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure Add some generic default headers as well via PHP
| * | Add some generic default headers as well via PHPLukas Reschke2015-03-261-0/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2750-126/+310
| |/ |/|
* | Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9Jan-Christoph Borchardt2015-03-261-1/+7
|\ \ | | | | | | Don't use placeholder for password in IE8 & 9
| * | Don't use placeholder for password in IE8 & 9Morris Jobke2015-03-261-1/+7
| |/ | | | | | | | | | | | | | | | | * the placeholder is in IE 8 and 9 just set as text and styled a bit grey. If the form is then serialized without typing something in the placeholder is sent as value * this fixes that behaviour for the password field and properly detects empyt passwords * fixes #14912
* | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-264-0/+67
|\ \ | |/ |/| core part of encryption 2.0
| * implement basic encryption functionallity in core to enable multiple ↵Bjoern Schiessle2015-03-264-0/+67
| | | | | | | | encryption modules
* | Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricksThomas Müller2015-03-261-0/+1
|\ \ | | | | | | Add navigation entry for tips and tricks setion
| * | Add navigation entry for tips and tricks setionJoas Schilling2015-03-261-0/+1
| | |
* | | Merge pull request #15230 from owncloud/sqlite-noticeJan-Christoph Borchardt2015-03-261-11/+10
|\ \ \ | | | | | | | | move SQLite notice from warnings to tips & tricks
| * | | move SQLite notice from warnings to tips & tricksJan-Christoph Borchardt2015-03-261-11/+10
| | | |
* | | | Merge pull request #14958 from owncloud/dropdown-styleJan-Christoph Borchardt2015-03-261-1/+3
|\ \ \ \ | | | | | | | | | | popover style for apps and user dropdown menus
| * | | | fix accessibility of ownCloud logo and navigation entries, fix #15013gJan-Christoph Borchardt2015-03-261-1/+3
| | | | |
* | | | | Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-2635-119/+767
|\ \ \ \ \ | |_|_|/ / |/| | | | Updating .mailmap
| * | | | Update license headersJenkins for ownCloud2015-03-2635-119/+767
| | | | |
* | | | | Merge pull request #15212 from owncloud/log-widthMorris Jobke2015-03-263-3/+7
|\ \ \ \ \ | |/ / / / |/| | | | force log messages to break to alleviate horizontal scroll on Admin page
| * | | | force log messages to break to alleviate horizontal scroll on Admin pageJan-Christoph Borchardt2015-03-263-3/+7
| | |/ / | |/| |
* | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-261-1/+1
|\ \ \ \ | |/ / / |/| | | Add wrapper for Guzzle
| * | | Add wrapper for GuzzleLukas Reschke2015-03-251-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2670-70/+242
| |/ / |/| |
* | | only show connection checks results if there are errors, fix #11476Jan-Christoph Borchardt2015-03-253-10/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-25112-864/+108
| |
* | consolidate all admin warnings and notices into one sectionJan-Christoph Borchardt2015-03-243-97/+39
| |
* | Merge pull request #15127 from owncloud/admin-tips-jenkinsMorris Jobke2015-03-242-2/+21
|\ \ | | | | | | add Tips & tricks section to admin settings
| * | add Tips & tricks section to admin settingsJan-Christoph Borchardt2015-03-232-2/+21
| |/
* | Merge pull request #15149 from owncloud/fix-enable-for-groupJoas Schilling2015-03-241-1/+1
|\ \ | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable meth...
| * | Correctly get array of groups and send OCP\IGroup objects to enable methodJoas Schilling2015-03-241-1/+1
| | |
* | | Display a message when no apps can be found for this oc versionJoas Schilling2015-03-242-4/+15
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-24114-274/+122
| |
* | Merge pull request #15075 from owncloud/fix-15056-masterThomas Müller2015-03-231-1/+0
|\ \ | | | | | | remove unneeded status element from json response on /categories
| * | remove unneeded status element from json response on /categories - fixes 15056Thomas Müller2015-03-231-1/+0
| | |
* | | Merge pull request #15118 from owncloud/user-mgmt-groupsJan-Christoph Borchardt2015-03-231-0/+10
|\ \ \ | |/ / |/| | fix long group names overlapping in the sidebar, fix #12649
| * | fix long group names overlapping in the sidebar, fix #12649Jan-Christoph Borchardt2015-03-231-0/+10
| |/
* | Merge pull request #15107 from owncloud/user-mgmt-headerMorris Jobke2015-03-231-1/+9
|\ \ | | | | | | fix first user mgmt header jumping around, fix #8873
| * | fix first user mgmt header jumping around, fix #8873Jan-Christoph Borchardt2015-03-231-1/+9
| |/
* | fix capitalization in Personal settingsJan-Christoph Borchardt2015-03-231-3/+3
| |
* | link back to top on Personal page, fix #14519Jan-Christoph Borchardt2015-03-233-3/+8
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-236-2/+24
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2218-0/+64
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-2110-2/+44
|
* Merge pull request #14737 from owncloud/app-descriptions-collapsibleJan-Christoph Borchardt2015-03-203-16/+48
|\ | | | | collapse app descriptions by default, make expandable, fix #13112
| * collapse app descriptions by default, make expandable, fix #13112Jan-Christoph Borchardt2015-03-193-16/+48
| |
* | Merge pull request #15050 from owncloud/user-create-existsRobin McCorkell2015-03-201-0/+9
|\ \ | | | | | | show a better error message when trying to create a user that already exists
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 05:56:35 +0000