aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/
* / Add log as text and not as HTMLLukas Reschke2013-03-031-1/+1
|/
* sort users according to display nameArthur Schiwon2013-02-261-2/+2
|
* Merge branch 'master' of github.com:owncloud/core into issue_1776Qingping Hou2013-02-251-2/+2
|\ | | | | | | | | 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
|/
* Fetch displayname in userlist ajax requests. Refs #1681Thomas Tanghus2013-02-221-4/+4
|
* Sanitize user inputLukas Reschke2013-02-181-1/+1
|
* Merge pull request #1701 from owncloud/XSS-fixesLukas Reschke2013-02-141-2/+2
|\ | | | | Sanitize HTML
| * Sanitize HTMLLukas Reschke2013-02-141-2/+2
| |
* | fixing javascript errors IE8 in apps managementThomas Mueller2013-02-141-1/+1
|/
* fixing javascript errors IE8 in user managementThomas Mueller2013-02-141-3/+4
|
* missing piece after mergeThomas Mueller2013-02-131-6/+0
|
* Split editable select code used for quota selection into a jquery pluginRobin Appelman2013-02-111-423/+369
|
* json_encode the appidLukas Reschke2013-02-091-1/+1
|
* let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-0/+27
|
* Remove superfluous appendThomas Tanghus2013-02-051-1/+0
|
* remove superfluous enabled-app class againJan-Christoph Borchardt2013-02-051-1/+1
|
* Merge branch 'master' into fix_addNavigationJan-Christoph Borchardt2013-02-051-9/+9
|\
| * Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-031-9/+9
| |\ | | | | | | replace live() with on() in core js
| | * Merge branch 'master' into from_live_to_onThomas Mueller2013-01-311-0/+30
| | |\ | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/google.js
| | * | use on instead of live in users.jsJörn Friedrich Dreyer2013-01-301-1/+1
| | | |
| | * | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-301-8/+8
| | | |
* | | | Make app icon linkable when enabling app.Thomas Tanghus2013-02-031-0/+1
|/ / /
* | | Merge pull request #1404 from owncloud/fixing-1276-masterblizzz2013-02-011-3/+4
|\ \ \ | | | | | | | | fix #1276 - use registerLoadedCallback()
| * | | fix #1276 - use registerLoadedCallback()Thomas Mueller2013-02-011-3/+4
| | | |
* | | | Updateing -> UpdatingThomas Mueller2013-02-011-1/+1
|/ / /
* | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-311-0/+30
|\ \ \ | | |/ | |/|
| * | update on translation stringThomas Mueller2013-01-311-1/+1
| | |
| * | l10n support for the error dialog addedThomas Mueller2013-01-311-1/+1
| | |
| * | merge masterFrank Karlitschek2013-01-303-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 Karlitschek2013-01-211-0/+30
| | |
* | | Merge pull request #1359 from raghunayyar/navigationJan-Christoph Borchardt2013-01-311-4/+4
|\ \ \ | |_|/ |/| | No Image Repetition on Enabling Apps in Navigation Bar
| * | Shorter, Cleaner JS in apps.jsraghunayyar2013-01-311-8/+4
| | |
| * | Reduced Styling and Image loads as from src and not backgorund.raghunayyar2013-01-301-1/+2
| | |
| * | No Image Repetition on Enabling Apps in Navigation Barraghunayyar2013-01-301-1/+4
| |/
* | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-0/+36
|\ \ | | | | | | introduction of display names
| * | only change display name if the display name from the current user was ↵Björn Schießle2013-01-291-0/+2
| | | | | | | | | | | | changed; add correct display name to new user
| * | remove debug outputBjörn Schießle2013-01-291-3/+0
| | |
| * | remove dubug outputBjörn Schießle2013-01-291-1/+0
| | |
| * | show display name in input fieldBjörn Schießle2013-01-281-1/+2
| | |
| * | interface and API to change display namesBjörn Schießle2013-01-281-0/+37
| |/
* | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-8/+7
|\ \ | | | | | | Fixing 998 master
| * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-182-2/+7
| |\| | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js
| * | javascript syntax error fixed on the wayThomas Mueller2013-01-041-3/+3
| | |
| * | new javascript notification functions used within users.jsThomas Mueller2013-01-041-5/+4
| | |