Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed uneeded HTML tag | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
| | |||||
* | Add security section to admin menu | Lukas Reschke | 2013-01-11 | 1 | -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_api | Michael Gapczynski | 2013-01-04 | 2 | -0/+39 |
|\ | | | | | External API for ownCloud based on OCS | ||||
| * | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 4 | -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_api | Tom Needham | 2012-12-16 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 5 | -8/+26 |
| |\ \ \ | |||||
| * \ \ \ | Merge master into ocs_api | Tom Needham | 2012-10-28 | 2 | -3/+5 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-09-17 | 1 | -7/+26 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Fix merge conflicts | Tom Needham | 2012-09-13 | 6 | -37/+118 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Check if required apps are installed | Tom Needham | 2012-07-30 | 2 | -3/+22 |
| | | | | | | | | |||||
| * | | | | | | | Improve styling of permission request page | Tom Needham | 2012-07-30 | 1 | -12/+13 |
| | | | | | | | | |||||
| * | | | | | | | Basic template for authorising exernal apps with OAuth | Tom Needham | 2012-07-30 | 1 | -0/+19 |
| | | | | | | | | |||||
* | | | | | | | | omit type attribute in script tag to use fallback (text/javascript) | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #902 from owncloud/storage-wording | Thomas Müller | 2012-12-28 | 1 | -7/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Storage wording | ||||
| * | | | | | | | moving logic from template to the 'controller' | Thomas Müller | 2012-12-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THX @VicDeo | ||||
| * | | | | | | | enable translations for quota sizes 'none' and 'default' | Thomas Müller | 2012-12-20 | 1 | -4/+19 |
| | | | | | | | | |||||
| * | | | | | | | change technical expression 'Quota' to simpler 'Storage' | Jan-Christoph Borchardt | 2012-12-14 | 1 | -3/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | [l18n] fixing typos in source text | Thomas Müller | 2012-12-19 | 1 | -100/+121 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #961 from owncloud/check_locale | Frank Karlitschek | 2012-12-19 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | add a check and a warning if setlocale is working | ||||
| * | | | | | | | add a check and a warning if setlocale is working | Frank Karlitschek | 2012-12-19 | 1 | -0/+14 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #868 from owncloud/new_doc_system | Frank Karlitschek | 2012-12-19 | 1 | -33/+34 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | New doc system | ||||
| * | | | | | | | make it more readable | Frank Karlitschek | 2012-12-14 | 1 | -3/+7 |
| | | | | | | | | |||||
| * | | | | | | | show the link to the issue tracker only for Admins as discussed with Björn ↵ | Frank Karlitschek | 2012-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Jan. | ||||
| * | | | | | | | a bit more polish. We are getting there. | Frank Karlitschek | 2012-12-13 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | first version of the new documentation system integration. | Frank Karlitschek | 2012-12-12 | 1 | -33/+29 |
| |/ / / / / / | |||||
* | | | | | / | cleaning up the settings. standardize the format, add missing I10N and other ↵ | Frank Karlitschek | 2012-12-15 | 2 | -16/+21 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | small things. Yes. This is not perfect. But way better than before ;-) | ||||
* | | | | | | More style fixes | Bart Visscher | 2012-12-15 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Check if we have an array with data. Fix #487 | Victor Dubiniuk | 2012-12-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #330 from owncloud/check_connection | Thomas Müller | 2012-11-09 | 1 | -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 Karlitschek | 2012-11-08 | 1 | -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 Karlitschek | 2012-11-08 | 1 | -1/+6 |
|/ / / / / | |||||
* | | | | | Style: Remove all the dangling white spaces | Felix Moeller | 2012-11-04 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Checkstyle: Fix last six NewlineBeforeOpenBrace | Felix Moeller | 2012-11-04 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Checkstyle: many fixes | Felix Moeller | 2012-11-02 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Revert "Remove old password check from changepassword and use verifyUser ↵ | Lukas Reschke | 2012-10-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | instead" This reverts commit e6b8153865a521a4750ec44016c5f22f453edfe1. | ||||
* | | | | Remove old password check from changepassword and use verifyUser instead | Lukas Reschke | 2012-10-15 | 1 | -3/+2 |
| | | | | |||||
* | | | | fix a lot of small layout bugs and make the apps page overall prettier plus ↵ | Frank Karlitschek | 2012-10-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | add ratings finally | ||||
* | | | | Fix grammer and dont split translatable string | Tom Needham | 2012-09-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/owncloud/core | Sam Tuke | 2012-09-18 | 1 | -7/+26 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | makes cron config layout similar to the sharing one | Alessandro Cosentino | 2012-09-16 | 1 | -6/+21 |
| | | | | |||||
| * | | | structure the settings options a bit better. | Frank Karlitschek | 2012-09-16 | 1 | -1/+5 |
| | |/ | |/| | |||||
* / | | Fixed bug with duplicate entries for installed 3rd party apps in settings->apps | Sam Tuke | 2012-09-18 | 1 | -1/+1 |
|/ / | | | | | | | | | Added method getAppstoreApps to OC_App Added minor documentation | ||||
* | | improve the documentation for the cron config a bit | Frank Karlitschek | 2012-09-12 | 1 | -2/+2 |
| | | |||||
* | | adding space between) and { | Thomas Mueller | 2012-09-07 | 3 | -6/+6 |
| | | |||||
* | | Disable asking to save password when adding users. | Thomas Tanghus | 2012-09-05 | 1 | -1/+1 |
| | | |||||
* | | fixing translation - thx eMerzh | Thomas Mueller | 2012-09-04 | 1 | -1/+1 |
| | | |||||
* | | Update settings/templates/users.php | Thomas Müller | 2012-09-04 | 1 | -5/+5 |
| | | | | | | respect coding style | ||||
* | | Update settings/templates/help.php | Thomas Müller | 2012-09-04 | 1 | -3/+4 |
| | | | | | | respect coding style | ||||
* | | dont use shorthand php tags | Robin Appelman | 2012-09-01 | 1 | -1/+1 |
| | |