History | View | Annotate | Download (65.2 kB)
commit 7074d19c4087fab0e81a31bd806724d7eac7ef87Merge: ebc338b df622a1Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Apr 5 00:31:42 2011 +0200
Merge branch 'develop-olympus' into develop
commit 5c2243360d00b162b0f0f1547ee3742d13fb42cbMerge: 5debf22 1b97506Author: Joas Schilling <nickvergessen@gmx.de>Date: Thu Mar 3 00:26:32 2011 +0100
commit 90ccdb4dad6521fe0431ab1e9373c5821156bc46Merge: 34a1b04 30035b9Author: Andreas Fischer <bantu@phpbb.com>Date: Tue Dec 28 21:51:55 2010 +0100
Merge branch 'ticket/VSE/9532' 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 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 a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
commit e4ff780c1370d9f743da0fffc70b98be0c7cfe92Merge: c4a65a4 dbe8fb6Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Aug 28 23:34:18 2010 +0200
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
commit f8ff68f21d16d583da5c58cef4e961cc226926ddMerge: 3823549 925a135Author: Nils Adermann <naderman@naderman.de>Date: Sun Apr 4 15:33:48 2010 +0200
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
Fix Bug #51775 - Do not unlock topics with QuickReplyAuthorised by: AcydBurn
Fix Bug #51375 - Do not show QR in closed topics/forumsAuthorised by: AcydBurn
fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn
Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)
Sort private messages by message time and not message id. (Bug #50015)
Better tracking of global announcementsAuthorised by: AcydBurn
we are not supposed to know that yet
#47795
ok, i am very sorry, but this needs to be fixed.Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored....
populate who is online only where required
Fix bug #15729 - Global announcements marked as read if all new topics in forum are viewedAuthorised by: AcydBurn
#48985
Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
Fix bug #38055 - Post reply button shown in locked forum Authorised by: AcydBurn
QR changes to let the options actually work (we use checkboxes and isset())
Cache get_username_string() function calls on viewtopic.
fix r9775
Fix bug #37635 - Hide profile-icon from viewtopic-page if user has no permissions (subsilver2 only) - Patch by leviatan21
#47725
gah
And check for permissions...
oh, it is already in here
this is very much work in progress; please feel free to improve markup, usability and to introduce possible further settings (per forum, per user)
Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)
Fix a regression introduced in r9470 #45895
Fix bug #34295 - Move post bump information markup to the template.Authorised by: acydburn
#44875
Ability to vote in poll is now required for the ability to change existing vote. (Bug #38925)
Force full date on print view (Bug #40355)
also redirect to topic if forum id not specified (Bug #30855)
#43595 - we should also check for existing classes and use include instead of include_once (of course)
Redirect to relevant MCP page of multi-page topic if accessing quickmod tools (Split option for example)
- Add indicator to be used in code if session was created (user visits the site for the first time)- Correctly count topic views for guests visiting the website the first time by entering the topic directly (Bug #43445)
SQL optimisations
Bug #39735 - force full date on bump message
force full date on "edited by" line. ;)
Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)[a bit ugly, but retains backward compatibility]
Correctly display topic when start parameter is equal to the number of posts.
Round the displayed percentages in polls. #32375
some whitespace changes and opening files in binary mode in functions_messenger
nitpick alarm. ;)
Stop users from deleting posts after the edit time has passed or they have been locked. #19115
Display assigned rank/avatar for guests. (Bug #19155)
Fix Wrong table order in query obtaining posts if post id given. In MSSQL there is an sql error due to this bug.
Stop search bots incrementing topic views. #32675Use correct link for post author search. #32595Insert missing space. #32315
as per evil3, some more anti-CSRF
#31185
tiny alterations/bugfixes
corrected link for searching post author's other posts [Bug #26455]
#28025
#26605
Hiding everywhere little buggers, eh?
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)Although i somehow mistakingly got #20445 and #15249 into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445)Changing order for post review if more than one post affected (Bug #15249)...
- Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)- Allow editing usernames within database_update on username cleanup (Bug #18415)- Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)...
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
#15039
'1' might not have been a good choice
erm, switches could be more useful if not within a loop. ;) and :P
- Display "Return to" links on unwritable forums [Bug #14824]
dumdidum... sorry. ;)
some fixes. :P- language authors may review their email template files...
fixing some bugs
- BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments()- using \r on custom bbcodes to allow line breaks [Bug #10758]
- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode- highlight in post subjects and topic titles- language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED
some bugs fixed
kill the debug code
remove the need for filesorting
ok, remove this bugfix, it is giving more problems and is actually only relevant for splitting topics. :) We will see if we are able to incorporate it...
do not get too excited
two fixes
