History | View | Annotate | Download (140.3 kB)
commit 352ed5acf89331548e6cb1a5a32353364942f47cMerge: 5cc8617 200c7e3Author: Oleg Pudeyev <oleg@bsdpower.com>Date: Tue Mar 22 21:25:14 2011 -0400
Merge branch 'develop-olympus' into develop
commit df8b852709308139ac212d03519ee4b9d4879fa6Merge: 0e9b755 a3e8f74Author: Igor Wiedler <igor@wiedler.ch>Date: Fri Mar 18 00:06:53 2011 +0100
commit 7588b4352638a3bb7fa0cff7ef9d78c8668d0905Merge: 089e3a9 c75b299Author: Andreas Fischer <bantu@phpbb.com>Date: Mon Mar 14 13:58:57 2011 +0100
commit a27a39ebed0133dd88322a2c3a9e7228c657a703Merge: df096b6 bc42cbdAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sat Mar 12 18:16:10 2011 +0100
commit ffb697f7d0d4ee8b3d023d67452bc0e0cbfe42faMerge: a0930e7 458b884Author: Nils Adermann <naderman@naderman.de>Date: Mon Mar 7 19:19:49 2011 +0100
Merge branch 'ticket/naderman/10080' into develop
commit 04bd2e640e771948671ab6554df8962de980f511Merge: 8f0e9ae 1fd8d6dAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Feb 13 15:54:42 2011 +0100
Merge branch 'feature/system-cron' into develop
commit 2e31dd56dfd9f3cf109fce99270b2961119ccdc0Merge: 53b97b5 0588ba2Author: Igor Wiedler <igor@wiedler.ch>Date: Sat Feb 12 14:56:05 2011 +0100
commit 1196b96462e519271d01bc1821aafc35aafc0fd8Merge: 40cf8b1 4229490Author: Nils Adermann <naderman@naderman.de>Date: Sun Jan 23 18:35:10 2011 +0100
commit cde423591e90e58361b17f29f6841887573a0fa8Merge: 656f18d ba5c7d8Author: Nils Adermann <naderman@naderman.de>Date: Sun Jan 16 22:26:27 2011 +0100
commit 656f18d3af1168b15648e77005345698c3a507b5Merge: 78df30f e9c584aAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Jan 16 20:28:06 2011 +0100
commit a3673789402eae83b94860c87747091125701f78Merge: 30dacf8 f115795Author: Andreas Fischer <bantu@phpbb.com>Date: Wed Jan 12 01:49:44 2011 +0100
Merge branch 'task/naderman/config-class' into develop
commit 1c95101284d1545443bf6070d2f9dbc2880165f6Merge: 08f6a12 a469e80Author: Andreas Fischer <bantu@phpbb.com>Date: Fri Jan 7 15:58:10 2011 +0100
commit da4617b14b11ade6f664b8c1ab94e3aeb5b7428dMerge: 979158f 3c713b5Author: Igor Wiedler <igor@wiedler.ch>Date: Mon Jan 3 00:24:55 2011 +0100
Merge branch 'ticket/bantu/9746' into develop
commit 6e51e52f0c0f34a5dea8e3e1730de039ed5895e6Merge: 90ccdb4 6b4d0a2Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Dec 28 22:40:09 2010 +0100
Merge branch 'ticket/igorw/9574' into develop
commit 442fc61be77787c211650f21b2fb485f5e6ffcf0Merge: 8b9b1f1 b08e0d1Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Dec 16 02:22:17 2010 +0100
Merge branch 'feature/igorw/request-class' into develop
commit 18f74a7e10b01f4f6f916e2baa814b27b31fc8a9Merge: adfa165 5d8ddc7Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 17:14:36 2010 +0100
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
commit f15446fe39734ae6e6314912055d95f3d6d60e6bMerge: bcdca11 6c04e7eAuthor: Andreas Fischer <bantu@phpbb.com>Date: Sun Nov 7 15:00:02 2010 +0100
commit 2264f88d8226336584b62d14e36f44b33712ceb0Merge: 6213188 5f0f8c2Author: Igor Wiedler <igor@wiedler.ch>Date: Tue Oct 19 13:57:43 2010 +0200
commit a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
commit e35711ddde8f5e9f94d4b5145662877619ceecd4Merge: 4d5d500 46810f8Author: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 22:42:32 2010 +0200
commit e4ff780c1370d9f743da0fffc70b98be0c7cfe92Merge: c4a65a4 dbe8fb6Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:34:18 2010 +0200
commit dfa53bfe9a21e25ae86ff954e2d9da8bdec6c317Merge: 2e787fa 2223221Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Aug 22 17:48:44 2010 +0200
Merge branch 'ticket/p/6855' into develop
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
commit eeb65d2958fcccc1fd2ccfbf9e154b4e30052977Merge: a2918fd 2d9aa45Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Jul 11 01:54:03 2010 +0200
commit dea1d660fb63b07451f1a43310de359251462644Author: Nils Adermann <naderman@naderman.de>Date: Fri Jun 25 14:38:53 2010 +0200
[feature/auto-loading] Added autoloader to common and ensured compatability
The autoloader is registered in install without caching, since caching is set...
commit 389c24044a189aea5ae936c21b8df39cbb1b77f6Merge: cf1b020 6d24809Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Jun 17 19:18:18 2010 +0200
commit 2cf57822bb4607d595affaef2264f064cb984c55Merge: 904d204 8f91e6cAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 30 14:59:06 2010 +0200
commit 591217a903460a81df4c19850f5d99c2e9d10b1dMerge: cf89952 0bf2c3eAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 16 19:52:36 2010 +0200
commit cf8995210625b31988dd9ae98435bf183ee799e3Merge: 0ed69d9 4787083Author: Nils Adermann <naderman@naderman.de>Date: Fri May 14 02:51:56 2010 +0200
commit 382354925d59e3da12781f8877ab0a70d0c434d9Merge: d702dba fa9510bAuthor: Nils Adermann <naderman@naderman.de>Date: Sun Apr 4 15:04:56 2010 +0200
commit d702dba75e14a909c165c7ca7a6a87207dcadaafMerge: 2c635b4 d79cff2Author: Nils Adermann <naderman@naderman.de>Date: Fri Mar 26 18:28:48 2010 +0100
commit 797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6Merge: 693a2dc 568fb83Author: Nils Adermann <naderman@naderman.de>AuthorDate: Sat Mar 6 03:33:16 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Sat Mar 6 03:33:16 2010 +0100
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
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