aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into feature/event-dispatcherIgor Wiedler2012-03-1186-369/+1023
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-03-091-1/+1
| |\
| | * Merge remote-tracking branch 'p/ticket/7432' into develop-olympusAndreas Fischer2012-03-091-1/+1
| | |\
| | | * [ticket/7432] Delete redundant reference to "appropriate menu item".Oleg Pudeyev2012-03-071-1/+1
| | | * [ticket/7432] Explain what users are inactive in more detail.Oleg Pudeyev2011-12-231-1/+1
| * | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-092-6/+33
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympusOleg Pudeyev2012-03-092-6/+33
| | |\ \
| | | * | [ticket/9831] Fix saving unchecked checkbox field valuerxu2012-02-051-0/+8
| | | * | [ticket/9831] Correctly store checkbox default value for boolean CPF.rxu2012-01-182-6/+25
| * | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-091-1/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympusOleg Pudeyev2012-03-091-1/+6
| | |\ \ \
| | | * | | [ticket/9084] Explain the logic.Oleg Pudeyev2012-03-091-0/+5
| | | * | | [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not requiredrxu2012-02-101-1/+1
| * | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-086-16/+203
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympusOleg Pudeyev2012-03-086-16/+203
| | |\ \ \ \
| | | * | | | [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_countAndreas Fischer2012-03-082-2/+2
| | | * | | | [ticket/9813] Only get posts table row count if we detected a fulltext index.Andreas Fischer2012-03-081-1/+1
| | | * | | | [ticket/9813] Also use estimated row count of posts table for fulltext mysql.Andreas Fischer2012-03-051-5/+1
| | | * | | | [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.Andreas Fischer2012-03-041-1/+1
| | | * | | | [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().Andreas Fischer2012-03-041-0/+25
| | | * | | | [ticket/10653] Add ability to count table rows to database abstraction layer.Andreas Fischer2012-03-034-44/+177
| | | * | | | [ticket/9813] Use table status row count only if greater than 100000 or exact.Andreas Fischer2012-03-031-26/+41
| | | * | | | [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.Andreas Fischer2012-03-031-10/+28
| | |/ / / /
| * | | | | Merge remote-tracking branch 'cyberalien/feature/append_var' into developOleg Pudeyev2012-03-073-2/+70
| |\ \ \ \ \
| | * | | | | [feature/append_var] Adding test caseVjacheslav Trushkin2012-03-081-0/+36
| | * | | | | [feature/append_var] Adding append_var template class functionVjacheslav Trushkin2012-03-052-2/+34
| * | | | | | Merge remote-tracking branch 'p/ticket/10618' into developAndreas Fischer2012-03-071-3/+3
| |\ \ \ \ \ \
| | * | | | | | [ticket/10618] Change phpBB 3 to phpBB 3.1.Oleg Pudeyev2012-03-061-3/+3
| | * | | | | | [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.Oleg Pudeyev2012-02-031-3/+3
| * | | | | | | Merge remote-tracking branch 'p/ticket/10685' into developAndreas Fischer2012-03-072-5/+13
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | [ticket/10685] Refactor template test defaults for php 5.4 compatibility.Oleg Pudeyev2012-03-062-5/+13
| |/ / / / / /
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-021-0/+14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'ticket/bantu/8652' into develop-olympusAndreas Fischer2012-03-021-0/+14
| | |\ \ \ \ \
| | | * | | | | [ticket/8652] Comment for also updating forum watch table in user_notification.Andreas Fischer2012-03-021-2/+10
| | | * | | | | [ticket/8652] Sending 2 emails on 2 repliesBruno Ais2012-03-021-0/+6
| * | | | | | | 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
| |/ / / / / / /
| * | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympusAndreas Fischer2012-02-281-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/10639] Do not allow negative post count as rank's minimum postsJoas Schilling2012-02-201-1/+1
| * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10672' into developAndreas Fischer2012-02-282-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10672] Fix total post count language string in statistics and feedJoas Schilling2012-02-272-2/+2
| * | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-286-9/+17
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympusAndreas Fischer2012-02-286-10/+18
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.Joas Schilling2012-02-276-10/+18
| | | | |/ / / / / / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-263-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympusAndreas Fischer2012-02-263-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [ticket/10453] Fixing spacingVjacheslav Trushkin2012-02-263-3/+3
| * | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-261-12/+37
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympusAndreas Fischer2012-02-261-12/+37
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |