summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-12-042-4/+4
|
* Merge pull request #2434 from nextcloud/app-list-growJohn Molakvoæ2016-12-031-4/+41
|\ | | | | dont grow items in the app list
| * use flex and specify rows to align everythingJohn Molakvoæ (skjnldsv)2016-12-031-4/+41
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * dont grow items in the app listRobin Appelman2016-12-011-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-12-03100-200/+44
| |
* | [tx-robot] updated from transifexNextcloud bot2016-12-022-0/+4
| |
* | Merge pull request #2423 from nextcloud/fix-language-namesLukas Reschke2016-12-012-67/+3
|\ \ | | | | | | Fix naming of languages
| * | LanguageMorris Jobke2016-11-302-67/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #2425 from nextcloud/show-real-apps-ratingRoeland Jago Douma2016-12-012-1/+3
|\ \ \ | | | | | | | | Show app store rating only for 5+ votes
| * | | Show app store rating only for 5+ votesMorris Jobke2016-11-302-1/+3
| |/ / | | | | | | | | | | | | | | | | | | * shows the rating of an app only if a given amount of ratings are given * fixes #2001 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / [tx-robot] updated from transifexNextcloud bot2016-12-016-0/+16
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-11-30122-1316/+234
| |
* | Fix password change in user managementMorris Jobke2016-11-301-0/+1
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-302-5/+4
|\ | | | | Fix mail design
| * Fix minor mail issuesRoeland Jago Douma2016-11-302-2/+2
| | | | | | | | | | | | | | * a nextcloud * Strong username & url Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix mail header logo [fixes #1326]Felix Epp2016-11-301-3/+2
| | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
* | [tx-robot] updated from transifexNextcloud bot2016-11-304-0/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-2948-46/+48
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-2990-3928/+3310
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-2934-34/+106
|
* Fix Regex for iPhone and add iPadLukas Reschke2016-11-281-2/+4
| | | | | | | | The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations. I also added a Regex for the iPad Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2016-11-286-0/+22
|
* [tx-robot] updated from transifexNextcloud bot2016-11-2710-2/+34
|
* [tx-robot] updated from transifexNextcloud bot2016-11-2634-136/+454
|
* Merge pull request #2276 from nextcloud/update-email-addressMorris Jobke2016-11-252-10/+106
|\ | | | | Update email address
| * bring back setEmailAddress for the user managementBjoern Schiessle2016-11-252-3/+97
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * update email address correctlyBjoern Schiessle2016-11-231-8/+10
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Loading icon fix #2198John Molakvoæ (skjnldsv)2016-11-242-5/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #2307 from nextcloud/better-filter-on-appstoreblizzz2016-11-241-0/+6
|\ \ | | | | | | Loop for newest version in appstore response
| * | Also show updates on the "enabled" pageLukas Reschke2016-11-241-0/+6
| |/ | | | | | | | | | | The enabled page doesn't pass through "getAppsForCategory" thus it also needs to have that special logic applied. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2224 from nextcloud/fix-visibility-switcherLukas Reschke2016-11-243-2/+3
|\ \ | |/ |/| Fix visibility switcher for avatar
| * Make Christoph happierLukas Reschke2016-11-211-1/+1
| | | | | | | | | | | | Apparently this failed for him as per https://github.com/nextcloud/server/pull/2224#issuecomment-262085537 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Fix visibility switcher for avatarLukas Reschke2016-11-212-1/+2
| | | | | | | | | | | | Fixes #2223 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2239 from nextcloud/cleanup-settings-application-againJoas Schilling2016-11-231-136/+0
|\ \ | | | | | | Cleanup settings application again
| * | Clean up the Application class againJoas Schilling2016-11-221-136/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2250 from nextcloud/check-if-data-is-definedJoas Schilling2016-11-221-1/+1
|\ \ \ | | | | | | | | Check if data is defined
| * | | Check if data is definedLukas Reschke2016-11-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise when adding a user as subadmin this would throw the following JS error: ``` users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605 ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / Remove superfluous email input fieldLukas Reschke2016-11-221-28/+0
|/ / | | | | | | | | | | | | | | That field is already there and looking at the code this seems to have been missed on a rebase. Fixes https://github.com/nextcloud/server/issues/2222 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Add SubAdminMiddleware backLukas Reschke2016-11-221-0/+2
| | | | | | | | | | | | Removed by mistake in #1946 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-elementRoeland Jago Douma2016-11-221-1/+1
|\ \ | | | | | | Use app ID instead of object
| * | Use app ID instead of objectLukas Reschke2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes several error messages when installing an app from the appstore, including: ``` Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663 Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661 Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81 trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628 ``` Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-2236-612/+614
|/ /
* | Merge pull request #2221 from nextcloud/from-is-featured-to-featuredLukas Reschke2016-11-211-0/+3
|\ \ | | | | | | Error log spam: Cast "isFeatured" to "featured"
| * | Cast "isFeatured" to "featured"Lukas Reschke2016-11-211-0/+3
| |/ | | | | | | | | | | | | | | | | | | The appstore returns a "isFeatured" in the current API revision. We need to cast this thus. Fixes the following error log message when opening the tab "Customization": > Undefined index: featured at /media/psf/stable9/settings/Controller/AppSettingsController.php#233 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / use date as device name if no name was givenBjoern Schiessle2016-11-211-1/+1
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #2214 from nextcloud/remove-loggingRobin Appelman2016-11-212-145/+0
|\ | | | | remove old logging section
| * remove old logging sectionRobin Appelman2016-11-212-145/+0
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | center checkmark to indicate that the setting was storedBjoern Schiessle2016-11-211-1/+1
| |
* | don't try to verify email address if no email address is setBjoern Schiessle2016-11-211-1/+1
| |
* | small fixesBjoern Schiessle2016-11-213-8/+7
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 06:06:33 +0000