1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

10172 Commits

Author SHA1 Message Date
Andreas Fischer
442fc61be7 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST
2010-12-16 02:22:17 +01:00
Nils Adermann
8b9b1f1187 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9924] Pass template instance into $template->display hook
2010-12-13 17:22:05 +01:00
Nils Adermann
5e258a0a90 Merge branch 'ticket/igorw/9924' into develop-olympus
* ticket/igorw/9924:
  [ticket/9924] Pass template instance into $template->display hook
2010-12-13 17:21:57 +01:00
Nils Adermann
18f74a7e10 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
2010-12-13 17:14:36 +01:00
Nils Adermann
5d8ddc7480 Merge branch 'ticket/adamreyher/9928' into develop-olympus
* ticket/adamreyher/9928:
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
2010-12-13 17:09:56 +01:00
Nils Adermann
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
Andreas Fischer
7c9002398a Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympus
* feature/ChrisTX/acm-wincache:
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
2010-12-13 15:05:22 +01:00
rxu
b88582199d [ticket/9851] "Search new posts" should require login.
The newposts search uses user_lastvisit, so it should require user to log in.

PHPBB3-9851
2010-12-13 14:58:43 +01:00
ChrisTX
d7287ec633 [feature/acm-wincache] Adding caching module for WinCache's User Cache.
PHPBB3-9942
2010-12-13 00:14:57 +01:00
Igor Wiedler
7dd06e8113 [ticket/9939] Fix JavaScript error in admin recaptcha template
PHPBB3-9939
2010-12-05 14:35:19 +01:00
Igor Wiedler
f6a48b495e Merge branch 'ticket/adamreyher/9575' into develop-olympus
* ticket/adamreyher/9575:
  [ticket/9575] Also change 'administrate' to 'administer' in templates
  [ticket/9575] Change 'administrate' to 'administer'
2010-12-05 14:10:49 +01:00
Igor Wiedler
0491bfbc2d [ticket/9575] Also change 'administrate' to 'administer' in templates
PHPBB3-9575
2010-12-05 14:09:39 +01:00
RMcGirr83
7a3d6a8168 [ticket/8736] guest can have 255 chars long username
when you post as a guest (anonymous) you can fill the field username with 255
chars. that will destroy the prosilver and subsilver2 style at viewtopic.
settings for username in ACP: 6-16 Chars

PHPBB3-8736
2010-12-04 20:04:10 +01:00
Adam Reyher
e6a6f00562 [ticket/9928] Do not link "login to your board" to the "send statistics" page.
PHPBB3-9928
2010-12-03 02:15:50 +01:00
Andreas Fischer
e80253209f Merge branch 'ticket/nickvergessen/9930' into develop-olympus
* ticket/nickvergessen/9930:
  [ticket/9930] Redirect failes with open_basedir enabled.
2010-12-03 01:41:43 +01:00
Andreas Fischer
b86289fdd3 Merge branch 'ticket/igorw/9910' into develop-olympus
* ticket/igorw/9910:
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-03 01:40:38 +01:00
Andreas Fischer
59d4e905ba Merge branch 'ticket/igorw/9932' into develop-olympus
* ticket/igorw/9932:
  [ticket/9932] Add the Bing bot when converting
2010-12-03 01:38:34 +01:00
Adam Reyher
8b3d068e83 [ticket/9575] Change 'administrate' to 'administer'
PHPBB3-9575
2010-12-01 14:14:46 -05:00
Ingo Migliarina
b017f54ac9 [ticket/9921] Adding sample configuration file for the lighttpd webserver.
PHPBB3-9921
2010-12-01 18:39:50 +01:00
Igor Wiedler
bd579c8374 Merge branch 'develop-olympus' into develop 2010-11-29 20:16:45 +01:00
Richard Foote
23765fa668 [ticket/9932] Add the Bing bot when converting
PHPBB3-9932
2010-11-29 08:33:10 +01:00
Joas Schilling
5ec1c88795 [ticket/9930] Redirect failes with open_basedir enabled.
Open_basedir does not allow file_exists() for "." and directories without a
trayling-slash. Therefor we must append it on the check.

