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

315 commits

Author SHA1 Message Date
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
David Reagan
7312cbec91 Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages. 2013-04-23 12:45:12 -07:00
Morris Jobke
8fab7d5afb fix syntax layout 2013-04-23 18:15:34 +02:00
Morris Jobke
b9b2e0269a fix logical issue while retrieving log via ajax 2013-04-23 14:40:21 +02:00
Thomas Mueller
ce54d00b5c fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-08 23:11:33 +02:00
Lukas Reschke
962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +01:00
Bart Visscher
376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt
78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames 
Fetch displayname in userlist ajax requests. Refs #1681
 2013-02-22 07:44:24 -08:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Thomas Tanghus
2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
Bart Visscher
83e613b45a Fix error path in changedisplayname call 2013-02-22 00:49:44 +01:00
Bart Visscher
83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Victor Dubiniuk
06dbcec5a1 Do not set password if it has't provided 2013-02-18 21:20:48 +03:00
Thomas Mueller
037fcde133 Merge branch 'master' into fixing-1424-master 2013-02-11 21:42:27 +01:00
Thomas Müller
b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +01:00
Thomas Müller
0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks 
Fix loading hooks when going though the routing system
 2013-02-09 09:59:41 -08:00
Bart Visscher
9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Frank Karlitschek
4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Björn Schießle
d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Lukas Reschke
01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory 
Typo
 2013-02-10 02:31:34 -08:00
Lukas Reschke
2dde418e99 Remove uneeded lines 2013-02-09 23:43:48 +01:00
Lukas Reschke
bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Bart Visscher
340d6fce11 Better way of getting the navigation entries for an app 2013-02-08 18:53:43 +01:00
Thomas Müller
05b46f7828 on creation only test for existing users if the backend supports user creation 
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
 2013-02-08 17:16:18 +01:00
Lukas Reschke
93b1597395 Merge pull request #1506 from owncloud/files_encryption 
Files encryption
 2013-02-06 11:47:55 -08:00
Lukas Reschke
ad644b4e08 Merge pull request #1363 from owncloud/FixPasswordChange 
Fix password change
 2013-02-06 11:14:59 -08:00
Sam Tuke
2c22619a18 Reverted fix temporarily; another fix by LukasReschke is awaiting merge 2013-02-06 19:06:55 +00:00
Sam Tuke
954a627483 Added comment 2013-02-06 18:24:35 +00:00
Sam Tuke
81de09711b Fixed bug causing password change related hooks to not be called due to ajax 2013-02-06 17:42:29 +00:00
Sam Tuke
a8c0e3612c Removed call to depreciated isUserVerified() 2013-02-06 16:01:43 +00:00
Björn Schießle
e68d0c7398 make strings translatable 2013-02-06 11:55:19 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Thomas Mueller
8a662a6c74 Cleanup string - easier for translators 2013-01-31 10:34:54 +01:00
Frank Karlitschek
5e422dea61 fix typo 2013-01-30 14:52:35 +01:00
Frank Karlitschek
66cab77b6d merge master 
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
 2013-01-30 14:36:17 +01:00
Frank Karlitschek
389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
Lukas Reschke
a7aff48658 Fix indentation 2013-01-30 00:17:41 +01:00
Lukas Reschke
0067ac6ca6 Remove the no longer existing function "isUserVerified" 
Thx @eMerzh
 2013-01-30 00:16:37 +01:00
Björn Schießle
afad6e95db check permissions before changing the display name 2013-01-29 22:20:15 +01:00
Björn Schießle
27edbfdf56 added missing changedisplayname.php 2013-01-29 21:52:03 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Lukas Reschke
eab6d7eb23 Enhanced auth is totally unmaintained and broken 
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
 2013-01-14 21:39:49 +01:00
Lukas Reschke
0810d80f8a Add a closing ) 
Thanks Jenkins!
 2013-01-14 20:10:10 +01:00
Lukas Reschke
fef73d96d1 CP fail 2013-01-14 19:51:16 +01:00
Lukas Reschke
31b1a73e1f Check if user is admin - bool 
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
 2013-01-14 19:45:17 +01:00
Bart Visscher
b608675938 Merge pull request #1157 owncloud/move-OpenID 
Move openid.php to apps repo

Conflicts:
	settings/routes.php
 2013-01-11 22:57:40 +01:00
Lukas Reschke
1f6eb68ef9 Merge pull request #1150 from owncloud/EnableSSL-AdminMenu 
Add security section to admin settings to enable the HTTPS enforcement
 2013-01-11 09:21:08 -08:00
Lukas Reschke
1631ee4d60 Move to apps repo 
This belongs to the apps repo.
 2013-01-11 17:22:15 +01:00
Lukas Reschke
9b9f5b1a8a Remove setContentTypeHeader() 
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
 2013-01-11 17:09:36 +01: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
Bart Visscher
2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher
a3f18d4b5a Merge pull request #603 from owncloud/store_plain_groupname 
Group name doesn't need to be sanitized before storing it in the database
 2012-11-30 04:13:36 -08:00
Georg Ehrke
ab13702770 make some checks server-side 2012-11-28 18:15:40 +01:00
Bart Visscher
80d1037e42 Group name does't need to be sanitized before storing it in the database 
It should only be sanitized before display
 2012-11-27 20:22:45 +01:00
