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

262 commits

Author SHA1 Message Date
Robin Appelman
6044ad0e17 Cleanup certificate code 2014-08-31 10:47:50 +02:00
Robin Appelman
f135130a75 remove outdated checks 2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Lukas Reschke
dd871098c5 Redirect user after clicking on link 
Use DI
 2014-08-22 16:01:03 +02:00
Lukas Reschke
97b536e3df Add a trusted domain wizard 
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
 2014-08-21 22:22:35 +02:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade 
Don't do app upgrades in the background
 2014-08-19 13:33:38 +02:00
Jörn Friedrich Dreyer
a1e8dd14a1 properly encode groups as json, not ',' separated 2014-08-18 19:47:50 +02:00
Robin Appelman
5c1f572149 Set maintaince mode when updating an app from the app store 2014-08-04 13:41:05 +02:00
Vincent Petry
675e3eec32 Merge pull request #9750 from owncloud/issue/9745 
Correctly use groups parameter only when its not empty
 2014-07-21 20:45:24 +02:00
Joas Schilling
0dc67cb1c2 Do not force isAdmin as true and so the list is filtered correctly 2014-07-21 11:30:47 +02:00
Joas Schilling
e6c75aa974 Fix username for subadmins and only send subadmin groups 
Fix #9748
 2014-07-21 11:20:55 +02:00
Joas Schilling
c84c1f519f Correctly use groups parameter only when its not empty 
Fix #9745
 2014-07-21 10:46:21 +02:00
Arthur Schiwon
ab2c7e06a4 remove dead code 
do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests
 2014-07-14 21:26:37 +02:00
Thomas Müller
b15510ed9a magic strings - bad kungfu 2014-07-09 16:13:33 +02:00
Georg Ehrke
c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Georg Ehrke
0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
 2014-06-05 22:54:27 +02:00
Georg Ehrke
724d027f19 add unit test 2014-06-04 16:29:41 +02:00
icewind1991
cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group 
Add the option to enable apps only for specific groups
 2014-06-03 19:01:12 +02:00
Robin Appelman
53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Georg Ehrke
eea501b847 various fixes as requested by pr reviewers 2014-06-02 21:39:15 +02:00
Arthur Schiwon
ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
ringmaster
1ae8ec698b Make sure group data is returned. 2014-06-02 12:53:57 +02:00
Lukas Reschke
f2fed6de4e Rename $accessiblegroups to $accessibleGroups 2014-06-02 12:53:57 +02:00
Arthur Schiwon
5444a1114d cleanup 2014-06-02 12:53:56 +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
cbcda49ee3 get translations from settings, not core 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
Arthur Schiwon
004dd73c5e fix user creation, checkSubAdminUser is only available in OC_JSON 2014-06-02 12:53:53 +02:00
Lukas Reschke
86d3cf53d1 Let's switch to OCP\JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke
ed1a23c9a2 Use OCP\JSON instead of OC_JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke
8a8800203e Remove legacy "Check for user comment" 
I don't think these comments are necessary anymore and therefore they should get killed.
 2014-06-02 12:53:52 +02:00
raghunayyar
16fb48f2eb Adds admin check on groupname changes. 2014-06-02 12:53:52 +02:00
Arthur Schiwon
478393e15a load groups when clicking on them 2014-06-02 12:53:52 +02:00
Arthur Schiwon
57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar
970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon
dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar
c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar
78e1b71003 Reverts Bogus Changes. 2014-06-02 12:52:52 +02:00
raghunayyar
ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar
b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar
b2ca595509 Add GroupList Ajax to Users. 2014-06-02 12:52:52 +02:00
Georg Ehrke
c8636ca4d9 Merge branch 'master' into update_shipped_apps_from_appstore 
Conflicts:
	lib/private/app.php
	lib/private/installer.php
 2014-05-31 14:55:00 +02:00
Georg Ehrke
2bcfd8e084 make it possible to update shipped apps via the appstore 2014-05-31 12:17:54 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Björn Schießle
b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys 
backup the encryption key after the encryption was disabled
 2014-05-13 09:25:16 -04:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user 
can restore them if needed
 2014-05-13 12:35:25 +02:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Volkan Gezer
1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00