1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

1100 Commits

Author SHA1 Message Date
Igor Wiedler
9329b16ab1 [task/acm-refactor] Refactor the ACM classes to have a common interface.
They are now refered to as cache drivers rather than ACM classes. The
additional utility functions from the original cache class have been
moved to the cache_service. The class loader is now instantiated without
a cache instance and passed one as soon as it is constructed to allow
autoloading the cache classes.

PHPBB3-9983
2011-01-09 23:49:35 +01:00
Igor Wiedler
14a84cf89c Merge branch 'develop-olympus' into develop
This commit also ports all ascraeus tests to the new format.

Conflicts:
	tests/all_tests.php
	tests/network/all_tests.php
	tests/request/all_tests.php
	tests/request/request_var.php
	tests/template/templates/includephp.html
2011-01-07 01:39:59 +01:00
Andreas Fischer
d968d35271 Merge branch 'ticket/bantu/9589' into develop-olympus
* ticket/bantu/9589:
  [ticket/9589] nginx.conf.sample -> nginx.sample.conf
2011-01-05 00:41:37 +01:00
Andreas Fischer
cdeffdd59f [ticket/9589] nginx.conf.sample -> nginx.sample.conf
PHPBB3-9589
2011-01-05 00:40:07 +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
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
053cf790a9 [ticket/9924] Pass template instance into $template->display hook
PHPBB3-9924
2010-11-23 16:09: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
af4c2a3eb1 [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog 2010-11-19 13:22:36 +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
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
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
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
Andreas Fischer
336dc70047 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9888] Update fails when Bing [Bot] was already added to the users table
  [develop-olympus] Bumping version number for 3.0.8-RC1.
  [ticket/9885] Fix extension group name updater. Loop through all languages.
  [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
  [ticket/9883] Change an American English spelling to British English.
  [task/phing-build] Correct the path for update package patch files.
2010-11-08 23:42:23 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Igor Wiedler
6bba279434 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
2010-10-19 14:04:22 +02:00
Igor Wiedler
d503272645 Merge branch 'ticket/bantu/9857' into develop-olympus
* ticket/bantu/9857:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
2010-10-19 14:03:44 +02:00
Igor Wiedler
2264f88d82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9509] Remove section 8 from index
  [ticket/9509] Close anchor tag in coding guidelines
  [ticket/9854] Revise docs/auth_api.html to add more methods
  [ticket/9509] The VCS is now git
  [ticket/9840] Display view unread posts link for guests.

Conflicts:
	phpBB/docs/coding-guidelines.html
2010-10-19 13:57:43 +02:00
Igor Wiedler
5f0f8c25be Merge branch 'ticket/igorw/9509' into develop-olympus
* ticket/igorw/9509:
  [ticket/9509] Remove section 8 from index
  [ticket/9509] Close anchor tag in coding guidelines
  [ticket/9509] The VCS is now git
2010-10-19 13:55:18 +02:00
Igor Wiedler
c4dfe24fec [ticket/9509] Remove section 8 from index
Thanks Andreas.

PHPBB3-9509
2010-10-19 13:52:00 +02:00
Igor Wiedler
5ad5930c8f [ticket/9509] Close anchor tag in coding guidelines
Thanks Andreas.

PHPBB3-9509
2010-10-19 13:45:50 +02:00
Josh Woody
9950fa34c6 [ticket/9854] Revise docs/auth_api.html to add more methods
Notably, the auth_admin class is still missing documentation.

PHPBB3-9854
2010-10-19 12:31:18 +02:00
Andreas Fischer
b27b69cf37 [ticket/9857] Remove visible $Id$ from phpBB/docs files.
PHPBB3-9857
2010-10-19 12:22:07 +02:00
Nils Adermann
b6a60d4d64 [ticket/9509] The VCS is now git
Partially cherry-picked from 163a0974.

PHPBB3-9509
2010-10-18 13:17:16 +02:00
Igor Wiedler
798e62b7b0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
  [ticket/9829] Fix error in recaptcha validation.