Bart Visscher
59627367ae Better check and handling of user creation 2012-11-14 21:52:28 +01:00
Diederik de Haas
1b7c0c2b62 Fixed new checkstyle issues in ocs.php from build #1341. 2012-11-10 01:02:47 +01:00
Frank Karlitschek
f799e48f7e fix the broken image path on the apps page 2012-11-08 13:34:00 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller
27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Bart Visscher
1bdd0c949b Move and fix app setting navigation detect 2012-10-29 15:04:55 +01: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
Lukas Reschke
f4142bd2a8 Move isUserVerified to OC_Util 2012-10-16 00:47:38 +02:00
Lukas Reschke
c404148f9a Password check for admins 2012-10-16 00:47:38 +02:00
Lukas Reschke
c83a2a5517 Correct check for admin 2012-10-16 00:47:38 +02:00
Lukas Reschke
e6c9f5d9f4 Verify passwords for admins 2012-10-16 00:01:48 +02:00
Lukas Reschke
e3054b6201 Revert "Verify user login before changing the password reset mail" 
This reverts commit 9aa9110fd9.
 2012-10-15 23:50:12 +02:00
Lukas Reschke
f475ed5cc1 Revert "Remove old password check from changepassword and use verifyUser instead" 
This reverts commit e6b8153865.
 2012-10-15 23:49:49 +02:00
Lukas Reschke
9aa9110fd9 Verify user login before changing the password reset mail 2012-10-15 17:44:44 +02:00
Lukas Reschke
e6b8153865 Remove old password check from changepassword and use verifyUser instead 2012-10-15 17:44:44 +02:00
Lukas Reschke
6b39b80648 Change auth checks 2012-10-15 17:44:44 +02:00
Lukas Reschke
0b42d70259 Unneeded double check 2012-10-15 16:08:39 +03:00
Lukas Reschke
2f4b1b0e4c Disallow users to delete their own accounts 2012-10-10 18:05:34 +02:00
Bart Visscher
bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00
Sam Tuke
dc0dc56d48 Merge branch 'master' of https://github.com/owncloud/core 2012-09-18 14:36:08 +01: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
Thomas Müller
f85b709fae Use correct translation file 
every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
 2012-09-17 15:00:22 +03:00
Thomas Müller
1fd3c5fbc0 $l was undefined 2012-09-17 14:50:17 +03:00
Jörn Friedrich Dreyer
62d8202d59 return a message when app could not be enabled 2012-09-12 12:02:39 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Thomas Mueller
ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Thomas Mueller
ae8d2d029f Adding missing translation 2012-09-04 20:48:10 +02:00
Thomas Müller
b698fab109 Update settings/ajax/userlist.php 
respect coding style
 2012-09-04 13:00:56 +03:00
Thomas Müller
4b3fc27a22 Update settings/ajax/togglegroups.php 
respect coding style
 2012-09-04 12:58:07 +03:00
Thomas Müller
9a8a101756 Update settings/ajax/setloglevel.php 
respect coding style
 2012-09-04 12:55:20 +03:00
Thomas Müller
dafe28e079 Update settings/ajax/setlanguage.php 
respect coding style
 2012-09-04 12:54:36 +03:00
Thomas Müller
93496a32cc Update settings/ajax/removeuser.php 
$l->t added for error message
 2012-09-04 12:54:04 +03:00
Thomas Müller
de987b475d Update settings/ajax/removeuser.php 
respect coding style
 2012-09-04 12:51:04 +03:00
Thomas Müller
04aea1eb2e Update settings/ajax/removegroup.php 
$l->t added for error message
 2012-09-04 12:50:16 +03:00
Thomas Müller
b49e8cd04d Update settings/ajax/removegroup.php 
respect coding style
 2012-09-04 12:49:50 +03:00
Thomas Müller
16b3ffb588 Update settings/ajax/openid.php 
respect coding style
 2012-09-04 12:49:21 +03:00
Thomas Müller
83575a4436 Update settings/ajax/creategroup.php 
$l->t added to error messages
 2012-09-04 12:48:42 +03:00
Thomas Müller
04033585b0 Update settings/ajax/lostpassword.php 
respect coding style
 2012-09-04 12:47:35 +03:00
Thomas Müller
6308f80329 Update settings/ajax/getlog.php 
respect coding style
 2012-09-04 12:46:56 +03:00
Thomas Müller
caaaf7a7bf Update settings/ajax/creategroup.php 
respect coding style
 2012-09-04 12:45:54 +03:00
Thomas Müller
a570cc7b60 Update settings/ajax/setquota.php 
respect coding style
 2012-09-04 12:36:21 +03:00
Thomas Müller
e10f46d978 Update settings/ajax/createuser.php 
respect coding style
 2012-09-04 12:34:52 +03:00
Thomas Müller
69240afd7a Update settings/ajax/changepassword.php 
respect coding style
 2012-09-04 12:32:27 +03:00
Thomas Müller
8bea9f34e6 Update settings/ajax/apps/ocs.php 
respect coding style
 2012-09-04 12:31:28 +03:00
Frank Karlitschek
72e80bf6bd send the current owncloud version to the ocs server so that we can filter for compatible apps 2012-08-31 20:22:03 +02:00