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
Michael Gapczynski
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Jörn Friedrich Dreyer
ed06070741
omit type attribute in script tag to use fallback (text/javascript)
2013-01-02 12:13:07 +01:00
Tom Needham
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Thomas Müller
36da34e5f6
Merge pull request #902 from owncloud/storage-wording
...
Storage wording
2012-12-28 23:19:52 -08:00
Thomas Müller
7e78f8e15a
moving logic from template to the 'controller'
...
THX @VicDeo
2012-12-21 00:48:12 +01:00
Thomas Müller
436df6b67d
enable translations for quota sizes 'none' and 'default'
2012-12-20 15:35:36 +01:00
Thomas Müller
bca02f4b40
[l18n] fixing typos in source text
2012-12-19 23:43:07 +01:00
Frank Karlitschek
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
Tom Needham
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00: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
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
Jan-Christoph Borchardt
4acb2f70e1
change technical expression 'Quota' to simpler 'Storage'
2012-12-14 23:02:22 +01:00
Tom Needham
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
Frank Karlitschek
cde74fe248
make it more readable
2012-12-14 14:41:09 +01:00
Frank Karlitschek
2330d6bcc7
show the link to the issue tracker only for Admins as discussed with Björn and Jan.
2012-12-13 11:08:12 +01:00
Frank Karlitschek
89bbabd77b
a bit more polish. We are getting there.
2012-12-13 09:26:25 +01:00
Frank Karlitschek
f85106b6b5
first version of the new documentation system integration.
2012-12-12 22:41:12 +01:00
Victor Dubiniuk
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
Thomas Müller
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08: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
Frank Karlitschek
fef2d07873
add credits to personal page too so that non admins can see what they run.
2012-11-08 14:12:49 +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
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00: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
e6b8153865
Remove old password check from changepassword and use verifyUser instead
2012-10-15 17:44:44 +02:00
Frank Karlitschek
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
Tom Needham
729b36e495
Fix grammer and dont split translatable string
2012-09-18 21:31:03 +00: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
Tom Needham
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00: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
Tom Needham
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00: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
Thomas Tanghus
a2b6a92107
Disable asking to save password when adding users.
2012-09-05 17:22:03 +02:00
Thomas Mueller
685f03edf6
fixing translation - thx eMerzh
2012-09-04 23:49:43 +02:00
Thomas Müller
409ede0975
Update settings/templates/users.php
...
respect coding style
2012-09-04 13:05:09 +03:00
Thomas Müller
f3e330ce64
Update settings/templates/help.php
...
respect coding style
2012-09-04 13:03:51 +03: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
Robin Appelman
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
Michael Gapczynski
aad7dc8390
Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page
2012-08-27 20:55:11 -04:00