summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-283-0/+3
* [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
|\
| * 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 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
|\
| * Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-253-3/+7
| |\
| * | add span tag to displayname on expand buttonQingping Hou2013-02-251-3/+1
| * | update oldDisplayName value on displayName changeQingping Hou2013-02-241-0/+1
| * | 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 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 #1681Thomas Tanghus2013-02-222-6/+8
* | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-228-33/+60
|\ \ | |/ |/|
| * 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 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
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-196-3/+76
* Do not set password if it has't providedVictor Dubiniuk2013-02-181-2/+2
* Correct new password input nameVictor Dubiniuk2013-02-181-1/+1
* Sanitize user inputLukas Reschke2013-02-181-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-186-1/+43
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-172-2/+18
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-161-0/+2
* Merge pull request #1694 from owncloud/users-headerblizzz2013-02-151-2/+8
|\
| * also fix header alignment for multiselect columnsJan-Christoph Borchardt2013-02-141-0/+1
| * fix Users settings header bar element positioning, close #1686Jan-Christoph Borchardt2013-02-141-2/+7
* | Merge pull request #1683 from owncloud/ie-fixesJan-Christoph Borchardt2013-02-151-1/+1
|\ \
| * | fix user delete button not showing in IE, another SVG replacement issueJan-Christoph Borchardt2013-02-141-1/+1
| |/
* | Merge pull request #1700 from owncloud/fixing-1680-masterJan-Christoph Borchardt2013-02-152-10/+31
|\ \
| * | sort languages based on display name not the iso codeThomas Mueller2013-02-141-9/+19
| * | some more missing language code fallbacksThomas Mueller2013-02-141-0/+6
| * | adding language code ocThomas Mueller2013-02-141-1/+2
| * | add some missing fallback language mappingsThomas Mueller2013-02-141-1/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-159-11/+196
* | | Merge pull request #1662 from owncloud/style-cleanupBart Visscher2013-02-141-4/+4
|\ \ \
| * | | Fix SpaceBeforeOpenBrace errorsBart Visscher2013-02-141-4/+4
| | |/ | |/|
* | | Merge pull request #1701 from owncloud/XSS-fixesLukas Reschke2013-02-141-2/+2
|\ \ \
| * | | Sanitize HTMLLukas Reschke2013-02-141-2/+2
| | |/ | |/|
* / | fixing javascript errors IE8 in apps managementThomas Mueller2013-02-141-1/+1
|/ /