Commit Graph

126 Commits

Author SHA1 Message Date
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle 6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +01:00
Björn Schießle 56c6e6a334 remove debug output 2013-01-29 22:20:47 +01:00
Björn Schießle e613a68274 remove dubug output 2013-01-29 21:30:04 +01:00
Björn Schießle f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Lukas Reschke 954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke 466cdab680 Add security section to admin menu
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
Thomas Mueller b5d1dfcdc9 javascript syntax error fixed on the way 2013-01-04 23:38:07 +01:00
Thomas Mueller 594d388ad9 new javascript notification functions used within users.js 2013-01-04 23:37:21 +01:00
Thomas Tanghus 5f795d3aac Users: Show selected groups first in list. 2012-12-21 06:18:45 +01:00
Thomas Tanghus 1d55829ba6 multiSelect: Modified users.js to only update other multiSelects. 2012-12-21 00:54:31 +01:00
Thomas Müller cc9061d20d adding missing translations for various strings + fixing tool tip on delete 2012-12-20 09:59:09 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Georg Ehrke e5af24d084 use attr instead of data 2012-11-29 13:56:07 +01:00
Georg Ehrke 1d1ab2a911 Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit a5774229a1.
2012-11-29 13:37:37 +01:00
Georg Ehrke 4c83a4c918 add a client side check 2012-11-28 18:40:58 +01:00
Georg Ehrke a5774229a1 fix group and subadmin managing for 'ajax-loaded' users 2012-11-28 18:40:00 +01:00
Georg Ehrke ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher 343e9d8621 Better check and handing of user deletion 2012-11-14 21:52:28 +01:00
Bart Visscher 4eff27ed42 Always have the username as string in user admin 2012-11-14 21:52:28 +01:00
Bart Visscher 85209a0a00 Cleanup user settings js 2012-11-14 21:52:28 +01:00
Brice Maron 910a25adbd Fix deleting multiple user w-o reloading V2 2012-11-12 20:29:06 +00:00
Brice Maron 4c06c25c6c Fix delete link when new user is added 2012-11-08 20:17:16 +00:00
Brice Maron fbc3123d8e Correct more data vs attr to fix #189 2012-11-07 23:51:00 +00:00
Bart Visscher 1bdd0c949b Move and fix app setting navigation detect 2012-10-29 15:04:55 +01:00
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman da57fbc93a show/hide navigation entries after enabling/disabling app 2012-10-26 20:13:24 +02:00
Bart Visscher 6081bfa2bc Merge branch 'master' into routing
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
2012-10-17 16:38:11 +02:00
Frank Karlitschek c701bed2e3 fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally 2012-10-08 15:49:48 +02:00
Frank Karlitschek 306bfb44d3 no garbage on the screen please 2012-10-08 13:33:52 +02:00
Bart Visscher f3a211c03c Implement routing on javascript side 2012-10-05 09:42:36 +02:00
Bart Visscher bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Sam Tuke b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Bart Visscher a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +02:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Thomas Mueller 10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Robin Appelman b5234a4f34 allow html inside app descriptions 2012-08-30 22:17:54 +02:00
Michael Gapczynski 42a291286b Fix incorrect Javascript for changing Share API settings 2012-08-27 20:45:36 -04:00
Michael Gapczynski 9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski 59cf1d19e5 setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead 2012-08-26 22:05:34 -04:00
Georg Ehrke 80374c7cb2 fix UI bug with subadmins 2012-08-25 14:35:24 +02:00
Georg Ehrke ced234a81a rename subadmin to group admin 2012-08-17 16:00:24 +02:00
Michael Gapczynski 9d2ae5fa1f Add infinite scrolling to Settings -> Users, still a little buggy 2012-08-11 16:25:27 -04:00
Michael Gapczynski baa0b4d530 Cast subadmin groups as strings 2012-08-11 16:25:27 -04:00