aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/prosilver-cleanup/remove-tweaks2] Updating tweaksVjacheslav Trushkin2012-03-081-79/+13
| | | | | | Removing unnecessary tweaks, changing IE7 tweaks to modern code PHPBB3-10622
* [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaksVjacheslav Trushkin2012-03-081-0/+7
| | | | | | Copying commonly used code from tweaks.css to common.css PHPBB3-10622
* [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from formsVjacheslav Trushkin2012-03-081-4/+0
| | | | | | Removing IE6 tweaks from forms.css PHPBB3-10622
* [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IEVjacheslav Trushkin2012-03-083-1/+8
| | | | | | Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements PHPBB3-10622
* Merge remote-tracking branch 'p/ticket/10618' into developAndreas Fischer2012-03-071-3/+3
|\ | | | | | | | | | | * p/ticket/10618: [ticket/10618] Change phpBB 3 to phpBB 3.1. [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
| * [ticket/10618] Change phpBB 3 to phpBB 3.1.Oleg Pudeyev2012-03-061-3/+3
| | | | | | | | PHPBB3-10618
| * [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.Oleg Pudeyev2012-02-031-3/+3
| | | | | | | | PHPBB3-10618
* | 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 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
* | | | | | | [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
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10378' into developIgor Wiedler2012-02-172-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10378: [ticket/10378] Missing entries from imageset to css conversion [ticket/10378] Imageset to css convertor typo
| * | | | | | [ticket/10378] Missing entries from imageset to css conversionVjacheslav Trushkin2012-01-201-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css PHPBB3-10378
| * | | | | | [ticket/10378] Imageset to css convertor typoVjacheslav Trushkin2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imageset to css convertor typo PHPBB3-10378
* | | | | | | Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-175-7/+156
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/10652] Fixing typo in template class [ticket/10645] Missing CSS for checkboxes [ticket/10614] Change not installed heading to available. [ticket/10614] Unbreak all_available on extension manager. [ticket/10614] Check if cache exists before destroying it [ticket/10614] Remove ext manager exceptions for now [ticket/10614] Refactor list command to use manager API [ticket/10614] Add purge command [ticket/10614] Tweak list output, show state, purge cache, handle missing exts [ticket/10614] Make script accessible from anywhere [ticket/10614] Better usage output [ticket/10614] Add a script to enable, disable and view status of extensions. [ticket/10500] Use correct class name in @uses. [ticket/10500] Fix phpbb_template_compile instantiation.
| * \ \ \ \ \ \ Merge pull request #576 from cyberalien/ticket/10652Igor Wiedler2012-02-171-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/10652] Fixing typo in template class
| | * | | | | | | [ticket/10652] Fixing typo in template classVjacheslav Trushkin2012-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in template class that prevents template inheritance from working PHPBB3-10652