aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympusAndreas Fischer2012-03-261-2/+2
|\ | | | | | | | | | | * unknownbliss/ticket/10694: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| * [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| | | | | | | | PHPBB3-10694
| * [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
| | | | | | | | PHPBB3-10694
* | Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympusAndreas Fischer2012-03-223-37/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10684: [ticket/10684] Adjust function and parameter name, minor changes. [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter [ticket/10684] Remove intval mapping for array keys [ticket/10684] Adjust pm_notifications() to handle stale bans [ticket/10684] Cast user_id to integer [ticket/10684] Refactor $sql_ignore_users array update [ticket/10684] Remove isset() for $sql_ignore_users update [ticket/10684] Fix 2 typos in comment lines. [ticket/10684] Send notifications for users with stale bans
| * | [ticket/10684] Adjust function and parameter name, minor changes.rxu2012-03-223-9/+9
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Rename function phpbb_get_banned_users_ids() parameterrxu2012-03-121-4/+4
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Remove intval mapping for array keysrxu2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | PHP manual for arrays http://php.net/manual/en/language.types.array.php states that the following key cast will occur: Strings containing valid integers will be cast to the integer type. E.g. the key "8" will actually be stored under 8. Thus, no intval mapping for numeric array keys is needed. PHPBB3-10684
| * | [ticket/10684] Adjust pm_notifications() to handle stale bansrxu2012-03-122-16/+15
| | | | | | | | | | | | | | | | | | | | | - Add parameter (array) to the function phpbb_get_banned_users_ids() - Fix function pm_notification() to handle users with stale bans PHPBB3-10684
| * | [ticket/10684] Cast user_id to integerrxu2012-03-111-5/+7
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Refactor $sql_ignore_users array updaterxu2012-03-101-10/+3
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Remove isset() for $sql_ignore_users updaterxu2012-03-091-4/+1
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Fix 2 typos in comment lines.rxu2012-03-092-2/+2
| | | | | | | | | | | | PHPBB3-10684
| * | [ticket/10684] Send notifications for users with stale bansrxu2012-03-082-17/+48
| | | | | | | | | | | | PHPBB3-10684
* | | Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympusAndreas Fischer2012-03-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10717: [ticket/10717] Fix profile field sample in prosilver“s memberlist_view.html
| * | | [ticket/10717] Fix profile field sample in prosilver“s memberlist_view.htmlJoas Schilling2012-03-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10717
* | | | Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympusAndreas Fischer2012-03-221-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * p/task/php54-olympus: [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. [task/php54] Refactor error_reporting call slightly.
| * | | | [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.Oleg Pudeyev2012-03-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot use static in Olympus because it must be PHP 4 compatible. Therefore disable E_STRICT for Olympus. This commit should be reverted for Ascraeus. PHPBB3-10615
| * | | | [task/php54] Refactor error_reporting call slightly.Oleg Pudeyev2012-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate error level assignment into a variable in this commit so that the only difference between Olympus and Ascraeus is the addition of logic altering $level. PHPBB3-10615
* | | | | [ticket/10691] Fixed the speed of creating search indexDhruv Goel2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $time is now initialized after each batch iteration. Speed for each batch iteration of creating search index is fixed. PHPBB3-10691
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympusOleg Pudeyev2012-03-163-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8636: [ticket/8636] Add resync option to topic_view moderation page
| * | | | | [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-233-0/+13
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-8636
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10689' into develop-olympusOleg Pudeyev2012-03-161-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * nickvergessen/ticket/10689: [ticket/10689] Fix "First character"-option in "Find a member"-search
| * | | | [ticket/10689] Fix "First character"-option in "Find a member"-searchJoas Schilling2012-03-121-0/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10689
* | | | Merge remote-tracking branch 'p/ticket/7432' into develop-olympusAndreas Fischer2012-03-091-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * p/ticket/7432: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
| * | | [ticket/7432] Delete redundant reference to "appropriate menu item".Oleg Pudeyev2012-03-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-7432
| * | | [ticket/7432] Explain what users are inactive in more detail.Oleg Pudeyev2011-12-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-7432
* | | | Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympusOleg Pudeyev2012-03-092-6/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/9831: [ticket/9831] Fix saving unchecked checkbox field value [ticket/9831] Correctly store checkbox default value for boolean CPF.
| * | | | [ticket/9831] Fix saving unchecked checkbox field valuerxu2012-02-051-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-9831
| * | | | [ticket/9831] Correctly store checkbox default value for boolean CPF.rxu2012-01-182-6/+25
| | | | | | | | | | | | | | | | | | | | PHPBB3-9831
* | | | | Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympusOleg Pudeyev2012-03-091-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/9084: [ticket/9084] Explain the logic. [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
| * | | | | [ticket/9084] Explain the logic.Oleg Pudeyev2012-03-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9084
| * | | | | [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not requiredrxu2012-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9084
* | | | | | [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_countAndreas Fischer2012-03-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no point in fetching the table status again. PHPBB3-10653
* | | | | | [ticket/9813] Only get posts table row count if we detected a fulltext index.Andreas Fischer2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9813
* | | | | | [ticket/9813] Also use estimated row count of posts table for fulltext mysql.Andreas Fischer2012-03-051-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is 'only' for statistics anyway, using an estimated value does no harm. Also, if MyISAM is the underlying storage engine for the posts table, the value will actually be exact. PHPBB3-9813
* | | | | | [ticket/10653] Add ability to count table rows to database abstraction layer.Andreas Fischer2012-03-034-44/+177
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10653
* | | | | | [ticket/9813] Use table status row count only if greater than 100000 or exact.Andreas Fischer2012-03-031-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9813
* | | | | | [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.Andreas Fischer2012-03-031-10/+28
| |_|_|_|/ |/| | | | | | | | | | | | | | PHPBB3-9813
* | | | | 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 '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/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 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 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