Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1948 from owncloud/improve_user_sorting | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
|\ | | | | | Sort after display name + LDAP server side sorting | ||||
| * | sort users according to display name | Arthur Schiwon | 2013-02-26 | 1 | -2/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 6 | -3/+37 |
|/ | |||||
* | Merge pull request #1885 from houqp/issue_1776 | Frank Karlitschek | 2013-02-26 | 1 | -1/+4 |
|\ | | | | | when user changes displayName, also update it on expand button | ||||
| * | Merge branch 'master' of github.com:owncloud/core into issue_1776 | Qingping Hou | 2013-02-25 | 3 | -3/+7 |
| |\ | | | | | | | | | | | | | Conflicts: core/templates/layout.user.php | ||||
| * | | add span tag to displayname on expand button | Qingping Hou | 2013-02-25 | 1 | -3/+1 |
| | | | |||||
| * | | update oldDisplayName value on displayName change | Qingping Hou | 2013-02-24 | 1 | -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 button | Qingping Hou | 2013-02-24 | 1 | -1/+5 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-26 | 2 | -0/+52 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-25 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #1862 from owncloud/whitespace-cleanup | Thomas Müller | 2013-02-23 | 2 | -32/+32 |
|\ | | | | | Whitespace cleanup | ||||
| * | Whitespace fixes | Bart Visscher | 2013-02-22 | 2 | -32/+32 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-23 | 2 | -7/+18 |
|/ | |||||
* | Merge pull request #1855 from owncloud/userlist_load_displaynames | Bernhard Posselt | 2013-02-22 | 2 | -6/+8 |
|\ | | | | | Fetch displayname in userlist ajax requests. Refs #1681 | ||||
| * | Fetch displayname in userlist ajax requests. Refs #1681 | Thomas Tanghus | 2013-02-22 | 2 | -6/+8 |
| | | |||||
* | | Merge pull request #1711 from owncloud/style-cleanup | Jörn Friedrich Dreyer | 2013-02-22 | 8 | -33/+60 |
|\ \ | |/ |/| | Codestyle cleanup | ||||
| * | Join split translated strings | Bart Visscher | 2013-02-21 | 1 | -4/+1 |
| | | |||||
| * | Style cleanup settings | Bart Visscher | 2013-02-21 | 8 | -34/+64 |
| | | |||||
* | | Merge pull request #1838 from owncloud/fix-changedisplayname-call | Thomas Müller | 2013-02-22 | 1 | -2/+2 |
|\ \ | | | | | | | Fix error path in changedisplayname call | ||||
| * | | Fix error path in changedisplayname call | Bart Visscher | 2013-02-22 | 1 | -2/+2 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-22 | 2 | -0/+7 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-21 | 4 | -9/+11 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 2 | -1/+33 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-19 | 6 | -3/+76 |
| | |||||
* | Do not set password if it has't provided | Victor Dubiniuk | 2013-02-18 | 1 | -2/+2 |
| | |||||
* | Correct new password input name | Victor Dubiniuk | 2013-02-18 | 1 | -1/+1 |
| | |||||
* | Sanitize user input | Lukas Reschke | 2013-02-18 | 1 | -1/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-18 | 6 | -1/+43 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-17 | 2 | -2/+18 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-16 | 1 | -0/+2 |
| | |||||
* | Merge pull request #1694 from owncloud/users-header | blizzz | 2013-02-15 | 1 | -2/+8 |
|\ | | | | | Users header | ||||
| * | also fix header alignment for multiselect columns | Jan-Christoph Borchardt | 2013-02-14 | 1 | -0/+1 |
| | | |||||
| * | fix Users settings header bar element positioning, close #1686 | Jan-Christoph Borchardt | 2013-02-14 | 1 | -2/+7 |
| | | |||||
* | | Merge pull request #1683 from owncloud/ie-fixes | Jan-Christoph Borchardt | 2013-02-15 | 1 | -1/+1 |
|\ \ | | | | | | | IE fixes | ||||
| * | | fix user delete button not showing in IE, another SVG replacement issue | Jan-Christoph Borchardt | 2013-02-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1700 from owncloud/fixing-1680-master | Jan-Christoph Borchardt | 2013-02-15 | 2 | -10/+31 |
|\ \ | | | | | | | Fixing 1680 master | ||||
| * | | sort languages based on display name not the iso code | Thomas Mueller | 2013-02-14 | 1 | -9/+19 |
| | | | |||||
| * | | some more missing language code fallbacks | Thomas Mueller | 2013-02-14 | 1 | -0/+6 |
| | | | |||||
| * | | adding language code oc | Thomas Mueller | 2013-02-14 | 1 | -1/+2 |
| | | | |||||
| * | | add some missing fallback language mappings | Thomas Mueller | 2013-02-14 | 1 | -1/+5 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-15 | 9 | -11/+196 |
| | | | |||||
* | | | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Style cleanup | ||||
| * | | | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 1 | -4/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #1701 from owncloud/XSS-fixes | Lukas Reschke | 2013-02-14 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Sanitize HTML | ||||
| * | | | Sanitize HTML | Lukas Reschke | 2013-02-14 | 1 | -2/+2 |
| | |/ | |/| | |||||
* / | | fixing javascript errors IE8 in apps management | Thomas Mueller | 2013-02-14 | 1 | -1/+1 |
|/ / | |||||
* / | fixing javascript errors IE8 in user management | Thomas Mueller | 2013-02-14 | 1 | -3/+4 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-14 | 14 | -13/+264 |
| | |||||
* | missing piece after merge | Thomas Mueller | 2013-02-13 | 1 | -6/+0 |
| | |||||
* | Merge branch 'master' into fixing-1424-master | Thomas Mueller | 2013-02-13 | 61 | -755/+1221 |
|\ | | | | | | | | | Conflicts: settings/js/users.js |