Commit graph

23 commits

Author SHA1 Message Date
Bjoern Schiessle
cf9099c788 This settings doesn't belong together
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
2014-06-05 15:44:56 +02:00
Morris Jobke
6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings
make reshare settings foldable
2014-06-02 14:37:10 +02:00
Volkan Gezer
c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Joas Schilling
dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Bjoern Schiessle
12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Bjoern Schiessle
ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Joas Schilling
5b8cde48dc Add button to send a test mail after changing the email settings
Fix #7175
2014-03-05 10:01:34 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Joas Schilling
9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
Joas Schilling
331bd527a7 Hide SMTP options based on selected send mode
Fix #7166
2014-02-26 10:30:22 +01:00
Joas Schilling
fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js
Fix issue #7166
2014-02-19 10:20:52 +01:00
Joas Schilling
8387cd8ae3 Add option to change email settings in admin section
Fix issue #7166
2014-02-18 14:26:03 +01:00
Vincent Petry
5aeafab9ab Fixed wrong id when reading checkbox value for force SSL setting
Fixes #5488
2013-10-23 15:21:18 +02:00
kondou
05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02: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
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +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
Jakob Sack
1ce2cd73ff Add first version of backgroundjobs settings 2012-08-09 10:41:10 +02:00
Robin Appelman
e59c87ee36 reload log after changing log level 2012-04-16 12:27:21 +02:00
Robin Appelman
d9372ac766 make log level configurable 2011-10-16 21:11:03 +02:00