summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* reset mailadress/displayname on blurmichag862015-12-111-3/+5
|
* Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
| | | | | | | Steps to reproduce: * having an unknown language set in oc_preferences * browse the personal settings * only get listed the first letter of this language in the language chooser
* also don't count group members when more than 1 ldap configs are activeArthur Schiwon2015-08-261-1/+3
|
* Add option to disable autocomplete in share dialogMorris Jobke2015-08-172-0/+6
|
* Merge pull request #18064 from owncloud/import_root_certificates_8.1Thomas Müller2015-08-124-3/+54
|\ | | | | [stable8.1] disable "ssl root certificate" settings if user can't mount external storages
| * also block certificate management in the back-end if external storages are ↵Bjoern Schiessle2015-08-052-2/+35
| | | | | | | | disabled for the user
| * only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-052-1/+19
| | | | | | | | setting if the user can mount external storages
* | Merge pull request #17972 from owncloud/stable81-17969Thomas Müller2015-08-121-1/+4
|\ \ | |/ |/| [stable8.1] [admin settings] only retrieve log file size if file exists
| * [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
| | | | | | | | * fixes #17467
* | Merge pull request #18003 from owncloud/backport-17805-stable8.1Roeland Douma2015-07-312-2/+34
|\ \ | |/ |/| [stable8.1][avatar] add error handlers for avatar setup
| * [avatar] add error handlers for avatar setupMorris Jobke2015-07-312-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | add colon to translated string use placeholder in t() Adding a size limitation for avatar upload Unit test for file size Fix typo & display server side error message
* | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
| | | | | | | | | | This will properly update the controls bar width and display the search box initially.
* | Merge pull request #17935 from owncloud/detect-old-openssl-versions-stable81Thomas Müller2015-07-292-2/+71
|\ \ | | | | | | [stable8.1] Detect old NSS and OpenSSL versions
| * | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-282-2/+71
| | | | | | | | | | | | | | | | | | This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface. Fixes https://github.com/owncloud/core/issues/17901
* | | Add unit testsLukas Reschke2015-07-281-13/+25
| | |
* | | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ /
* | Merge pull request #17883 from owncloud/backport-17882Thomas Müller2015-07-272-4/+4
|\ \ | | | | | | [stable8.1] Allow classes in <h2> tags
| * | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
| |/ | | | | | | Previously something like `<h2 class="inlineblock"><?php p($l->t('Some title')) ?></h2>` was shown as `<h2 class="inlineblock">Some title` within the sidebar instead as `Some Title` due to the fact that the regex was catching these classes but was not properly running the string replace function.
* / assign error message to correct objectmichag862015-07-231-2/+2
|/ | | | fix for #17817
* make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-231-4/+4
|
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-172-3/+10
|
* only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-161-0/+2
|
* Handle returned null value in app level codeMorris Jobke2015-07-141-2/+2
| | | | | | * getApplication on OCSClient can also return null this is now handled properly * fixes #17587
* Fix global app list stateVincent Petry2015-07-022-2/+29
|
* Add missing version fieldLukas Reschke2015-06-291-2/+2
|
* Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-storeLukas Reschke2015-06-291-1/+1
|\ | | | | Send OC version to appstore so it can reply with the right links
| * Send OC version to appstore so it can reply with the right linksJoas Schilling2015-06-291-1/+1
| |
* | Merge pull request #17050 from owncloud/request-status-from-ocsLukas Reschke2015-06-291-0/+18
|\ \ | |/ |/| Request approved state for disabled apps with ocsid
| * Also load enabled appsLukas Reschke2015-06-291-0/+9
| |
| * Request approved state for disabled apps with ocsidLukas Reschke2015-06-191-0/+9
| | | | | | | | | | | | | | | | In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git. With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided. Fixes https://github.com/owncloud/core/issues/17003
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2914-2/+94
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2812-0/+40
| |
* | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-2715-8/+13
|\ \ | | | | | | Update license headers
| * | update license headers and authorsMorris Jobke2015-06-2515-8/+13
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2736-70/+14
| | |
* | | Merge pull request #17190 from owncloud/lock-changelabelThomas Müller2015-06-261-2/+2
|\ \ \ | | | | | | | | Rename experimental to transactional file locking
| * | | Rename experimental to transactional file lockingVincent Petry2015-06-261-2/+2
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-06-262-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2516-10/+52
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2460-76/+32
| |
* | Accept this language change at your own riskJoas Schilling2015-06-231-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-234-4/+30
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-222-2/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-214-4/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-202-2/+20
|/
* Merge pull request #16889 from owncloud/group-sorting-fixesJoas Schilling2015-06-194-10/+61
|\ | | | | Only sort by group name when LDAP is involved
| * Do not return backends but add a method to check for oneJoas Schilling2015-06-161-6/+4
| |
| * Only sort by group name when LDAP is involvedJoas Schilling2015-06-164-10/+49
| |
| * Always keep "Everyone" and "admin" at the top of the listJoas Schilling2015-06-161-0/+14
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1812-24/+94
| |