aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10510] Moved a $user->lang call into the function.Callum Macrae2012-03-172-4/+4
| | | | PHPBB3-10510
* [ticket/10510] Shortened an if statement.Callum Macrae2012-03-171-1/+1
| | | | | | Replaced an isset() and var check with a !empty. PHPBB3-10510
* [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.Callum Macrae2012-03-172-3/+3
| | | | PHPBB3-10510
* [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.Callum Macrae2012-03-172-91/+38
| | | | PHPBB3-10510
* [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.Callum Macrae2012-03-172-2/+2
| | | | | | | It was referring to some template variables that were removed in a previous commit. Changed! PHPBB3-10510
* [ticket/10510] Moved quick-mod tools into a loop.Callum Macrae2012-03-173-39/+99
| | | | PHPBB3-10510
* [ticket/10510] Updated quick-mod conditional in subsilver2.Callum Macrae2012-03-041-1/+1
| | | | | | | It was still trying to use the old conditional, which was referring to a variable which had been removed. PHPBB3-10510
* [ticket/10510] Moved quick-mod tools markup to template.callumacrae2012-03-043-18/+54
| | | | PHPBB3-10510
* Merge branch 'develop-olympus' into developAndreas Fischer2012-03-021-0/+14
|\ | | | | | | | | | | * develop-olympus: [ticket/8652] Comment for also updating forum watch table in user_notification. [ticket/8652] Sending 2 emails on 2 replies
| * Merge branch 'ticket/bantu/8652' into develop-olympusAndreas Fischer2012-03-021-0/+14
| |\ | | | | | | | | | | | | | | | * ticket/bantu/8652: [ticket/8652] Comment for also updating forum watch table in user_notification. [ticket/8652] Sending 2 emails on 2 replies
| | * [ticket/8652] Comment for also updating forum watch table in user_notification.Andreas Fischer2012-03-021-2/+10
| | | | | | | | | | | | PHPBB3-8652
| | * [ticket/8652] Sending 2 emails on 2 repliesBruno Ais2012-03-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for the problem of the system sending 2 emails when there are 2 replies to a topic where the user is subscribed in a topic and the forum that contains the topic. This simple fix seems to solve the problem. In simple tests I made it shows it does. PHPBB3-8652
* | | Merge remote-tracking branch 'unknownbliss/ticket/10680' into developDavid King2012-02-291-0/+1
|\ \ \
| * | | [ticket/10680] Add /phpBB/ext/* to .gitignoreMichael Cullum2012-02-291-0/+1
|/ / / | | | | | | | | | PHPBB3-10680
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10639] Do not allow negative post count as rank's minimum posts
| * | Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympusAndreas Fischer2012-02-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10639: [ticket/10639] Do not allow negative post count as rank's minimum posts
| | * | [ticket/10639] Do not allow negative post count as rank's minimum postsJoas Schilling2012-02-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10639
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10672' into developAndreas Fischer2012-02-282-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10672: [ticket/10672] Fix total post count language string in statistics and feed
| * | | | [ticket/10672] Fix total post count language string in statistics and feedJoas Schilling2012-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10672
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-286-9/+17
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9220] Remove margin on table.table1 so it's centered in the blue box. Conflicts: phpBB/styles/prosilver/template/memberlist_leaders.html
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympusAndreas Fischer2012-02-286-10/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9220: [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
| | * | | | [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.Joas Schilling2012-02-276-10/+18
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here was, that we use width: 100% in combination with the negative margin. This causes the element to be just moved to the side, so it's not centered anymore. width: auto would fix this, but it causes strange behaviour on IE and looks even more ugly. So I decided to just remove the margin at all. The border is now 1px thicker for all sides. PHPBB3-9220
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-263-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10453] Fixing spacing
| * | | | Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympusAndreas Fischer2012-02-263-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10453: [ticket/10453] Fixing spacing
| | * | | | [ticket/10453] Fixing spacingVjacheslav Trushkin2012-02-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing spacing PHPBB3-10453
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-261-12/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10532] Remove unnecessary parentheses around calculations of addition. [ticket/10532] Remove one unnecessary level of if block nesting. [ticket/10532] Get rid of inline calculation of $start, remove duplicated check [ticket/10532] Put $total_match_count assignment onto its own line. [ticket/10532] Adjust total match count and limit [ticket/10532] Fix $start out of range for pre-made searches Conflicts: phpBB/search.php
| * | | | | Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympusAndreas Fischer2012-02-261-12/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10532: [ticket/10532] Remove unnecessary parentheses around calculations of addition. [ticket/10532] Remove one unnecessary level of if block nesting. [ticket/10532] Get rid of inline calculation of $start, remove duplicated check [ticket/10532] Put $total_match_count assignment onto its own line. [ticket/10532] Adjust total match count and limit [ticket/10532] Fix $start out of range for pre-made searches
| | * | | | [ticket/10532] Remove unnecessary parentheses around calculations of addition.Andreas Fischer2012-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | [ticket/10532] Remove one unnecessary level of if block nesting.Andreas Fischer2012-02-261-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | [ticket/10532] Get rid of inline calculation of $start, remove duplicated checkAndreas Fischer2012-02-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | [ticket/10532] Put $total_match_count assignment onto its own line.Andreas Fischer2012-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | [ticket/10532] Adjust total match count and limitrxu2012-01-141-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a variable for the limit of total matches count. Adjust total match count to limit to provide proper $start value calculation. Adjust $start value if no matches were found. PHPBB3-10532
| | * | | | [ticket/10532] Fix $start out of range for pre-made searchesrxu2012-01-141-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10458' into developAndreas Fischer2012-02-251-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10458: [ticket/10458] Fix xHTML errors when print-viewing PMs
| * | | | | | [ticket/10458] Fix xHTML errors when print-viewing PMsJoas Schilling2012-02-231-5/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-10458
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-254-3/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10456] Add tabindex to subsilver2 captcha
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympusAndreas Fischer2012-02-254-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10456: [ticket/10456] Add tabindex to subsilver2 captcha
| | * | | | | [ticket/10456] Add tabindex to subsilver2 captchaJoas Schilling2012-02-214-3/+4
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Did not set tabindex on registration page, as the hole page does not have any. PHPBB3-10456
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-253-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' [ticket/10630] Perform array_unique on authors array before creating the query
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympusAndreas Fischer2012-02-253-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10630: [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' [ticket/10630] Perform array_unique on authors array before creating the query
| | * | | | | [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'Joas Schilling2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10630
| | * | | | | [ticket/10630] Perform array_unique on authors array before creating the queryJoas Schilling2012-02-202-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to avoid an additional appearance for an author for every post he made. PHPBB3-10630
* | | | | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-02-246-47/+35
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| * | | | | Merge branch 'ticket/raimon/10453' into develop-olympusVjacheslav Trushkin2012-02-246-47/+35
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/raimon/10453: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| | * | | | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-143-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the position: absolute value, and made it so that if the buttons are bigger the text move with it, also added support for bidi.css (text right to left). PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
| | * | | | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-135-50/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
* | | | | | Merge remote-tracking branch 'naderman/ticket/10663' into developAndreas Fischer2012-02-242-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10663: [ticket/10663] Extension finder should not find subdirs with directory filter [ticket/10663] Adding nested directory to finder test
| * | | | | [ticket/10663] Extension finder should not find subdirs with directory filterNils Adermann2012-02-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directory filter pattern now has a $ in the end, do avoid subdirectories from being matched as well. PHPBB3-10663
| * | | | | [ticket/10663] Adding nested directory to finder testVjacheslav Trushkin2012-02-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding nested directory to finder test, triggering finder bug PHPBB3-10663
* | | | | | Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into developNils Adermann2012-02-212-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/extensions-tests-mysq55: [ticket/10667] Fix tests under MySQL 5.5 strict mode