PHPBB3-9930
2010-11-25 23:29:12 +01:00
Igor Wiedler
053cf790a9 [ticket/9924] Pass template instance into $template->display hook
PHPBB3-9924
2010-11-23 16:09:09 +01:00
Igor Wiedler
f204ce6825 Merge branch 'ticket/rmcgirr83/9897' into develop-olympus 2010-11-21 23:48:17 +01:00
RMcGirr83
7e934c6362 [ticket/9897] A few language fixes
PHPBB3-9897
2010-11-21 23:46:09 +01:00
Igor Wiedler
217e77d16b [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
PHPBB3-9910
2010-11-21 23:18:09 +01:00
Nils Adermann
67593824d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
2010-11-20 17:56:17 +01:00
Nils Adermann
d2778e67ea Merge branch 'prep-release-3.0.8' into develop-olympus
* prep-release-3.0.8:
  [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2010-11-20 17:55:56 +01:00
Nils Adermann
af4c2a3eb1 [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog 2010-11-19 13:22:36 +01:00
Nils Adermann
2831a3a9a9 Merge branch 'ticket/9903' into prep-release-3.0.8
* ticket/9903:
  [ticket/9903] Script for detecting potentially malicious flash bbcodes
  [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
2010-11-19 11:33:14 +01:00
Igor Wiedler
49b639dd95 [ticket/9903] Script for detecting potentially malicious flash bbcodes
PHPBB3-9903
2010-11-19 11:31:00 +01:00
Andreas Fischer
635752fafc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
  [develop-olympus] Revert accidental revert of db update lang fix and version
  [develop-olympus] Remove accidentally added trailing newlines.
  [develop-olympus] Incrementing the version number to 3.0.9-dev.
2010-11-18 14:05:56 +01:00
Andreas Fischer
fbca4e9c7b Merge branch 'prep-release-3.0.8' into develop-olympus
* prep-release-3.0.8:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
2010-11-18 14:04:57 +01:00
Andreas Fischer
d917b2d737 Merge branch 'ticket/igorw/9509' into prep-release-3.0.8
* ticket/igorw/9509:
  [ticket/9509] Fix a typo and wrong period placement
2010-11-18 14:01:38 +01:00
RMcGirr83
6c45754a43 [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
Change recaptcha theme from default to 'clean' in the ACP to better match
the administration control panel.

Follow up to d6aa25ede149a2d483b064f5ce96abcf49458ee3.

PHPBB3-9899
2010-11-18 13:59:49 +01:00
Igor Wiedler
859149f5c3 [ticket/9509] Fix a typo and wrong period placement
Thanks to Michael C. for spotting this.

PHPBB3-9509
2010-11-18 13:55:39 +01:00
Ruslan Uzdenov
291a1fff1f [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.
Fix XSS in Flash-BBcode by validating that the supplied argument is a URL.

PHPBB3-9903
2010-11-18 13:37:56 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Nils Adermann
b02cec86d4 [develop-olympus] Revert accidental revert of db update lang fix and version
Really not my day, is it?
2010-11-11 12:13:51 +01:00
Nils Adermann
396af3853f [develop-olympus] Remove accidentally added trailing newlines. 2010-11-11 12:07:45 +01:00
Nils Adermann
87aa611a8e [develop-olympus] Incrementing the version number to 3.0.9-dev. 2010-11-11 11:49:17 +01:00
Nils Adermann
2e51e68ca1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.
  [ticket/9140] Check current board version in incremental update packages
  [ticket/9891] Updater drops language-selection after database-update
2010-11-10 19:02:35 +01:00
Nils Adermann
7b4cdc94a8 [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes. 2010-11-10 19:01:54 +01:00
Nils Adermann
cdb57aaa64 Merge branch 'ticket/nickvergessen/9140' into develop-olympus
* ticket/nickvergessen/9140:
  [ticket/9140] Check current board version in incremental update packages
2010-11-10 19:00:45 +01:00
Joas Schilling
4340e5a217 [ticket/9140] Check current board version in incremental update packages
We need to use $this->current_version in this case instead of
$config['version']. Otherwise the message will be displayed after the database
got updated from database_update.php. Using PHPBB_VERSION from
includes/constants.php is not the right selection either, because than the
message is displayed after the files got updated and are checked one last time.

PHPBB3-9140
2010-11-10 18:26:02 +01:00
Joas Schilling
9d55794e33 [ticket/9891] Updater drops language-selection after database-update
PHPBB3-9891
2010-11-10 17:56:05 +01:00
Nils Adermann
19155c7827 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1
2010-11-10 16:31:30 +01:00
Nils Adermann
88602d138c [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1 2010-11-10 16:29:34 +01:00
Nils Adermann
42457719c2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
2010-11-10 16:17:40 +01:00
Nils Adermann
2ed9b3e1d5 Merge branch 'ticket/nickvergessen/9886' into develop-olympus
* ticket/nickvergessen/9886:
  [ticket/9886] Update fails on PostgreSQL because of an error in _add_module
2010-11-10 16:16:16 +01:00