summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1446 from nextcloud/fix-mail-designMorris Jobke2016-11-302-5/+4
|\
| * Fix minor mail issuesRoeland Jago Douma2016-11-302-2/+2
| * Fix mail header logo [fixes #1326]Felix Epp2016-11-301-3/+2
* | [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
* [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
|\
| * bring back setEmailAddress for the user managementBjoern Schiessle2016-11-252-3/+97
| * update email address correctlyBjoern Schiessle2016-11-231-8/+10
* | Loading icon fix #2198John Molakvoæ (skjnldsv)2016-11-242-5/+5
* | Merge pull request #2307 from nextcloud/better-filter-on-appstoreblizzz2016-11-241-0/+6
|\ \
| * | Also show updates on the "enabled" pageLukas Reschke2016-11-241-0/+6
| |/
* | Merge pull request #2224 from nextcloud/fix-visibility-switcherLukas Reschke2016-11-243-2/+3
|\ \ | |/ |/|
| * Make Christoph happierLukas Reschke2016-11-211-1/+1
| * Fix visibility switcher for avatarLukas Reschke2016-11-212-1/+2
* | Merge pull request #2239 from nextcloud/cleanup-settings-application-againJoas Schilling2016-11-231-136/+0
|\ \
| * | Clean up the Application class againJoas Schilling2016-11-221-136/+0
* | | Merge pull request #2250 from nextcloud/check-if-data-is-definedJoas Schilling2016-11-221-1/+1
|\ \ \
| * | | Check if data is definedLukas Reschke2016-11-221-1/+1
| |/ /
* / / Remove superfluous email input fieldLukas Reschke2016-11-221-28/+0
|/ /
* | Add SubAdminMiddleware backLukas Reschke2016-11-221-0/+2
* | Merge pull request #2228 from nextcloud/use-appid-instead-of-app-elementRoeland Jago Douma2016-11-221-1/+1
|\ \
| * | Use app ID instead of objectLukas Reschke2016-11-221-1/+1
* | | [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
|\ \
| * | Cast "isFeatured" to "featured"Lukas Reschke2016-11-211-0/+3
| |/
* / use date as device name if no name was givenBjoern Schiessle2016-11-211-1/+1
|/
* Merge pull request #2214 from nextcloud/remove-loggingRobin Appelman2016-11-212-145/+0
|\
| * remove old logging sectionRobin Appelman2016-11-212-145/+0
* | 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
* | Ask for password when scope is changedLukas Reschke2016-11-211-0/+8
* | Fix mail scopeLukas Reschke2016-11-211-1/+1
* | Highlight current entryLukas Reschke2016-11-212-4/+26
* | Make JS aware of password verificationLukas Reschke2016-11-212-0/+9
* | make icons a bit smallerJan-Christoph Borchardt2016-11-211-3/+3
* | fix menu positioning hackJan-Christoph Borchardt2016-11-212-2/+1
* | put explanatory text directly in popupJan-Christoph Borchardt2016-11-212-9/+17
* | Fix changing display names for subadminsLukas Reschke2016-11-211-2/+8
* | Adjust permission checksLukas Reschke2016-11-212-16/+10
* | Add a signer class for signingLukas Reschke2016-11-211-6/+12
* | fix unit testsBjoern Schiessle2016-11-211-2/+3
* | Fix password display issueRoeland Jago Douma2016-11-211-0/+2
* | rearrange input fieldsBjoern Schiessle2016-11-211-20/+19