Commit Graph

60 Commits

Author SHA1 Message Date
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings
Conflicts:
	lib/template.php
2013-07-24 09:35:33 +02:00
Thomas Müller 840e96cda3 Merge branch 'master' into disable-anon-upload-master
Conflicts:
	settings/templates/admin.php
2013-07-22 11:55:20 +02:00
kondou 05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
Thomas Müller 2964027cad Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master 2013-07-14 22:00:42 +02:00
Thomas Müller 79d23463f8 No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
Thomas Mueller 7a44d45714 change anonymous to public 2013-07-12 21:34:38 +02:00
Thomas Müller fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Jan-Christoph Borchardt 7741ca0bcc use themable strings for admin page, simplify admin export, fix rest of #3791 2013-07-11 17:41:36 +02:00
Björn Schießle 5f2378be5b revert changes which where introduced by accident during merge 23cc69b816 2013-07-04 12:06:36 +02:00
Björn Schießle 3c691c9ec9 move to non-static OC_Defaults
Conflicts:

	lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Björn Schießle 87bbdc1ed9 check for updates only in the community edition 2013-07-01 10:46:16 +02:00
Björn Schießle 23cc69b816 construct the foother in defaults.php so that we use always the same footer
Conflicts:

	settings/templates/admin.php
2013-07-01 10:46:00 +02:00
Jan-Christoph Borchardt f565e4c25b move common settings footer fieldset out of conditional 2013-06-12 16:59:23 +02:00
Björn Schießle e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Lukas Reschke d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
Bernhard Posselt 4679e789e1 also adjust template properly for log date fix 2013-04-17 15:31:05 +02:00
Lukas Reschke 8000f9db74 Unescape the update hint
Fixes #2647
2013-04-02 16:39:21 +03:00
Morris Jobke df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Morris Jobke d3ca97dd2f Make it possible to show less log entries again - fix owncloud/core#1593
* show "less" button only if there are more than 3 entries
 * only "remove" logs till last 3 entries
2013-03-27 15:14:09 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Thomas Mueller c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Thomas Müller e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller 232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master
Conflicts:
	settings/admin.php
	settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Thomas Mueller 84f3c8b6cc show webdav test results in admin section as well 2013-02-07 00:49:39 +01:00
Thomas Mueller 6058c2f734 we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that 2013-02-04 15:04:26 +01:00
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Thomas Mueller 388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +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
Thomas Mueller e475c26f1a fixing <input> tag 2013-01-07 21:23:14 +01:00
Thomas Müller bca02f4b40 [l18n] fixing typos in source text 2012-12-19 23:43:07 +01:00
Frank Karlitschek 196f1c3786 add a check and a warning if setlocale is working 2012-12-19 15:10:33 +01:00
Frank Karlitschek 30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Frank Karlitschek 55f75c6d8e add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why. 2012-11-08 18:08:44 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Alessandro Cosentino 158af74b3e makes cron config layout similar to the sharing one 2012-09-16 12:40:08 -04:00
Frank Karlitschek 442f26ea80 structure the settings options a bit better. 2012-09-16 17:23:21 +02:00
Frank Karlitschek c0a3bdb757 improve the documentation for the cron config a bit 2012-09-12 12:09:46 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Robin Appelman 0fa254508d dont use shorthand php tags 2012-09-01 16:38:23 +02:00
Thomas Mueller 10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Michael Gapczynski 9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski 617449b230 Change URL from gitorious to github 2012-08-26 21:38:53 -04:00
Jakob Sack 0c69e64b86 Backgroundjobs: Fix template 2012-08-12 00:44:25 +02:00
Jakob Sack 2bc8d3e5d6 Backgroundjobs: interface improvements 2012-08-12 00:37:14 +02:00
Jakob Sack 9ad31e5f81 Backgroundjobs: use correct var name in template 2012-08-10 01:44:38 +02:00
Jakob Sack 7c766cdfe0 Backgroundjobs: fix bugs in template 2012-08-10 01:42:30 +02:00