aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-1/+1
|\
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-1/+1
| |\
| | * Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9Andreas Fischer2011-06-261-1/+1
| | |\
| | | * [ticket/10233] IE Emulation fix breaks PM posting layoutRaimon2011-06-261-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-16/+15
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-16/+15
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'naderman/ticket/10188' into prep-release-3.0.9Andreas Fischer2011-06-261-16/+15
| | |\ \
| | | * | [ticket/10188] Prevent semi-compressed outputNils Adermann2011-06-261-16/+15
| | |/ /
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-261-0/+28
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-261-0/+28
| |\ \ \ | | |/ /
| | * | Merge branch 'ticket/bantu/7729' into prep-release-3.0.9Nils Adermann2011-06-261-0/+28
| | |\ \
| | | * | [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.Andreas Fischer2011-06-251-0/+28
| | |/ /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-221-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-221-1/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'naderman/ticket/10228' into prep-release-3.0.9Andreas Fischer2011-06-221-1/+1
| | |\ \
| | | * | [ticket/10228] Correct "trigger" to "triggered" in acp registration settingsNils Adermann2011-06-221-1/+1
| | |/ /
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-201-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-201-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'ticket/bantu/10234' into prep-release-3.0.9Nils Adermann2011-06-201-1/+2
| | |\ \
| | | * | [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"Andreas Fischer2011-06-201-1/+2
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-201-11/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-201-11/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-201-11/+14
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/10223] Make definition of phpbb_require_updated conditionalNils Adermann2011-06-201-11/+14
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-192-26/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-192-26/+26
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-192-26/+26
| | |\ \ \ | | | |/ /
| | | * | [ticket/10223] Replace spaces with tabsNils Adermann2011-06-192-26/+26
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympusAndreas Fischer2011-06-191-3/+6
| |\ \ \ \
| | * | | | [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+rxu2011-06-191-3/+6
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-195-5/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-195-5/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9Andreas Fischer2011-06-195-5/+5
| | |\ \ \ \
| | | * | | | [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDSNils Adermann2011-06-185-5/+5
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-193-11/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-193-11/+39
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9Andreas Fischer2011-06-193-11/+39
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | [ticket/10223] The search fid parameter is an array of forums not just an idNils Adermann2011-06-191-1/+1
| | | | |/ | | | |/|
| | | * | [ticket/10223] Check optional before file_exists and correct require pathNils Adermann2011-06-182-4/+4
| | | * | [ticket/10223] requiring the new startup.php file conditionally.Nils Adermann2011-06-182-10/+38
| | | |/
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-181-4/+4
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'Raimon/ticket/10229' into prep-release-3.0.9Andreas Fischer2011-06-181-4/+4
| | |\ \ | | | |/ | | |/|
| | | * [ticket/10229] On languge/acp/styles.php "%s" should be %sRaimon2011-06-181-4/+4
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-0/+8
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-161-0/+8
| |\ \ | | |/
| | * [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.Andreas Fischer2011-06-161-0/+8
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-162-2/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-162-2/+2
| |\ \ | | |/