aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31280-516/+281
* Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-117/+121
|\
| * Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-117/+121
| |\
| | * [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.Andreas Fischer2011-12-161-117/+121
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-165-35/+20
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-165-34/+20
| |\ \ | | |/
| | * Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3...Andreas Fischer2011-12-165-34/+20
| | |\
| | | * [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632Joas Schilling2011-12-083-15/+9
| | | * [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408Joas Schilling2011-12-082-3/+3
| | | * [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485Joas Schilling2011-12-084-25/+17
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3...Andreas Fischer2011-12-161-2/+16
| | |\ \
| | | * | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
| | | |/
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-163-129/+116
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-163-129/+116
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-rel...Andreas Fischer2011-12-163-129/+116
| | |\ \
| | | * | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2Joas Schilling2011-12-151-15/+11
| | | * | [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-153-117/+108
| | | |/
* | | | Merge remote-tracking branch 'imkingdavid/ticket/10463' into developAndreas Fischer2011-12-161-1/+1
|\ \ \ \
| * | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
* | | | | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 placesDavid King2011-12-121-3/+3
|/ / / /
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-093-1/+28
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-093-1/+28
| |\ \ \ | | |/ /
| | * | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-093-1/+28
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
| |\ \ \
| | * | | [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympusAndreas Fischer2011-12-081-2/+2
| |\ \ \ \
| | * | | | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-031-0/+137
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympusOleg Pudeyev2011-12-031-0/+137
| |\ \ \ \
| | * | | | [ticket/10434] Add script for creating search index from CLI.Andreas Fischer2011-10-301-0/+137
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-033-50/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-033-50/+10
| |\ \ \ \ \
| | * | | | | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| | * | | | | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-283-50/+11
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-041-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-1/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-043-4/+9
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-041-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-3/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/10503' into prep-release-3...Andreas Fischer2011-12-041-3/+4
| | |\ \ \ \
| | | * | | | [ticket/10503] Debug error "Invalid arguments" when previewing editsJoas Schilling2011-11-281-3/+4
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0350-400/+675
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10345] Check directly whether the key to use existsJoas Schilling2011-11-301-8/+16
| * | | | | | | [ticket/10345] Return the language key when the key has an empty arrayJoas Schilling2011-11-301-0/+5
| * | | | | | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-302-2/+2
| * | | | | | | [ticket/10345] Remove doubled check for valid plural ruleJoas Schilling2011-11-301-4/+0