wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30736 commits 157 branches 562 tags 714 MiB
Commit graph

92 commits

Author SHA1 Message Date
Morris Jobke
1601d9235a Make enable_avatars setting more robust 
* handles the setting in the same way everywhere
* fixes #21949
 2016-01-27 15:17:25 +01:00
Jörn Friedrich Dreyer
2d1b9a5f9f allow apps to load additional scripts on the user settings page via the event dispatcher 2016-01-14 16:57:33 +01:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Roeland Jago Douma
7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Morris Jobke
e6d4496fc2 Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App 2015-12-04 17:23:51 +01:00
Morris Jobke
cc9695ea41 Fix typo in variable name 
* introduced with #20135 - c6f6a8758b

Fixes following error meessage:

{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
 2015-11-04 09:44:19 +01:00
Lukas Reschke
c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Roeland Jago Douma
f6cd7362cd Save the settings in the user management page 
Store the setting in the user managerment page (e.g. show e-mail
address).

Fixes #12727
 2015-09-25 13:35:12 +02:00
Robin McCorkell
c97147c99a Check if app is enabled instead of if class exists 2015-09-07 10:28:08 +01:00
Arthur Schiwon
571e99b152 also don't count group members when more than 1 ldap configs are active 2015-08-13 14:44:17 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Joas Schilling
497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling
d683752b37 Sort user groups by group name and hide the user count 2015-05-18 12:55:19 +02:00
Bjoern Schiessle
a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Jenkins for ownCloud
b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Morris Jobke
fa5790c8af move loading of JS and CSS to template 2014-12-12 09:22:15 +01:00
Morris Jobke
af1f34e813 remove PHP generated user list and move all to the existing JS part 2014-12-12 09:12:30 +01:00
Morris Jobke
0d4f0ab871 reduce OC_Preferences, OC_Config and \OCP\Config usage 
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
 2014-12-08 22:42:37 +01:00
Morris Jobke
a857bf1d50 drop jquery.inview as it is unused 2014-11-05 12:57:18 +01:00
Clark Tomlinson
6a56e03d48 Using countUsers method to return true count of users 2014-09-05 11:23:59 -04:00
Stephan Peijnik
4d74aa09bf Port of #9584 
Fixes #9583

lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Fix indentation.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Renamed $grp to $group in foreach loop.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Use is_null() instead of empty() when checking the return value of GroupManager::get().

Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>

Updated code to reflect changes introduced to \OC\Group\MetaData.

Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-07-16 12:23:26 +02:00
raghunayyar
720fa33274 Better Logic to display user count for everyone. 2014-06-24 00:50:36 +05:30
Arthur Schiwon
f9f9550969 small fixes / cleanup 2014-06-02 12:53:57 +02:00
Lukas Reschke
8141b9181c Add space 2014-06-02 12:53:57 +02:00
Lukas Reschke
59fef54e92 Rename $accessibleusers to $accessibleUsers 2014-06-02 12:53:57 +02:00
Lukas Reschke
b56d14260d Rename $isadmin to $isAdmin 2014-06-02 12:53:57 +02:00
Arthur Schiwon
3e411c82a5 unify and consolidate group fetching method for initial template fill and ajax request 2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
Arthur Schiwon
5b8ba79356 make filter work on server-side 2014-06-02 12:53:55 +02:00
Arthur Schiwon
b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
raghunayyar
9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon
1734cc09fd sort groups by user count 2014-06-02 12:53:52 +02:00
raghunayyar
f751e0bc48 Splits Code for Users and Groups. 2014-06-02 12:53:51 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
Arthur Schiwon
dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar
4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar
b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
Thomas Müller
f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
kondou
1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
kondou
e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou
fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt 
And other small improvements
 2013-08-25 21:04:04 +02:00
Owen Winkler
cd7e57e8ec Use JSON to send/receive group data. 
Squashed commits from PR #4364 for master.
 2013-08-15 06:19:40 -04:00
kondou
05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
Björn Schießle
9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00