History | View | Annotate | Download (137.6 kB)
commit 200c7e3c446aaa95397ac379f6eb2aa3b620ccd6Merge: 51fb493 4c3cc15Author: Oleg Pudeyev <oleg@bsdpower.com>Date: Tue Mar 22 21:25:00 2011 -0400
Merge branch 'ticket/igorw/10101' into develop-olympus
commit a3e8f74f7237f777c3fbf6ebee21aa87474b7196Merge: 784132d 48ba841Author: Igor Wiedler <igor@wiedler.ch>Date: Fri Mar 18 00:06:44 2011 +0100
Merge remote branch 'bantu/ticket/10100' into develop-olympus
commit c75b299eb160fd330476ea91d5236558a3a59ed7Merge: 4f1056a 64657eeAuthor: Andreas Fischer <bantu@phpbb.com>Date: Mon Mar 14 13:58:21 2011 +0100
Merge branch 'ticket/p/10096' into develop-olympus
commit bc42cbd94bddbdea2714978c11327b4897d6fd0fMerge: 2f57bfb 9a48045Author: Igor Wiedler <igor@wiedler.ch>Date: Sat Mar 12 18:11:47 2011 +0100
Merge branch 'ticket/bantu/10046' into develop-olympus
commit 33c38b37d886e56a60b5b144a1ab8eb8f42a8430Merge: aa8f400 9cdeb51Author: Andreas Fischer <bantu@phpbb.com>Date: Fri Mar 11 01:45:45 2011 +0100
Merge branch 'ticket/p/10016' into develop-olympus
commit 5c009997b2d8778537723e9e52575fb71c6f7675Merge: df78a3a 0e861acAuthor: Andreas Fischer <bantu@phpbb.com>Date: Thu Feb 10 00:20:34 2011 +0100
Merge branch 'ticket/p/10029' into develop-olympus
commit 42294907250e3e13c51e73c80aa7edbf2a8ec2edMerge: ba5c7d8 ab9d4b3Author: Nils Adermann <naderman@naderman.de>Date: Sun Jan 23 18:34:50 2011 +0100
Merge branch 'ticket/rxu/8779' into develop-olympus
commit ba5c7d8e63d97650989c2866c20c11f16f4c1128Merge: e9c584a 60eff4eAuthor: Nils Adermann <naderman@naderman.de>Date: Sun Jan 16 22:25:49 2011 +0100
Merge branch 'ticket/bantu/9859' into develop-olympus
commit e9c584af6aee4d8cec81ad1f96066860ea878644Merge: 1359cf6 2b37a4fAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Jan 16 20:25:06 2011 +0100
Merge branch 'ticket/bantu/9933' into develop-olympus
commit a469e804930e66c244da27deb4dc94b5e280659fMerge: 7a2348b 95cf47cAuthor: Andreas Fischer <bantu@phpbb.com>Date: Fri Jan 7 15:41:12 2011 +0100
Merge branch 'ticket/rxu/9933' into develop-olympus
commit e80253209fbb46964db10b18dc09b5bbdf9a46d8Merge: b86289f 5ec1c88Author: Andreas Fischer <bantu@phpbb.com>Date: Fri Dec 3 01:41:43 2010 +0100
Merge branch 'ticket/nickvergessen/9930' into develop-olympus
commit 371e54e0547829de06f5cf919a392e2407c54bc8Merge: 2e5217f 5cdf27eAuthor: Andreas Fischer <bantu@phpbb.com>Date: Sun Nov 7 13:12:16 2010 +0100
Merge branch 'ticket/paul999/9696' into develop-olympus
commit acabe5a0139057a7c5fb5a6b98cbfa1a06424e2eMerge: 6eb061e 880baceAuthor: Andreas Fischer <bantu@phpbb.com>Date: Mon Oct 18 11:50:51 2010 +0200
Merge branch 'ticket/rxu/9840' into develop-olympus
commit 9015e03d053ce84619a1081aaaab0ab9f48acb13Merge: 3465c5e f9764c6Author: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 22:34:48 2010 +0200
Merge branch 'ticket/bantu/9613' into develop-olympus
commit 6b5d5e1f63fc18e190afd17364701d9d690fe1a5Merge: d874c32 bef108aAuthor: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 22:24:49 2010 +0200
Merge branch 'ticket/bantu/9609' into develop-olympus
commit dfd3c4a5dfa7f2afceb3ab7b3fd12181ba66b10cMerge: 3c02a1c 5e33004Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:25:05 2010 +0200
Merge branch 'ticket/nickvergessen/9519' into develop-olympus
commit de8c334aeb0652b70c164e26056eddb164b29e86Merge: 0ee49ca e09d6c6Author: Chris Smith <toonarmy@phpbb.com>Date: Fri Aug 20 20:56:17 2010 +0100
Merge branch 'ticket/bantu/9780' into develop-olympus
commit f0aaecd6cc5f530b70d31a69b8d7305c98121d12Merge: 6343e67 24e2375Author: Josh Woody <a_jelly_doughnut@phpbb.com>Date: Thu Aug 19 10:53:10 2010 -0500
Merge branch 'ticket/bantu/9599' into develop-olympus
commit 25c579c00d25356afead09f13031e69e22f91324Merge: 46d2d97 c2b29c3Author: Josh Woody <a_jelly_doughnut@phpbb.com>Date: Thu Aug 19 09:11:36 2010 -0500
Merge branch 'ticket/bantu/9612' into develop-olympus
commit 64e6faa877af36f256da12d122e296f45706d359Merge: 59a0bcd 013f0b6Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Aug 10 16:05:45 2010 +0200
Merge branch 'ticket/cs278/9771' into develop-olympus
commit da256b33d93978f672aa07e0e94be585a7d1d2eeMerge: d869fc9 593e193Author: Andreas Fischer <bantu@phpbb.com>Date: Mon Jul 12 01:56:00 2010 +0200
Merge branch 'ticket/ckwalsh/9715' into develop-olympus
commit 08a34ebe948b4cc4b6f53572a65da23f55613181Merge: e46745e c40b2c7Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Jul 11 01:41:22 2010 +0200
Merge branch 'ticket/jellydoughnut/9629' into develop-olympus
commit 4eac7dca6df00a6378d84d5f87dae7604142ec06Merge: 876a6e4 d819ee3Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Jun 17 19:10:59 2010 +0200
Merge branch 'ticket/rxu/9606' into develop-olympus
commit 26c2efc083e7a32b2b7f1d517051ba521bd82472Merge: 6d7e30a c185e45Author: Nils Adermann <naderman@naderman.de>Date: Sat May 29 23:23:08 2010 +0200
Merge branch 'ticket/p/7782' into develop-olympus
commit e36da18b1c3a492df5789252600b1fc80805472aMerge: 321f7a9 82ce29aAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 16 19:25:41 2010 +0200
commit 273d926b08a93f2f8856169443961b6d683d6955Merge: e6b9178 1d2b4ffAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 16 18:38:28 2010 +0200
Merge branch 'ticket/aptx/9525' into develop-olympus
commit 478708346e2b046ae474ffb0c2e451a2690ddd2bMerge: fa5845e 032a9f5Author: Nils Adermann <naderman@naderman.de>Date: Fri May 14 02:46:56 2010 +0200
Merge branch 'ticket/bantu/9174' into develop-olympus
commit be1c5503443c305dd7f0064631dd73e37673fd7aMerge: 39770de 99482e9Author: Nils Adermann <naderman@naderman.de>Date: Fri May 14 02:39:17 2010 +0200
Merge branch 'ticket/bantu/9598' into develop-olympus
commit b111e4d9271fcb62f427a93707d8af894169df71Merge: d79cff2 6cfb4c8Author: Nils Adermann <naderman@naderman.de>
Merge branch 'bug/kellanved/58465' into develop-olympus
commit 4515a45e0cbad0ab2b670f7cf4374bcdad745652Merge: b3ff3be eca2db4Author: Nils Adermann <naderman@naderman.de>AuthorDate: Fri Mar 26 18:24:47 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Fri Mar 26 18:24:47 2010 +0100...
commit b3ff3be0dc56fdf32a7ae34b271b9016efa99c3bMerge: c6870ac b646860Author: Nils Adermann <naderman@naderman.de>AuthorDate: Thu Mar 18 22:13:25 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Thu Mar 18 22:13:25 2010 +0100...
commit 5d1d32a65bced82f068dbed497cc418eae5f4701Merge: 07fd270 9d00597Author: Nils Adermann <naderman@naderman.de>AuthorDate: Sat Mar 6 02:13:31 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Sat Mar 6 02:13:31 2010 +0100
Merge branch 'bug/evil3/51555' into develop-olympus
Bug #56965 - Allow redirect() to redirect across directories.
General errors can't be logged if there isn't a database connection, introduced in r9924 #57975
Fix Bug #57755 - Make user_email_hash() function independent from system's architecture.
Bug #57345 - No longer return the character O in generated random strings and passwords.
Trigger error right away if user has exceeded login attempts instead of asking for the authentication data over and over again without accepting it even if it is correct.
[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http
Integrate active topics feed. Some language adjustments and rearrangements.
Add ability to disable overall (aka board-wide) feed.
whitespaces
#54145 - move redirect parameter back to POST to avoid mod_security triggers
Restore user language choice to compiled stylesheets. Broken by r10008 #54035
[Fix] Force full date for board online record date.Authorised by: bantu
remove unnecessary query parts... thanks to asinshesq for pointing it out.
move up the feed code because MODs often use this location which results in more unneccessary conflicts.
Fix login for passworded forums - Bug #51265Was a regression from r10067 for Bug #50285
Fix bug #51075 introduced in r10121.
Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
Rename get_unread_topics_list() to get_unread_topics().Cleanup: Remove some stuff we no longer need.Related to report #46765
Fix retrieval of unread topics list. The old queries were too heavy, using temporary and filesort and actually only based on topics being retrieved before. Instead now use one query which is also a lot faster and yields the same results.
Adjustments to r10005: Use request_var() to get cookie data.Some more adjustments to get_unread_topics_list()Related to report: #46765
#50675 ; also don't reset the captcha on login
Fixed bugs #43145, #44375, #44415 and #43045
Save some calls here, since page_footer(true) gets called quite often.
Only embed cron.php if there is no cron lock present to reduce overhead. (Bug #45725 - Patch by TerryE)
Addition to r10060: Add function documentation.
Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)
Send service unavailable response code for E_USER_ERROR
Fix Bug #49195 - Queries on un-indexed column user_emailAdded function to generate email-hash.
Authorised by: AcydBurn
Change of r10055, which itself was:Adjustement for r10050, related to Bug #50185
Instead of S_TAB_INDEX we now use a method suggested by nickvergessen - we simply DEFINE the tabindex for the captcha depending on where it is included.
One more unread posts search adjustment.Authorised by: AcydBurn
Adjustement for r10050, related to Bug #50185Use internal S_TAB_INDEX instead of DEFINE
More unread posts search adjustment.Authorised by: AcydBurn
Better tracking of global announcementsAuthorised by: AcydBurn
i know, i know, no need to hrm me. :P - r10009
no need to call generate_board_url() twice - r10008
Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.
Add unread posts search support for cookie-based trackingAuthorised by: AcydBurn
i am very very sorry for this hackish approach...(ability to skip add_log calls)
Fix r9961 - populate who is online only where required
r9961 - also set item name in page_header parameter for better implementation of #31975