aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/merging-style-components] Moving template classes to styleVjacheslav Trushkin2012-03-1411-0/+0
| | | | | | Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates PHPBB3-10632
* Merge branch 'develop-olympus' into developDavid King2012-03-110-0/+0
|\
| * Merge branch 'unknownbliss/ticket/10697' into develop-olympusDavid King2012-03-111-0/+2
| |\
| | * [ticket/10697] Updating gitignore to match develop branchMichael Cullum2012-03-111-0/+2
| |/ | | | | | | PHPBB3-10697
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-091-1/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/7432] Delete redundant reference to "appropriate menu item". [ticket/7432] Explain what users are inactive in more detail.
| * 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 branch 'develop-olympus' into developOleg Pudeyev2012-03-092-6/+33
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9831] Fix saving unchecked checkbox field value [ticket/9831] Correctly store checkbox default value for boolean CPF.
| * | 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 branch 'develop-olympus' into developOleg Pudeyev2012-03-091-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9084] Explain the logic. [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
| * | | 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
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-086-16/+203
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count [ticket/9813] Only get posts table row count if we detected a fulltext index. [ticket/9813] Also use estimated row count of posts table for fulltext mysql. [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). [ticket/10653] Add ability to count table rows to database abstraction layer. [ticket/9813] Use table status row count only if greater than 100000 or exact. [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
| * | | | Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympusOleg Pudeyev2012-03-086-16/+203
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9813: [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count [ticket/9813] Only get posts table row count if we detected a fulltext index. [ticket/9813] Also use estimated row count of posts table for fulltext mysql. [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). [ticket/10653] Add ability to count table rows to database abstraction layer. [ticket/9813] Use table status row count only if greater than 100000 or exact. [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
| | * | | | [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] Fix parameter to substr() in unit tests. Should be 1, not -1.Andreas Fischer2012-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10653
| | * | | | [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().Andreas Fischer2012-03-041-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10653
| | * | | | [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 remote-tracking branch 'cyberalien/feature/append_var' into developOleg Pudeyev2012-03-073-2/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/feature/append_var: [feature/append_var] Adding test case [feature/append_var] Adding append_var template class function
| * | | | | [feature/append_var] Adding test caseVjacheslav Trushkin2012-03-081-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding test case for append_var PHPBB3-10666
| * | | | | [feature/append_var] Adding append_var template class functionVjacheslav Trushkin2012-03-052-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding append_var template class function PHPBB3-10666
* | | | | | 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 remote-tracking branch 'p/ticket/10685' into developAndreas Fischer2012-03-072-5/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | * p/ticket/10685: [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
| * | | | | | [ticket/10685] Refactor template test defaults for php 5.4 compatibility.Oleg Pudeyev2012-03-062-5/+13
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10685
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-26 06:12:29 +0000