c6075003a3
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[develop-olympus] Changelog: Changes since 3.0.8
[develop-olympus] Bumping version number for 3.0.9-RC1.
[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.
Conflicts:
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2011-06-12 22:27:29 +02:00
939bb65b17
[develop-olympus] Changelog: Changes since 3.0.8
2011-06-12 22:09:25 +02:00
b774520621
[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.
2011-06-12 19:45:01 +02:00
9a44b5a269
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10075] Rename nn- to Oleg in docs/AUTHORS.
[ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.
2011-06-11 03:03:18 +02:00
41250044f8
[ticket/10075] Rename nn- to Oleg in docs/AUTHORS.
...
PHPBB3-10075
2011-06-11 02:58:19 +02:00
eaf5ba7f50
[ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.
...
PHPBB3-10075
2011-06-11 02:58:08 +02:00
ec5ca9df6b
Merge branch 'ticket/haklop/10110' into develop-olympus
...
* ticket/haklop/10110:
[ticket/10110] Remove tab from empty lines
[ticket/10110] Enable the serialization and add a constant for defined the database
[ticket/10110] Update comments with a link to the phpredis extension
[ticket/10110] Add Redis ACM backend
2011-03-31 20:23:30 +02:00
9891f5a8d2
[ticket/10110] Enable the serialization and add a constant for
...
defined the database
PHPBB3-10110
2011-03-31 20:16:53 +02:00
fad7333e72
[ticket/10110] Add Redis ACM backend
...
PHPBB3-10110
2011-03-31 20:16:52 +02:00
0793b49212
[ticket/10107] Add cache to the enumeration, make statement more generic
...
PHPBB3-10107
2011-03-24 00:40:56 +01:00
03017a8946
[ticket/10107] Make it clear that provided httpd samples are not perfect
...
PHPBB3-10107
2011-03-24 00:35:05 +01:00
ae8131077e
[ticket/10107] Add a webserver section to docs/INSTALL.html
...
Explain what to do with lighttpd and nginx after installing phpBB on
one of those webservers.
PHPBB3-10107
2011-03-23 23:13:52 +01:00
b343920071
[ticket/10069] Improvements to sample nginx configuration.
...
Most of these were contributed by burningbunny:
https://github.com/burningbunny
PHPBB3-10069
2011-03-06 18:22:13 -05:00
f08cbc73de
Merge branch 'ticket/bantu/10075' into develop-olympus
...
* ticket/bantu/10075:
[ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
2011-03-06 14:53:47 -05:00
32af9e8865
[ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
...
Remove:
- A_Jelly_Doughnut
- dhn
- TerraFrost
Add:
- nn-
Move:
- Brainy
Rename:
- Brainy -> ckwalsh
PHPBB3-10075
2011-03-04 16:54:24 +01:00
36e96bbc6a
[ticket/10059] Fix two misspellings of consistent.
...
PHPBB3-10059
2011-03-01 19:53:12 -05:00
a970219d61
[ticket/10007] Add directive 'internal' to blocked folders in nginx config.
...
The "deny" and "access" directives are IP-based in general. Both directives
only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those
directives have no effect on IPv6 requests. Thus they do not block access for
IPv6 requests.
Adding the "internal" directive blocks external access in general (both IPv4
and IPv6) and makes the web server return a status code 404 (Not Found)
response.
See:
http://nginx.org/en/CHANGES
http://wiki.nginx.org/HttpCoreModule#internal
PHPBB3-10007
2011-01-24 17:35:10 +01:00
60eff4e59a
[ticket/9859] Remove the years from the copyright statements in docs files.
...
PHPBB3-9859
2011-01-16 18:50:53 +01:00
180e97abdc
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
...
PHPBB3-9859
2011-01-16 18:50:11 +01:00
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
cdeffdd59f
[ticket/9589] nginx.conf.sample -> nginx.sample.conf
...
PHPBB3-9589
2011-01-05 00:40:07 +01:00
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
b017f54ac9
[ticket/9921] Adding sample configuration file for the lighttpd webserver.
...
PHPBB3-9921
2010-12-01 18:39:50 +01:00
053cf790a9
[ticket/9924] Pass template instance into $template->display hook
...
PHPBB3-9924
2010-11-23 16:09:09 +01:00
af4c2a3eb1
[prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog
2010-11-19 13:22:36 +01:00
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
7b4cdc94a8
[develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.
2010-11-10 19:01:54 +01:00
88602d138c
[develop-olympus] Updating changelog with latest changes for 3.0.8-RC1
2010-11-10 16:29:34 +01:00
794c0f6b68
[develop-olympus] Bumping version number for 3.0.8-RC1.
2010-11-08 23:21:27 +01:00
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
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
c4dfe24fec
[ticket/9509] Remove section 8 from index
...
Thanks Andreas.
PHPBB3-9509
2010-10-19 13:52:00 +02:00
5ad5930c8f
[ticket/9509] Close anchor tag in coding guidelines
...
Thanks Andreas.
PHPBB3-9509
2010-10-19 13:45:50 +02:00
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
b27b69cf37
[ticket/9857] Remove visible $Id$ from phpBB/docs files.
...
PHPBB3-9857
2010-10-19 12:22:07 +02:00
b6a60d4d64
[ticket/9509] The VCS is now git
...
Partially cherry-picked from 163a0974
2010-10-18 13:17:16 +02:00
f6700815a8
[ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
...
PHPBB3-9804
2010-09-21 00:53:30 +02:00
4776952959
[ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
...
PHPBB3-9804
2010-09-12 19:19:30 +02:00
fdd04eef49
[ticket/9800] Update tracker URL in docs/README.html
...
PHPBB3-9800
2010-09-02 20:15:33 +02:00
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
58cb46d344
[ticket/9704] Fix minor typo in coding guidelines.
...
PHPBB3-9704
2010-07-08 09:15:03 +02:00
bb32daab63
[ticket/9589] Added sample nginx configuration file for phpbb.
...
PHPBB3-9589
2010-06-10 15:58:49 +02:00
6d7e30ae99
[develop-olympus] Move rxu and nickvergessen to Developers
2010-05-16 20:06:11 +02:00
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
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
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
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
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
39f26c5cfd
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047 )
2010-04-04 12:23:07 +02:00
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
