summaryrefslogtreecommitdiffstats
path: root/settings/js
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| |\
| | * Merge branch 'master' into from_live_to_onThomas Mueller2013-01-311-0/+30
| | |\
| | * | 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()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
| |\|
| * | 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
|\ \ \ | |_|/ |/| |
| * | 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
|\ \
| * | only change display name if the display name from the current user was change...Björn Schießle2013-01-291-0/+2
| * | 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
|\ \
| * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-182-2/+7
| |\|
| * | 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
* | | Move appid to external fileLukas Reschke2013-01-231-1/+3
* | | External JSON for the AppsLukas Reschke2013-01-211-0/+24
* | | Move isadmin to external fileLukas Reschke2013-01-211-0/+20
| |/ |/|
* | Merge pull request #994 from owncloud/enhanced_multiSelectLukas Reschke2013-01-111-2/+3
|\ \
| * | Users: Show selected groups first in list.Thomas Tanghus2012-12-211-0/+1
| * | multiSelect: Modified users.js to only update other multiSelects.Thomas Tanghus2012-12-211-2/+2
| |/
* / Add security section to admin menuLukas Reschke2013-01-111-0/+4
|/
* adding missing translations for various strings + fixing tool tip on deleteThomas Müller2012-12-201-394/+402
* More whitespace fixesBart Visscher2012-12-151-1/+1
* use attr instead of dataGeorg Ehrke2012-11-291-7/+2
* Revert "fix group and subadmin managing for 'ajax-loaded' users"Georg Ehrke2012-11-291-2/+7
* add a client side checkGeorg Ehrke2012-11-281-0/+3
* fix group and subadmin managing for 'ajax-loaded' usersGeorg Ehrke2012-11-281-7/+2
* make some checks server-sideGeorg Ehrke2012-11-281-3/+0
* Better check and handing of user deletionBart Visscher2012-11-141-0/+2
* Always have the username as string in user adminBart Visscher2012-11-141-6/+6
* Cleanup user settings jsBart Visscher2012-11-141-8/+1
* Fix deleting multiple user w-o reloading V2Brice Maron2012-11-121-1/+4
* Fix delete link when new user is addedBrice Maron2012-11-081-1/+8
* Correct more data vs attr to fix #189Brice Maron2012-11-071-2/+2
* Move and fix app setting navigation detectBart Visscher2012-10-291-2/+2
* Merge branch 'routing'Bart Visscher2012-10-271-1/+1
|\