Commit Graph

126 Commits

Author SHA1 Message Date
Volkan Gezer 46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Thomas Müller 07dc0b2fdf setting and checking default_charset in php.ini to be UTF-8 2014-07-25 09:53:25 +02:00
Volkan Gezer 2561ef123b fix apostrophe fixes #9486 2014-07-08 21:48:29 +02:00
Morris Jobke 9e74787c8a Migrate table layout to p layout for share settings
ref #8906
2014-06-17 14:33:14 +02:00
Bjoern Schiessle c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Lukas Reschke 01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
Morris Jobke fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Morris Jobke dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
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
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Morris Jobke 25c676f203 simplify SQLite warning 2014-06-03 12:02:23 +02:00
Bjoern Schiessle 5097bcc16d improve settings name 2014-06-03 11:29:51 +02:00
Morris Jobke 68a4fd44e6 add notification on admin page 2014-06-03 08:01:39 +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
Thomas Müller 555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Lukas Reschke 5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
2014-05-29 21:54:15 +02:00
Volkan Gezer c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Volkan Gezer 1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Volkan Gezer 188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Jan-Christoph Borchardt c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working
Conflicts:
	lib/private/util.php
2014-05-19 21:42:30 +02:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +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 b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus 287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jan-Christoph Borchardt 69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
Vincent Petry b75ca9fb50 Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Vincent Petry 5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
kondou 556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +01:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Joas Schilling 0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server
Fix #7559
2014-03-05 14:53:20 +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
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 8387cd8ae3 Add option to change email settings in admin section
Fix issue #7166
2014-02-18 14:26:03 +01:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Morris Jobke 8506d2bf42 fix wording 2013-11-27 00:38:56 +01:00
Morris Jobke 2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
Thomas Mueller f6df4b349f remove logic from template and fix syntax error 2013-11-24 21:27:32 +01:00
Frank Karlitschek 77bb168007 replace echo with p 2013-11-24 17:17:10 +01:00