summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-031-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-08-0312-0/+12
* Proof of concept #5593 - inline SVG icon for icon-contactsMarin Treselj2017-08-021-2/+2
* Merge pull request #5951 from nextcloud/use-public-methodMorris Jobke2017-08-021-8/+8
|\
| * Use public API instead of privateLukas Reschke2017-08-011-8/+8
* | [tx-robot] updated from transifexNextcloud bot2017-08-0236-36/+72
* | Remove explicit type hints for ControllerLukas Reschke2017-08-011-2/+2
|/
* Merge pull request #5877 from nextcloud/typehint_middlewareMorris Jobke2017-08-011-4/+5
|\
| * Fix middleware implementations signaturesRoeland Jago Douma2017-07-311-4/+5
* | Update server.phpJos Poortvliet2017-08-011-1/+1
* | Fix settings/Controller/Lukas Reschke2017-08-013-18/+23
* | Add |null to PHPDocLukas Reschke2017-08-011-1/+1
* | Return '0' instead of nullLukas Reschke2017-08-011-1/+1
* | Stricter phan config fixesLukas Reschke2017-08-012-9/+8
* | [tx-robot] updated from transifexNextcloud bot2017-08-012-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-312-0/+28
* [tx-robot] updated from transifexNextcloud bot2017-07-302-4/+56
* [tx-robot] updated from transifexNextcloud bot2017-07-294-4/+16
* Merge pull request #5895 from nextcloud/fix-password-changeMorris Jobke2017-07-271-1/+1
|\
| * Fix show password button for password changeMorris Jobke2017-07-261-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-07-272-0/+64
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-262-0/+36
* [tx-robot] updated from transifexNextcloud bot2017-07-256-2/+50
* Some app fixes of phpstorm inspectionsRoeland Jago Douma2017-07-243-5/+5
* [tx-robot] updated from transifexNextcloud bot2017-07-244-4/+184
* [tx-robot] updated from transifexNextcloud bot2017-07-232-6/+6
* [tx-robot] updated from transifexNextcloud bot2017-07-224-0/+8
* The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
* [tx-robot] updated from transifexNextcloud bot2017-07-2168-134/+74
* [tx-robot] updated from transifexNextcloud bot2017-07-2012-0/+24
* [tx-robot] updated from transifexNextcloud bot2017-07-1966-130/+130
* Merge pull request #5758 from nextcloud/comradekingu-patch-7Roeland Jago Douma2017-07-181-2/+2
|\
| * : BigversalAllan Nordhøy2017-07-181-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-184-6/+6
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-15132-4076/+4076
* this template file is no longer neededBjoern Schiessle2017-07-141-409/+0
* [tx-robot] updated from transifexNextcloud bot2017-07-146-48/+132
* [tx-robot] updated from transifexNextcloud bot2017-07-1310-56/+152
* [tx-robot] updated from transifexNextcloud bot2017-07-1294-1168/+1372
* Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
|\
| * Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
* | Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select...Morris Jobke2017-07-101-0/+1
|\ \
| * | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-101-0/+1
* | | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
* | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-101-1/+1
|\ \ \
| * | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-071-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-102-42/+42
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-07-096-6/+10
* | | [tx-robot] updated from transifexNextcloud bot2017-07-088-0/+8
|/ /
* | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-073-9/+27
|\ \