aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2012-03-222-0/+12
|\ | | | | | | | | * develop-olympus: [task/travis] Exclude functional and slow tests
| * Merge remote-tracking branch 'github-unknownbliss/task/travis' into ↵Nils Adermann2012-03-222-0/+12
| |\ | | | | | | | | | | | | | | | | | | develop-olympus * github-unknownbliss/task/travis: [task/travis] Exclude functional and slow tests
| | * [task/travis] Exclude functional and slow testsMichael Cullum2012-03-222-0/+12
| | | | | | | | | | | | PHPBB3-10718
* | | Merge branch 'ticket/unknownbliss/10719' into developNils Adermann2012-03-224-17/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/unknownbliss/10719: [ticket/10719] Revert "Skip functional tests on PHP 5.2"
| * | | [ticket/10719] Revert "Skip functional tests on PHP 5.2"Michael Cullum2012-03-224-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9c861a0350ae67f06a38ee6efc890412a32751f4. PHPBB3-10719
* | | | Merge remote-tracking branch 'github-unknownbliss/task/travis-develop2' into ↵Nils Adermann2012-03-221-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * github-unknownbliss/task/travis-develop2: [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch
| * | | | [task/travis-develop2] Update version from 5.3 to 5.3.2Michael Cullum2012-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10718
| * | | | [task/travis] Dropping support for 5.2 in develop branchMichael Cullum2012-03-221-1/+0
| | |_|/ | |/| | | | | | | | | | PHPBB3-10718
* | | | Merge branch 'develop-olympus' into developNils Adermann2012-03-224-0/+92
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | * develop-olympus: [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [task/travis] Add automated testing to readme [task/travis] Removing development information [task/travis] Adding Travis Continuous Intergration Support
| * | Merge remote-tracking branch 'github-unknownbliss/task/travis' into ↵Nils Adermann2012-03-224-0/+92
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-unknownbliss/task/travis: [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [task/travis] Add automated testing to readme [task/travis] Removing development information [task/travis] Adding Travis Continuous Intergration Support
| | * [task/travis] Some more small travis fixesMichael Cullum2012-03-222-7/+1
| | | | | | | | | | | | PHPBB3-10718
| | * [task/travis] Rename travis phpunit config filesMichael Cullum2012-03-223-1/+1
| | | | | | | | | | | | PHPBB3-10718
| | * [task/travis] Fixing some travis issuesMichael Cullum2012-03-222-3/+3
| | | | | | | | | | | | PHPBB3-10718
| | * [task/travis] Add automated testing to readmeMichael Cullum2012-03-221-0/+6
| | | | | | | | | | | | PHPBB3-10718
| | * [task/travis] Removing development informationMichael Cullum2012-03-221-2/+3
| | | | | | | | | | | | PHPBB3-10718
| | * [task/travis] Adding Travis Continuous Intergration SupportMichael Cullum2012-03-223-0/+91
| | | | | | | | | | | | PHPBB3-10718
* | | 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
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympusAndreas Fischer2012-03-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10691: [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
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10690' into developOleg Pudeyev2012-03-163-2/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * nickvergessen/ticket/10690: [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
| * | | [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queueJoas Schilling2012-03-143-2/+3
|/ / / | | | | | | | | | PHPBB3-10690
* | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 05:34:37 +0000