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
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
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
19c7ea3c16
[feature/unapproved-posts-in-feed] Little changelog correction
2010-04-04 01:49:56 +02:00
46f85329da
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
2010-04-04 01:34:47 +02:00
738914ac83
[bug/58745] Correct changelog message
2010-04-03 13:11:23 +02:00
492d86000e
[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745 )
2010-04-03 13:05:44 +02:00
8d0c0dcbcd
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695 )
2010-04-03 12:55:31 +02:00
a2545d1203
Merge branch 'bug/bantu/9108' into develop-olympus
...
* bug/bantu/9108:
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-04-01 21:27:19 +02:00
f97d0e0195
Merge branch 'bug/nickvergessen/59135' into develop-olympus
...
* bug/nickvergessen/59135:
[bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-04-01 18:55:16 +02:00
2b696cc632
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425 )
...
The order in the FROM clause is important.
The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN.
This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
2010-04-01 13:14:58 +02:00
e35392cb4f
Merge branch 'bug/kellanved/59425' into develop-olympus
...
* bug/kellanved/59425:
[bug/59425] Correctly check for double inclusion in captcha garbage collection
2010-03-28 15:09:09 +02:00
9be61f9e53
[bug/59425] Correctly check for double inclusion in captcha garbage collection
...
The check to avoid the double inclusion of the captcha factory class in the
garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory".
TerryE pointed the problem out, thanks!
2010-03-28 14:37:31 +02:00
6cfb4c82dd
[bug/58465] The redirect hidden field is now XHTML conform
...
The result of build_url was falsely un-entitized.
2010-03-28 14:17:42 +02:00
c6870ac3fe
Merge branch 'bug/cs278/58025' into develop-olympus
...
* bug/cs278/58025:
[bug/58025] Search robots are now redirected if they send a SID in the request
Conflicts:
phpBB/docs/CHANGELOG.html
2010-03-18 22:10:31 +01:00
f7c41e1db7
[feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
2010-03-18 17:09:18 +01:00
10f81ee79f
Merge branch 'bug/jellydoughnut/58415' into develop-olympus
...
* bug/jellydoughnut/58415:
Allow setting parent forums regardless of permission settings. (Bug #58415 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-03-17 18:05:17 +01:00
144effd74c
Allow setting parent forums regardless of permission settings. (Bug #58415 )
2010-03-17 10:04:07 -05:00
4349bec316
[bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135 )
...
introduced in r10496 and r10360/r10361
2010-03-13 11:37:06 +01:00
d07e152ea7
[bug/58025] Search robots are now redirected if they send a SID in the request
...
Previously search robots could stumble upon a board link somewhere on the web
containing a SID they'd follow it and end up indexing that page with the SID
in the request URI, this fix prevents that by redirecting them to the same URI
just without the SID.
2010-03-13 02:15:39 +00:00
23141a2c51
Merge branch 'bug/dpward/58755' into develop-olympus
2010-03-07 21:56:48 +01:00
62e0c325b4
Merge branch 'bug/evil3/12531' into develop-olympus
2010-03-07 21:56:07 +01:00
c52a7e9a08
Adding the bugfix for #58755 to the changelog.
2010-03-07 21:54:56 +01:00
5cfa354433
[bug/12531] proposed solution for bug #12531
2010-03-06 17:57:27 +01:00
568fb83373
Merge branch 'master' into develop-olympus
2010-03-06 02:29:04 +01:00
5d1d32a65b
Merge branch 'bug/evil3/51555' into develop-olympus
2010-03-06 02:13:31 +01:00
9d005973b0
[bug/51555] proposed fix for bug #51555
2010-03-06 01:39:44 +01:00
0307d1f4aa
Oops, forgot the changelog for #57105
2010-03-06 01:36:23 +01:00
39490abfff
Incrementing the version number to 3.0.7-PL1
2010-03-05 21:09:37 +01:00
c8fd9f4266
Mark the bugfix #58595 as a security fix
2010-03-05 21:00:13 +01:00
b1ab74b043
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 20:59:20 +01:00
f0a82396d4
Mark the bugfix #58595 as a security fix
2010-03-05 20:56:06 +01:00
7f991e8480
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 18:51:30 +01:00
b853845069
Oops, forgot the changelog for #57105
2010-03-02 13:01:05 -08:00
72e2af08e1
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
2010-03-02 20:46:19 +01:00
24fda6671d
Merging master after 3.0.7 release into develop-olympus to make sure there are no inconsistencies.
2010-03-02 20:33:50 +01:00
2f6c8a0164
Missed one half of bug #54855 whoops
2010-03-02 19:30:37 +00:00
cdc96b0c7d
Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. Patch by nn-
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:51:35 +00:00
27fa1a69e8
Merge r10537 into 3.0.7. branch
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10538 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:42:25 +00:00
e57981d1f5
Fix Bug #57875 - We have to add the paragraph tags there. Patch by HardStyle, Regression from r10096.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10537 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:33:06 +00:00
9e64c3bd84
Bug #56965 - Allow redirect() to redirect across directories.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10536 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 00:18:30 +00:00
82219d51c2
Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-24 00:08:13 +00:00
8f5155d272
Quick reply enable button was merged into 3.0.7: r10491, r10492 and r10529
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10530 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:49:15 +00:00
