diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-12-13 17:14:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-12-13 17:14:36 +0100 |
| commit | 18f74a7e10b01f4f6f916e2baa814b27b31fc8a9 (patch) | |
| tree | c7068f8e9cb82587f97adb19a390cb69631b9b9f /phpBB/adm | |
| parent | adfa1656fb9d8b5bb601af1d7a6720884954d87a (diff) | |
| parent | 5d8ddc748000623b8e705b9434a4133cdd8fcc19 (diff) | |
| download | forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.gz forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.bz2 forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.tar.xz forums-18f74a7e10b01f4f6f916e2baa814b27b31fc8a9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9851] "Search new posts" should require login.
[task/phpdoc] Added a phpdoc task to the build process
[task/phpdoc] Added a configuration file for phpDocumentor.
[feature/acm-wincache] Adding caching module for WinCache's User Cache.
[ticket/9939] Fix JavaScript error in admin recaptcha template
[ticket/9575] Also change 'administrate' to 'administer' in templates
[ticket/8736] guest can have 255 chars long username
[ticket/9928] Do not link "login to your board" to the "send statistics" page.
[ticket/9575] Change 'administrate' to 'administer'
[ticket/9921] Adding sample configuration file for the lighttpd webserver.
[ticket/9932] Add the Bing bot when converting
[ticket/9930] Redirect failes with open_basedir enabled.
[ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/captcha_recaptcha.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 9f9216a068..d27cea28f7 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -58,7 +58,7 @@ /** * Init the wanted display functionality if javascript is enabled. - * If javascript is not available, the user is still able to properly administrate. + * If javascript is not available, the user is still able to properly administer. */ onload = function() { diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 5bde4008ad..cb4361dd6f 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -77,7 +77,7 @@ /** * Init the wanted display functionality if javascript is enabled. - * If javascript is not available, the user is still able to properly administrate. + * If javascript is not available, the user is still able to properly administer. */ onload = function() { diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 586c494868..d3038fd714 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -5,7 +5,7 @@ // <![CDATA[ var RecaptchaOptions = { lang : '{LA_RECAPTCHA_LANG}', - theme : 'clean', + theme : 'clean' }; // ]]> </script> |