Lukas Reschke
67b2957bf9
Check for admin user instead of subadmin
2014-09-08 14:34:44 +02:00
Clark Tomlinson
6a56e03d48
Using countUsers method to return true count of users
2014-09-05 11:23:59 -04:00
Lukas Reschke
8009df0b60
Merge pull request #10420 from owncloud/external-share-self-signed
...
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Lukas Reschke
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
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
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +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
Volkan Gezer
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
Thomas Müller
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
Bjoern Schiessle
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
Bjoern Schiessle
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
Bjoern Schiessle
2556647a10
check if user is logged in
2013-11-26 12:47:59 +01:00
Jan-Christoph Borchardt
d62b683c6a
change 'Display Name' to more understandable 'Full Name', fix #5612
2013-11-06 14:20:43 +01:00
Vincent Petry
1ee4b680f6
Fixed user dir existence check when creating new user
...
The check was done too later. It turns out that createUser() had already
created the dir, which caused the warning message to be shown every
time.
2013-10-25 16:23:29 +02:00
Vincent Petry
00f4928866
Added warning notification when user home already exists
...
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.
Fixes #5161
2013-10-22 18:10:29 +02:00
kondou
306a8681c5
Move ajax/changepassword to changepassword/controller to use autoloading
2013-09-13 17:03:13 +02:00
kondou
f6faec0e0b
Use a controller instead of two files for changepassword.php
2013-09-11 16:35:13 +02:00
kondou
4aa84047fe
Remove $recoveryPassword from changepersonalpassword & fix indent
2013-09-06 17:05:10 +02:00
kondou
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
Jan-Christoph Borchardt
0c02e1efef
Merge pull request #4563 from owncloud/use_personal-password
...
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
kondou
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Morris Jobke
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Andreas Fischer
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
Bart Visscher
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +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
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
Bjoern Schiessle
a7a7ef2b3a
improved error handling
2013-07-30 09:48:30 +02:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
830f5d24c7
add decryptall.php
2013-07-29 13:39:56 +02:00
kondou
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
Björn Schießle
7cfb0dc406
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +02:00
Morris Jobke
a39ecd5ea9
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php
...
Init language object before using it
2013-06-12 04:23:52 -07:00
Georg Ehrke
a2fa91fdd5
init language object before using it
2013-06-12 09:40:13 +02:00
Björn Schießle
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
Björn Schießle
b25ab94a08
only check for recovery key if someone else than the user wants to change the password
2013-06-07 20:17:48 +02:00
Björn Schießle
d7a9852f7b
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
2013-06-06 13:32:02 +02:00
Florin Peter
563f343291
fix password change when files_encryption app is disabled
2013-06-03 19:06:20 +02:00
Björn Schießle
f70240f430
display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
2013-05-18 10:33:33 +02:00
Björn Schießle
f1a5b8b524
show nicer warning if the admin recovery password was wrong
2013-05-16 16:01:40 +02:00
Björn Schießle
8ae30891b3
some error handling in case the recovery password is wrong
2013-05-16 15:19:53 +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
Björn Schießle
135991474b
fix inconsistent post parameters in change password operation
2013-05-08 12:38:09 +02:00
Björn Schießle
9b258929c6
allow to set quota to zero, issue #2696
2013-05-07 10:40:25 +02:00
Arthur Schiwon
9c3b83e28c
Fix retrieval of users with multiple backends
2013-05-03 13:50:14 +02:00
Morris Jobke
e6f84397aa
Merge pull request #3098 from jerrac/displaynamesaveontimeout
...
On the Personal Settings page, made the display name save like the email address saves
2013-04-25 14:10:16 -07:00
David Reagan
4bee02f75c
Fixed comment in personal.js. Changed message text in changedisplayname.php.
2013-04-23 14:31:35 -07:00