summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-072-0/+14
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-063-1/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-053-0/+40
|
* Merge pull request #2061 from owncloud/app-textFrank Karlitschek2013-03-041-1/+1
|\ | | | | Add the description as text and not as html
| * Add the description as text and not as htmlLukas Reschke2013-03-041-1/+1
| |
* | Merge pull request #2060 from owncloud/escapeGroupnameFrank Karlitschek2013-03-041-5/+5
|\ \ | | | | | | Sanitize uid, group and quota
| * | Sanitize uid, group and quotaLukas Reschke2013-03-041-5/+5
| |/
* | Merge pull request #2059 from owncloud/getlogFrank Karlitschek2013-03-042-10/+3
|\ \ | | | | | | Add log as text and not as HTML
| * | Add log as text and not as HTMLLukas Reschke2013-03-032-10/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-03-042-0/+2
|/
* Fix encoding settings ajax getlogBart Visscher2013-03-031-1/+10
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-032-48/+50
|
* Merge pull request #2020 from owncloud/fixing-bugtracker-link-masterThomas Müller2013-03-021-1/+1
|\ | | | | change bug tracker links to https://github.com/owncloud/core/blob/master...
| * Merge branch 'master' into fixing-bugtracker-link-masterLukas Reschke2013-03-0110-296/+175
| |\ | | | | | | | | | | | | | | | Conflicts: core/templates/exception.php settings/templates/help.php
| * | change bug tracker links to ↵Thomas Mueller2013-03-011-1/+1
| | | | | | | | | | | | https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-024-0/+4
| | |
* | | Merge pull request #2019 from owncloud/fixing-languages-again-masterBart Visscher2013-03-011-1/+5
|\ \ \ | |_|/ |/| | some more new languages recently introduced to ownCloud
| * | some more new languages recently introduced to ownCloudThomas Mueller2013-03-011-1/+5
| |/
* | Merge masterLukas Reschke2013-03-019-0/+9
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-019-0/+9
| |
* | Merge masterLukas Reschke2013-02-283-0/+3
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-283-0/+3
| |
* | Remove uneeded OAuth filesLukas Reschke2013-02-272-121/+0
| |
* | [core] From echo to pLukas Reschke2013-02-279-177/+177
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-2722-21/+5
|
* Merge pull request #1958 from owncloud/fixing-1933-masterBjörn Schießle2013-02-271-1/+4
|\ | | | | the locale name is no longer part of the translation string
| * fixes 1933 - the locale name is no longer part of the translation stringThomas Mueller2013-02-271-1/+4
| |
* | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-2/+2
|\ \ | |/ |/| Sort after display name + LDAP server side sorting
| * sort users according to display nameArthur Schiwon2013-02-261-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-276-3/+37
|/
* Merge pull request #1885 from houqp/issue_1776Frank Karlitschek2013-02-261-1/+4
|\ | | | | when user changes displayName, also update it on expand button
| * Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-253-3/+7
| |\ | | | | | | | | | | | | Conflicts: core/templates/layout.user.php
| * | add span tag to displayname on expand buttonQingping Hou2013-02-251-3/+1
| | |
| * | update oldDisplayName value on displayName changeQingping Hou2013-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a bug that can be reproduced in following way: 1. change displayName 2. clear text in displayName input click change again Then you will get an error and previous displayName will be restored. Expected behavior should restore the new updated displayName.
| * | when user changes displayName, also update it on expand buttonQingping Hou2013-02-241-1/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-262-0/+52
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-252-1/+5
|/
* Merge pull request #1862 from owncloud/whitespace-cleanupThomas Müller2013-02-232-32/+32
|\ | | | | Whitespace cleanup
| * Whitespace fixesBart Visscher2013-02-222-32/+32
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-232-7/+18
|/
* Merge pull request #1855 from owncloud/userlist_load_displaynamesBernhard Posselt2013-02-222-6/+8
|\ | | | | Fetch displayname in userlist ajax requests. Refs #1681
| * Fetch displayname in userlist ajax requests. Refs #1681Thomas Tanghus2013-02-222-6/+8
| |
* | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-228-33/+60
|\ \ | |/ |/| Codestyle cleanup
| * Join split translated stringsBart Visscher2013-02-211-4/+1
| |
| * Style cleanup settingsBart Visscher2013-02-218-34/+64
| |
* | Merge pull request #1838 from owncloud/fix-changedisplayname-callThomas Müller2013-02-221-2/+2
|\ \ | | | | | | Fix error path in changedisplayname call
| * | Fix error path in changedisplayname callBart Visscher2013-02-221-2/+2
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2013-02-222-0/+7
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-214-9/+11
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-202-1/+33
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 01:53:43 +0000