summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-032-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-024-0/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-0116-0/+54
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-3196-228/+92
|
* Merge pull request #17805 from owncloud/avatar-handle-errorsRoeland Douma2015-07-312-2/+34
|\ | | | | [avatar] add error handlers for avatar setup
| * [avatar] add error handlers for avatar setupMorris Jobke2015-07-302-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
* | Merge pull request #17994 from owncloud/server-statusRobin McCorkell2015-07-302-13/+14
|\ \ | |/ |/| correct order and capitalization of 'Server status' admin settings entry
| * correct order and capitalization of 'Server status' admin settings entry, ↵Jan-Christoph Borchardt2015-07-302-13/+14
| | | | | | | | fix #17395
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-306-2/+16
| |
* | [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
|/ | | | * fixes #17467
* Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchboxMorris Jobke2015-07-291-0/+4
|\ | | | | Trigger "apprendered" event in users page
| * 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.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2962-0/+70
| |
* | Merge pull request #17912 from owncloud/detect-old-openssl-versionsRobin McCorkell2015-07-282-2/+71
|\ \ | | | | | | 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
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-07-286-0/+36
|/
* 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.
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-268-4/+16
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-254-14/+24
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-2410-0/+24
|
* Merge pull request #17818 from ↵Roeland Douma2015-07-231-2/+2
|\ | | | | | | | | owncloud/fix-password-change-error-always-shows-default-error assign password change error message to correct object
| * assign error message to correct objectmichag862015-07-221-2/+2
| | | | | | fix for #17817
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-23116-266/+98
|/
* use arrow to indicate external link, use correct quotes and capitalizationJan-Christoph Borchardt2015-07-221-2/+2
|
* make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-221-4/+4
|
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-172-3/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-172-38/+38
|
* Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-161-0/+2
|\ | | | | Only clean up if migration finished succesfully
| * only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-081-0/+2
| |
* | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
| | | | | | | | | | | | * getApplication on OCSClient can also return null this is now handled properly * fixes #17587
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-114-2/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-102-16/+16
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-082-4/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-054-0/+28
|
* Remove OC_AppconfigThomas Müller2015-07-031-1/+1
|
* Remove OC_LogThomas Müller2015-07-031-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-036-2/+38
|
* Unit test for app listVincent Petry2015-07-021-0/+26
|
* Fix global app list stateVincent Petry2015-07-021-2/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-0210-8/+100
|
* 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