2010-10-04 17:25:00 +02:00
Igor Wiedler
f6700815a8 [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
PHPBB3-9804
2010-09-21 00:53:30 +02:00
Andreas Fischer
85e32046e3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9820] phpBB Debug Error when trying to post a new topic.
  [ticket/9162] BBCode in poll options is broken, when posting without question.
  [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
2010-09-14 16:58:35 +02:00
Andreas Fischer
4776952959 [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
PHPBB3-9804
2010-09-12 19:19:30 +02:00
Igor Wiedler
2baa8c61d1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/git-tools] Change the GNU --lines argument to the POSIX -l
  [task/git-tools] Solve dependency on the GNU wc --max-line-length option
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/9039] Make mssqlnative.php non-executable
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
  [ticket/9800] Update tracker URL in docs/README.html
2010-09-09 00:23:33 +02:00
Igor Wiedler
fdd04eef49 [ticket/9800] Update tracker URL in docs/README.html
PHPBB3-9800
2010-09-02 20:15:33 +02:00
Andreas Fischer
a2918fd98e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9704] Fix minor typo in coding guidelines.
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
  [ticket/9593] A readme file for unit tests and running unit tests.
  [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:10:17 +02:00
Andreas Fischer
29716cd5d5 Merge branch 'ticket/p/9589' into develop-olympus
* ticket/p/9589:
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:01:22 +02:00
Igor Wiedler
58cb46d344 [ticket/9704] Fix minor typo in coding guidelines.
PHPBB3-9704
2010-07-08 09:15:03 +02:00
Nils Adermann
d8ff43c080 [task/coding-guidelines] Class member qualifier guidelines
Use private, protected or public instead of var.
Use static public instead of public static.
Use class constants instead of define().

PHPBB3-9557
2010-07-04 16:16:13 +02:00
Nils Adermann
e7cc707931 [task/coding-guidelines] Added a section about class names.
The class naming / autoloading RFC is located on area51:
    http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=33237

PHPBB3-9557
2010-07-04 16:04:33 +02:00
Nils Adermann
163a0974a3 [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
- Class names need to be prefixed with phpbb_
- eval should not be used in any form
- there should be newlines at the end of file
- the closing php tag should be ommited
- array elements should always have a trailing comma
- the phpBB VCS is now git
- removed the coding guidelines changelog

PHPBB3-9557
2010-07-04 16:04:27 +02:00
Oleg Pudeyev
bb32daab63 [ticket/9589] Added sample nginx configuration file for phpbb.
PHPBB3-9589
2010-06-10 15:58:49 +02:00
Joas Schilling
6d7e30ae99 [develop-olympus] Move rxu and nickvergessen to Developers 2010-05-16 20:06:11 +02:00
Nils Adermann
560a1b3ad4 Merge branch 'bug/nickvergessen/9047' into develop-olympus
* bug/nickvergessen/9047:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:31:38 +02:00
Nils Adermann
1af1a96501 Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into develop-olympus
* feature/nickvergessen/unapproved-posts-in-feed:
  [feature/unapproved-posts-in-feed] Little changelog correction
  [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
  [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:29:45 +02:00
Nils Adermann
feb3987802 Merge branch 'bug/nickvergessen/9512' into develop-olympus
* bug/nickvergessen/9512:
  [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:26:50 +02:00
Nils Adermann
5b5463a981 Merge branch 'bug/nickvergessen/58745' into develop-olympus
* bug/nickvergessen/58745:
  [bug/58745] Correct changelog message
  [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:21:27 +02:00
Nils Adermann
f07c9fab2b Merge branch 'bug/nickvergessen/58695' into develop-olympus
* bug/nickvergessen/58695:
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)

Conflicts:
	phpBB/docs/CHANGELOG.html
2010-04-04 15:17:48 +02:00
Joas Schilling
39f26c5cfd [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047) 2010-04-04 12:23:07 +02:00
Joas Schilling
5f044a015e [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512) 2010-04-04 02:03:23 +02:00
Joas Schilling
19c7ea3c16 [feature/unapproved-posts-in-feed] Little changelog correction 2010-04-04 01:49:56 +02:00