aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-03-221-1/+1
|\ | | | | | | | | * develop-olympus: [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
| * 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 'dhruvgoel92/ticket/10704' into developAndreas Fischer2012-03-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10704: [ticket/10704] minor typo in a comment
| * | | [ticket/10704] minor typo in a commentDhruv Goel2012-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Make sure $id separation is working fine PHPBB3-10704
* | | | Merge remote-tracking branch 'p/task/php54-ascraeus' into developAndreas Fischer2012-03-222-6/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/task/php54-ascraeus: [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
| * | | | [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.Oleg Pudeyev2012-03-162-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split module_auth into a static and a non-static version. Call the static version statically and the non-static version non-statically. PHPBB3-10615
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-221-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted. * develop-olympus: [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. [task/php54] Refactor error_reporting call slightly.
| * | | | 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
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-191-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * develop-olympus: [ticket/10691] Fixed the speed of creating search index
| * | | | [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 branch 'develop-olympus' into developOleg Pudeyev2012-03-163-0/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
| * | | | 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 branch 'develop-olympus' into developOleg Pudeyev2012-03-161-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10689] Fix "First character"-option in "Find a member"-search
| * | | | 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
* | | | [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queueJoas Schilling2012-03-143-2/+3
| |_|/ |/| | | | | | | | PHPBB3-10690
* | | 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-085-16/+178
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | [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 remote-tracking branch 'cyberalien/feature/append_var' into developOleg Pudeyev2012-03-072-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/feature/append_var: [feature/append_var] Adding test case [feature/append_var] Adding append_var template class function
| * | | | | | [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 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