commit c910ce1cc6763bd31e7be6548f86b5c571c725c5Merge: df622a1 851bb9fAuthor: Andreas Fischer <bantu@phpbb.com>Date: Fri Apr 8 12:23:24 2011 +0200
Merge branch 'ticket/nickvergessen/10084' into develop-olympus
commit 2f6b046f4b2a95b8d0c459d6b1f10833ffe02473Merge: 200c7e3 1564c01Author: Igor Wiedler <igor@wiedler.ch>Date: Wed Mar 23 23:21:23 2011 +0100
Merge remote branch 'nickvergessen/ticket/10033' into develop-olympus
commit 4d231112b67ab714c96605233bee2ba67f56a2ebMerge: 3dd5c95 67fa589Author: Oleg Pudeyev <oleg@bsdpower.com>Date: Sat Mar 12 23:32:43 2011 -0500
Merge branch 'ticket/bantu/8802' into develop-olympus
commit 15a5d2c4bf87918dc85aec84b9017226834572d7Merge: 6944941 65020fdAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Mon Feb 21 20:47:31 2011 -0500
Merge branch 'ticket/nickvergessen/9675' into develop-olympus
commit 7442cd214ce2907ee67e79bf1e72ed0fc65f0cd5Merge: c298c9d 4c076bfAuthor: Andreas Fischer <bantu@phpbb.com>Date: Wed Dec 29 22:56:30 2010 +0100
Merge branch 'ticket/noxwizard/9905' into develop-olympus
commit 5d8ddc748000623b8e705b9434a4133cdd8fcc19Merge: b1c5942 e6a6f00Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 17:09:56 2010 +0100
Merge branch 'ticket/adamreyher/9928' into develop-olympus
commit 2c25a4bbb2d1dfa46275635f92beebbf7b68bf6dMerge: 500f0c0 b885821Author: Andreas Fischer <bantu@phpbb.com>Date: Mon Dec 13 15:03:54 2010 +0100
Merge branch 'ticket/rxu/9851' into develop-olympus
commit f6a48b495e6c65c1ca2535a7d9ed7b42332ea464Merge: 5a4938c 0491bfbAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Dec 5 14:10:49 2010 +0100
Merge branch 'ticket/adamreyher/9575' into develop-olympus
commit f204ce682565c87b041abafa69db76d698b60dfcMerge: d2778e6 7e934c6Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Nov 21 23:48:17 2010 +0100
Merge branch 'ticket/rmcgirr83/9897' into develop-olympus
commit e71911a8d27961d96e038c10041c74b54398b8f6Merge: 6f3b06e fd03ecaAuthor: Andreas Fischer <bantu@phpbb.com>Date: Mon Nov 8 12:48:19 2010 +0100
Merge branch 'ticket/sa007/9847' into develop-olympus
commit 6f3b06e2b5eec0eea6e55f5297c13f5472138857Merge: 0e731ca babfd00Author: Chris Smith <toonarmy@phpbb.com>Date: Mon Nov 8 01:43:54 2010 +0000
Merge branch 'ticket/sa007/9883' into develop-olympus
commit 6c04e7ed800542e180f9f550a7be4938d7551d68Merge: 371e54e 81ca3d2Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Nov 7 14:57:07 2010 +0100
Merge branch 'ticket/bantu/9880' into develop-olympus
commit 225482c06aaddcb05b018661717702aad6499fb5Merge: 48e6126 dd1532aAuthor: Nils Adermann <naderman@naderman.de>Date: Sun Nov 7 03:27:44 2010 +0100
Merge branch 'ticket/cs278/9752' into develop-olympus
commit 48e6126094f160729f5199a528a9690cbeff188cMerge: f7180f4 5d9a9d6 71b35a9Author: Nils Adermann <naderman@naderman.de>Date: Sun Nov 7 03:10:57 2010 +0100
Merge remote branches 'github-bantu/ticket/9879' and 'github-cs278/ticket/9095' into develop-olympus...
commit 46dbdfdef42f59a69d74a0cd35aeb025298be5c1Merge: e3b460a 857271eAuthor: Andreas Fischer <bantu@phpbb.com>Date: Sat Nov 6 18:47:19 2010 +0100
Merge branch 'ticket/igorw/9850' into develop-olympus
commit 832b09d60d79bf2795e1fbbfc7a0f4bda8b66931Merge: 52546e8 6236cfc 294c2c6 d6aa25eAuthor: Igor Wiedler <igor@wiedler.ch>Date: Mon Oct 25 22:08:37 2010 +0200
Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus...
commit a5bc7c90f552a65410a2b3abe05278346df387e5Merge: e87a8ef 257e264Author: Andreas Fischer <bantu@phpbb.com>Date: Mon Oct 25 21:52:50 2010 +0200
Merge branch 'ticket/rxu/9478' into develop-olympus
commit 2e26f86f0250528ff192e508b0fcac2a4f5f31d3Merge: 8ac0efc 59e62d2Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 17 21:35:41 2010 +0200
Merge branch 'ticket/bantu/9822' 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 59a0bcd38fb277875b0149ea736bcdc43e2d33a2Merge: d66aadc 54713dcAuthor: Andreas Fischer <bantu@phpbb.com>Date: Tue Aug 10 16:05:18 2010 +0200
Merge branch 'ticket/cs278/9761' into develop-olympus
commit fc25fe694afdab683789c9ed962c77558f85796cMerge: 0f5814a afff4f7Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Jul 22 01:41:02 2010 +0200
Merge branch 'ticket/bantu/9068' into develop-olympus
commit 0f5814ac4f857fb754d99da7b5016bcef2f7c8b5Merge: fada2ad 72dddf3Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Jul 22 01:40:44 2010 +0200
Merge branch 'ticket/bantu/9744' into develop-olympus
commit fada2ad261dc5306cec9282071b224b4139c92faMerge: cfe0b53 875fcdaAuthor: Andreas Fischer <bantu@phpbb.com>Date: Thu Jul 22 01:40:19 2010 +0200
Merge branch 'ticket/t-backoff/9099' into develop-olympus
commit e7e98f1de5c394859284f031f2a4f0c47534b311Merge: da256b3 954b3c3Author: Andreas Fischer <bantu@phpbb.com>Date: Wed Jul 14 20:55:49 2010 +0200
Merge branch 'ticket/nickvergessen/7720' into develop-olympus
commit 0c2512bea2c6929d41d1b3fa3ca4b04919205af9Merge: 6da582e ae967d1Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Jul 10 21:22:16 2010 +0200
Merge branch 'ticket/jellydoughnut/9650' into develop-olympus
commit 6da582e8be50fa7211706625402215f6f87ed48bMerge: 29716cd 097854cAuthor: Andreas Fischer <bantu@phpbb.com>Date: Thu Jul 8 20:02:34 2010 +0200
Merge branch 'ticket/p/9570' into develop-olympus
commit 8f91e6ce8be5e79b58c70dc212c5f83b0d8b7094Merge: a6b07ee 9e24993Author: Nils Adermann <naderman@naderman.de>Date: Sun May 30 14:58:30 2010 +0200
Merge branch 'ticket/nickvergessen/9135' into develop-olympus
commit b7afeadd6d213a7a300c38d2a0927d0f4623096fMerge: 26c2efc 327f9afAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 30 14:19:58 2010 +0200
Merge branch 'ticket/bantu/8792' into develop-olympus
commit ffe17fa4267e51ea498898f40f11e92fe662abc7Merge: a625e4b b302856Author: Nils Adermann <naderman@naderman.de>Date: Sun May 16 17:32:46 2010 +0200
Merge branch 'ticket/rxu/9567' into develop-olympus
commit fa5845e8c582c903ec1ef4a78844cb6d77cd96b7Merge: be1c550 58dc5a1Author: Nils Adermann <naderman@naderman.de>Date: Fri May 14 02:44:19 2010 +0200
Merge branch 'ticket/nickvergessen/7717' into develop-olympus
commit b3bbe576035da528aa6e52775cbc60133a8a2c90Merge: 5fb945c 3a515bfAuthor: Nils Adermann <naderman@naderman.de>Date: Fri May 14 01:41:31 2010 +0200
Merge branch 'ticket/p/6726' into develop-olympus
commit 72e2af08e14abd32aec0187fb644bfadd158fc79Merge: 24fda66 2f6c8a0Author: Nils Adermann <naderman@naderman.de>AuthorDate: Tue Mar 2 20:46:19 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Tue Mar 2 20:46:19 2010 +0100
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
#58285 - Language pack fix
Enter stage left: the INTTEXT token
Bugs #53925 and #52085 - Language fixes related to the quick reply settings
warn users about TEXT
Fix Bug #57825 - Small language correction for the FAQ page.
Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]
If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If youwant to try it on a current phpBB version you can apply the latest version of the patch to your board which...
Make those warnings more consistent.
No longer needed, as of r10480.
Add a warning for users of old PHP versions about ending support.
Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut
ACP usability
Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.
Authorised by: bantu
[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http
Fix bug #56075 - "Bump Topic" link not showing when bump interval is 0Authorised by: Jelly_Doughnut
Minor language change #56745
Add warnings about plaintext passwords
Adjust case and some language.
Fix Bug #55935, r10382
Integrate active topics feed. Some language adjustments and rearrangements.
Let's try this. Split feed user interface into sections. This partly reverts r10366.
Also change All Topics strings for the time being.
Change forums feed language strings to reflect what it is.
Split feed_limit into feed_limit_post and feed_limit_topic. Drop feed_overall_topics_limit.
Add ability to disable overall (aka board-wide) feed.
Adjustment of r10337 to properly fix the bug #23935Authorised by: naderman
Bug #23935 - help_faq , explanation of "How do I show an image below my username?" is wrong.Authorised by: bantu
#50985 - fix XML export of private messages sent to deleted users
#54855