summaryrefslogtreecommitdiffstats
path: root/settings/templates
Commit message (Collapse)AuthorAgeFilesLines
* Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
|
* Add security section to admin menuLukas Reschke2013-01-111-0/+27
| | | | | | | | | 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)
* Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-042-0/+39
|\ | | | | External API for ownCloud based on OCS
| * Merge branch 'master' into ocs_apiTom Needham2012-12-314-151/+207
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'master' into ocs_apiTom Needham2012-12-161-1/+1
| |\ \
| * \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-145-8/+26
| |\ \ \
| * \ \ \ Merge master into ocs_apiTom Needham2012-10-282-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into ocs_apiTom Needham2012-09-171-7/+26
| |\ \ \ \ \
| * \ \ \ \ \ Fix merge conflictsTom Needham2012-09-136-37/+118
| |\ \ \ \ \ \
| * | | | | | | Check if required apps are installedTom Needham2012-07-302-3/+22
| | | | | | | |
| * | | | | | | Improve styling of permission request pageTom Needham2012-07-301-12/+13
| | | | | | | |
| * | | | | | | Basic template for authorising exernal apps with OAuthTom Needham2012-07-301-0/+19
| | | | | | | |
* | | | | | | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #902 from owncloud/storage-wordingThomas Müller2012-12-281-7/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Storage wording
| * | | | | | | moving logic from template to the 'controller'Thomas Müller2012-12-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THX @VicDeo
| * | | | | | | enable translations for quota sizes 'none' and 'default'Thomas Müller2012-12-201-4/+19
| | | | | | | |
| * | | | | | | change technical expression 'Quota' to simpler 'Storage'Jan-Christoph Borchardt2012-12-141-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [l18n] fixing typos in source textThomas Müller2012-12-191-100/+121
| | | | | | |
* | | | | | | Merge pull request #961 from owncloud/check_localeFrank Karlitschek2012-12-191-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add a check and a warning if setlocale is working
| * | | | | | | add a check and a warning if setlocale is workingFrank Karlitschek2012-12-191-0/+14
| | | | | | | |
* | | | | | | | Merge pull request #868 from owncloud/new_doc_systemFrank Karlitschek2012-12-191-33/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | New doc system
| * | | | | | | make it more readableFrank Karlitschek2012-12-141-3/+7
| | | | | | | |
| * | | | | | | show the link to the issue tracker only for Admins as discussed with Björn ↵Frank Karlitschek2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Jan.
| * | | | | | | a bit more polish. We are getting there.Frank Karlitschek2012-12-131-2/+3
| | | | | | | |
| * | | | | | | first version of the new documentation system integration.Frank Karlitschek2012-12-121-33/+29
| |/ / / / / /
* | | | | | / cleaning up the settings. standardize the format, add missing I10N and other ↵Frank Karlitschek2012-12-152-16/+21
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | small things. Yes. This is not perfect. But way better than before ;-)
* | | | | | More style fixesBart Visscher2012-12-151-1/+1
|/ / / / /
* | | | | Check if we have an array with data. Fix #487Victor Dubiniuk2012-12-021-1/+1
| | | | |
* | | | | Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-091-0/+14
|\ \ \ \ \ | | | | | | | | | | | | add a check and a warning if the ownCloud server is not able to establis...
| * | | | | add a check and a warning if the ownClodu server is not able to establish ↵Frank Karlitschek2012-11-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
|/ / / / /
* | | | | Style: Remove all the dangling white spacesFelix Moeller2012-11-042-2/+2
| | | | |
* | | | | Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-041-2/+1
| | | | |
* | | | | Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
| | | | |
* | | | | Checkstyle: many fixesFelix Moeller2012-11-021-1/+1
| |_|_|/ |/| | |
* | | | Revert "Remove old password check from changepassword and use verifyUser ↵Lukas Reschke2012-10-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | instead" This reverts commit e6b8153865a521a4750ec44016c5f22f453edfe1.
* | | | Remove old password check from changepassword and use verifyUser insteadLukas Reschke2012-10-151-3/+2
| | | |
* | | | fix a lot of small layout bugs and make the apps page overall prettier plus ↵Frank Karlitschek2012-10-081-0/+2
| | | | | | | | | | | | | | | | add ratings finally
* | | | Fix grammer and dont split translatable stringTom Needham2012-09-181-2/+2
| | | |
* | | | Merge branch 'master' of https://github.com/owncloud/coreSam Tuke2012-09-181-7/+26
|\ \ \ \ | | |_|/ | |/| |
| * | | makes cron config layout similar to the sharing oneAlessandro Cosentino2012-09-161-6/+21
| | | |
| * | | structure the settings options a bit better.Frank Karlitschek2012-09-161-1/+5
| | |/ | |/|
* / | Fixed bug with duplicate entries for installed 3rd party apps in settings->appsSam Tuke2012-09-181-1/+1
|/ / | | | | | | | | Added method getAppstoreApps to OC_App Added minor documentation
* | improve the documentation for the cron config a bitFrank Karlitschek2012-09-121-2/+2
| |
* | adding space between) and {Thomas Mueller2012-09-073-6/+6
| |
* | Disable asking to save password when adding users.Thomas Tanghus2012-09-051-1/+1
| |
* | fixing translation - thx eMerzhThomas Mueller2012-09-041-1/+1
| |
* | Update settings/templates/users.phpThomas Müller2012-09-041-5/+5
| | | | | | respect coding style
* | Update settings/templates/help.phpThomas Müller2012-09-041-3/+4
| | | | | | respect coding style
* | dont use shorthand php tagsRobin Appelman2012-09-011-1/+1
| |