aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2131 from nextcloud/fix-tabs-in-translationRoeland Jago Douma2016-11-161-6/+10
|\
| * No HTML in stringRoeland Jago Douma2016-11-161-1/+10
| * convert text to single line so tabs in translation issue is fixedJan-Christoph Borchardt2016-11-161-6/+1
* | Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboardRoeland Jago Douma2016-11-161-10/+18
|\ \
| * | Fix tooltips - they now properly change on clickMorris Jobke2016-11-162-11/+19
| * | Adds copy tooltip to clipboardsRoeland Jago Douma2016-11-151-1/+1
* | | Merge pull request #719 from nextcloud/lockdownRoeland Jago Douma2016-11-163-12/+118
|\ \ \
| * | | dropdown uiRobin Appelman2016-11-163-24/+40
| * | | enable deleting/configuring new tokensRobin Appelman2016-11-163-4/+12
| * | | allow configuring filesystem accessRobin Appelman2016-11-163-5/+73
| * | | app password scope wipRobin Appelman2016-11-163-7/+21
| | |/ | |/|
* | | left-align social media buttons correctly on Personal page tooJan-Christoph Borchardt2016-11-161-1/+1
* | | Move social buttons to bottom on admin pageRoeland Jago Douma2016-11-162-1/+3
|/ /
* / Adjust previous fallbacksLukas Reschke2016-11-151-4/+4
|/
* Merge pull request #2093 from nextcloud/fix-single-author-with-detailsJoas Schilling2016-11-142-11/+33
|\
| * Fixes javascript tests for apps.jsRoeland Jago Douma2016-11-131-10/+21
| * Fix single author with detailsJoas Schilling2016-11-111-1/+12
* | [tx-robot] updated from transifexNextcloud bot2016-11-142-0/+6
* | [tx-robot] updated from transifexNextcloud bot2016-11-134-2/+6
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-1050-50/+8
* [tx-robot] updated from transifexNextcloud bot2016-11-0852-104/+104
* Merge pull request #2026 from nextcloud/setting_langMorris Jobke2016-11-074-56/+97
|\
| * Fix route and jsRoeland Jago Douma2016-11-063-56/+11
| * Add settings PersonalControllerRoeland Jago Douma2016-11-061-0/+86
* | [tx-robot] updated from transifexNextcloud bot2016-11-076-0/+18
* | [tx-robot] updated from transifexNextcloud bot2016-11-064-0/+12
|/
* Merge pull request #2021 from henrymohn/bug-1875_Password-HintMorris Jobke2016-11-051-11/+10
|\
| * Removed else statement preventing Success message from displaying causing bug...Henry Mohn2016-11-041-11/+10
* | [tx-robot] updated from transifexNextcloud bot2016-11-054-0/+14
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-044-4/+12
* Hide "Add group" for subadminsVincent Petry2016-11-031-0/+2
* Show a hint for system based cron user nameMorris Jobke2016-11-031-2/+15
* [tx-robot] updated from transifexNextcloud bot2016-11-0352-414/+414
* Merge pull request #1978 from nextcloud/remove-send-mail-optionMorris Jobke2016-11-021-5/+0
|\
| * remove 'send mail notification' option from sharing, replaced by send-by-mail...Bjoern Schiessle2016-11-021-5/+0
* | Merge pull request #1960 from nextcloud/adjust-link-to-contributing.mdRoeland Jago Douma2016-11-021-3/+2
|\ \
| * | Adjust link to contributing.mdJoas Schilling2016-11-021-3/+2
* | | Merge pull request #1940 from nextcloud/new-appstoreMichael Grosser2016-11-029-254/+233
|\ \ \ | |_|/ |/| |
| * | Proxy images through usercontent.apps.nextcloud.comLukas Reschke2016-10-312-5/+6
| * | Add update supportLukas Reschke2016-10-312-19/+28
| * | Query the timefactory instead of creating itLukas Reschke2016-10-311-2/+2
| * | Use new appstore APILukas Reschke2016-10-318-234/+203
* | | Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the...Roeland Jago Douma2016-11-022-4/+14
|\ \ \ | |_|/ |/| |
| * | Color the trusted domain to alert the admin a bit moreJoas Schilling2016-10-312-4/+14
| |/
* | [tx-robot] updated from transifexNextcloud bot2016-11-026-2/+34
* | [tx-robot] updated from transifexNextcloud bot2016-11-014-8/+44
|/
* [tx-robot] updated from transifexNextcloud bot2016-10-316-12/+18
* [tx-robot] updated from transifexNextcloud bot2016-10-304-0/+14
* Move away from OC_L10NRoeland Jago Douma2016-10-281-1/+1
* [tx-robot] updated from transifexNextcloud bot2016-10-2854-186/+304