Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2061 from owncloud/app-text | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
|\ | | | | | Add the description as text and not as html | ||||
| * | Add the description as text and not as html | Lukas Reschke | 2013-03-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2060 from owncloud/escapeGroupname | Frank Karlitschek | 2013-03-04 | 1 | -5/+5 |
|\ \ | | | | | | | Sanitize uid, group and quota | ||||
| * | | Sanitize uid, group and quota | Lukas Reschke | 2013-03-04 | 1 | -5/+5 |
| |/ | |||||
* / | Add log as text and not as HTML | Lukas Reschke | 2013-03-03 | 1 | -1/+1 |
|/ | |||||
* | sort users according to display name | Arthur Schiwon | 2013-02-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:owncloud/core into issue_1776 | Qingping Hou | 2013-02-25 | 1 | -2/+2 |
|\ | | | | | | | | | 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 |
|/ | |||||
* | Fetch displayname in userlist ajax requests. Refs #1681 | Thomas Tanghus | 2013-02-22 | 1 | -4/+4 |
| | |||||
* | Sanitize user input | Lukas Reschke | 2013-02-18 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | missing piece after merge | Thomas Mueller | 2013-02-13 | 1 | -6/+0 |
| | |||||
* | Split editable select code used for quota selection into a jquery plugin | Robin Appelman | 2013-02-11 | 1 | -423/+369 |
| | |||||
* | json_encode the appid | Lukas Reschke | 2013-02-09 | 1 | -1/+1 |
| | |||||
* | let the user change his display name, if supported by the back-end | Björn Schießle | 2013-02-06 | 1 | -0/+27 |
| | |||||
* | Remove superfluous append | Thomas Tanghus | 2013-02-05 | 1 | -1/+0 |
| | |||||
* | remove superfluous enabled-app class again | Jan-Christoph Borchardt | 2013-02-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fix_addNavigation | Jan-Christoph Borchardt | 2013-02-05 | 1 | -9/+9 |
|\ | |||||
| * | Merge pull request #1229 from owncloud/from_live_to_on | Thomas Müller | 2013-02-03 | 1 | -9/+9 |
| |\ | | | | | | | replace live() with on() in core js | ||||
| | * | Merge branch 'master' into from_live_to_on | Thomas Mueller | 2013-01-31 | 1 | -0/+30 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/google.js | ||||
| | * | | use on instead of live in users.js | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | replace live() with on() in core js | Jörn Friedrich Dreyer | 2013-01-30 | 1 | -8/+8 |
| | | | | |||||
* | | | | Make app icon linkable when enabling app. | Thomas Tanghus | 2013-02-03 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #1404 from owncloud/fixing-1276-master | blizzz | 2013-02-01 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | fix #1276 - use registerLoadedCallback() | ||||
| * | | | fix #1276 - use registerLoadedCallback() | Thomas Mueller | 2013-02-01 | 1 | -3/+4 |
| | | | | |||||
* | | | | Updateing -> Updating | Thomas Mueller | 2013-02-01 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'master' into navigation | Jan-Christoph Borchardt | 2013-01-31 | 1 | -0/+30 |
|\ \ \ | | |/ | |/| | |||||
| * | | update on translation string | Thomas Mueller | 2013-01-31 | 1 | -1/+1 |
| | | | |||||
| * | | l10n support for the error dialog added | Thomas Mueller | 2013-01-31 | 1 | -1/+1 |
| | | | |||||
| * | | merge master | Frank Karlitschek | 2013-01-30 | 3 | -8/+89 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| * | | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 1 | -0/+30 |
| | | | |||||
* | | | Merge pull request #1359 from raghunayyar/navigation | Jan-Christoph Borchardt | 2013-01-31 | 1 | -4/+4 |
|\ \ \ | |_|/ |/| | | No Image Repetition on Enabling Apps in Navigation Bar | ||||
| * | | Shorter, Cleaner JS in apps.js | raghunayyar | 2013-01-31 | 1 | -8/+4 |
| | | | |||||
| * | | Reduced Styling and Image loads as from src and not backgorund. | raghunayyar | 2013-01-30 | 1 | -1/+2 |
| | | | |||||
| * | | No Image Repetition on Enabling Apps in Navigation Bar | raghunayyar | 2013-01-30 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 1 | -0/+36 |
|\ \ | | | | | | | introduction of display names | ||||
| * | | only change display name if the display name from the current user was ↵ | Björn Schießle | 2013-01-29 | 1 | -0/+2 |
| | | | | | | | | | | | | changed; add correct display name to new user | ||||
| * | | remove debug output | Björn Schießle | 2013-01-29 | 1 | -3/+0 |
| | | | |||||
| * | | remove dubug output | Björn Schießle | 2013-01-29 | 1 | -1/+0 |
| | | | |||||
| * | | show display name in input field | Björn Schießle | 2013-01-28 | 1 | -1/+2 |
| | | | |||||
| * | | interface and API to change display names | Björn Schießle | 2013-01-28 | 1 | -0/+37 |
| |/ | |||||
* | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -8/+7 |
|\ \ | | | | | | | Fixing 998 master | ||||
| * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 2 | -2/+7 |
| |\| | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| * | | javascript syntax error fixed on the way | Thomas Mueller | 2013-01-04 | 1 | -3/+3 |
| | | | |||||
| * | | new javascript notification functions used within users.js | Thomas Mueller | 2013-01-04 | 1 | -5/+4 |
| | | |