aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-02-27108-3080/+6629
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11367' into developDavid King2013-02-261-3/+11
| |\
| | * [ticket/11367] Always freeresultNathan Guse2013-02-261-2/+2
| | * [ticket/11367] Migrator throws error if migrations table does not existNathaniel Guse2013-02-251-4/+12
| * | Merge remote-tracking branch 'EXreaction/feature/migrations-data' into developDavid King2013-02-2646-2820/+3339
| |\ \ | | |/ | |/|
| | * Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into f...Nathaniel Guse2013-02-2524-124/+400
| | |\
| | | * [feature/migrations] Use the user class for language handlingNathaniel Guse2013-02-231-12/+10
| | | * [feature/migrations] Fully revert the removal of the user_msnm fieldNathaniel Guse2013-02-231-1/+0
| | | * [feature/migrations] Revert unrelated change to schema_data.sqlNathaniel Guse2013-02-231-0/+1
| | | * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migratio...Nathaniel Guse2013-02-2321-111/+389
| | | |\
| | * | | [feature/migrations] Inject migrator rather than the container.Nathaniel Guse2013-02-251-3/+12
| | |/ /
| | * | [feature/migrations] Remove user_msnm migrationNathan Guse2013-02-062-0/+44
| | * | [feature/migrations] Correct depends_onNathan Guse2013-02-065-4/+8
| | * | [feature/migrations] Subdirectories for migration dataNathan Guse2013-02-0643-88/+88
| | * | [feature/migrations] Reports table schema changes in recent developNathan Guse2013-02-062-0/+43
| | * | [feature/migrations] Automatically populate migrations table on installNathan Guse2013-02-062-44/+7
| | * | [feature/migrations] effectively installed check for migration dataNathan Guse2013-02-0644-142/+223
| | * | [feature/migrations] Comments for the return in the custom functionsNathan Guse2013-02-062-0/+2
| | * | [feature/migrations] Order the migrations schema in schema_data.sqlNathan Guse2013-02-061-9/+9
| | * | [feature/migrations] Fix migrations installer, schema for schema_data.sqlNathan Guse2013-02-063-64/+116
| | * | [feature/migrations] Make depends_on static to call it without dependenciesNathan Guse2013-02-0644-133/+249
| | * | [feature/migrations] Remove hardcoded language, use lang instead.Nathan Guse2013-02-062-27/+30
| | * | [feature/migrations] Revert schema for migration dataNathan Guse2013-02-0641-168/+314
| | * | [feature/migrations] Replace database_update.php with migrations updaterNathan Guse2013-02-062-2939/+99
| | * | [feature/migrations] Rebuilding migrations data on developNathan Guse2013-02-0642-7/+2948
| * | | Merge remote-tracking branch 'remotes/marc/ticket/11342' into developNathaniel Guse2013-02-252-4/+20
| |\ \ \
| | * | | [ticket/11342] Fix "unexpected token" syntax errorMarc Alexander2013-02-201-1/+5
| | * | | [ticket/11342] Mark active topics read when marking forums readMarc Alexander2013-02-032-4/+16
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-02-241-1/+23
| |\ \ \ \
| | * | | | [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-18/+32
| |\ \ \ \ \ | | |/ / / /
| | * | | | [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| | * | | | [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| | * | | | [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| | * | | | [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| | * | | | [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| | * | | | [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
| | |\ \ \ \
| | | * | | | [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
| * | | | | | [ticket/10896] Add missing email validation lost in develop mergeNils Adermann2013-02-241-0/+7
| * | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-243-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-ol...Nils Adermann2013-02-244-3/+10
| | |\ \ \ \ \
| | | * | | | | [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALIDNathan Guse2013-02-043-3/+2
| | | * | | | | [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-043-2/+10
| * | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympusNils Adermann2013-02-241-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1