Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde... | Joas Schilling | 2013-03-07 | 7 | -0/+71 |
|\ | |||||
| * | [ticket/10202] Upgrade TEXT to the bigger MTEXT. | Andreas Fischer | 2013-03-05 | 5 | -6/+6 |
| * | [ticket/10202] Add database schema for phpbb_config_db_text. | Andreas Fischer | 2013-03-05 | 7 | -0/+71 |
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde... | Joas Schilling | 2013-03-05 | 10 | -39/+191 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop | Nathaniel Guse | 2013-03-04 | 2 | -2/+4 |
| |\ | |||||
| | * | [ticket/10714] Get log from container in install, update and download/file | Joas Schilling | 2013-03-04 | 2 | -2/+4 |
| * | | Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop | David King | 2013-03-04 | 2 | -5/+16 |
| |\ \ | |||||
| | * \ | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3 | Nathaniel Guse | 2013-03-04 | 8 | -31/+149 |
| | |\ \ | |||||
| | * | | | [ticket/11386] Send list of migrations instead of using load_migrations | Nathaniel Guse | 2013-03-03 | 2 | -5/+16 |
| | | |/ | | |/| | |||||
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11393' into develop | David King | 2013-03-04 | 1 | -1/+22 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | [ticket/11393] Give more information on database updater | Nathaniel Guse | 2013-03-03 | 1 | -1/+22 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop | Nathaniel Guse | 2013-03-04 | 8 | -14/+15 |
| |\ \ | |||||
| | * \ | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars | Marc Alexander | 2013-03-04 | 10 | -2851/+448 |
| | |\ \ | | | |/ | |||||
| | * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars | Marc Alexander | 2013-02-07 | 8 | -10/+141 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars | Marc Alexander | 2013-01-04 | 5 | -37/+42 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars | Marc Alexander | 2012-12-24 | 6 | -85/+192 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'develop' into feature/avatars | Marc Alexander | 2012-12-09 | 4 | -6/+114 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | [feature/avatars] Unify size of avatar_type | Marc Alexander | 2012-11-30 | 7 | -14/+14 |
| | * | | | | | | [feature/avatars] Miscellaneous fixes | Marc Alexander | 2012-11-25 | 1 | -10/+10 |
| | * | | | | | | [feature/avatars] Use new avatar types in database updater | Marc Alexander | 2012-11-25 | 1 | -3/+3 |
| | * | | | | | | [feature/avatars] Add allow_avatar_gravatar to schema_data.sql | Marc Alexander | 2012-11-22 | 1 | -0/+1 |
| | * | | | | | | [feature/avatars] Fix the docs and small naming fixes | Marc Alexander | 2012-11-19 | 1 | -0/+5 |
| | * | | | | | | [feature/avatars] Check for gravatar when checking the avatar module_auth | Marc Alexander | 2012-11-16 | 1 | -0/+8 |
| | * | | | | | | [feature/avatars] fix 'user_avatar_type' in database updater | Marc Alexander | 2012-11-13 | 1 | -4/+2 |
| | * | | | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur... | Marc Alexander | 2012-11-12 | 8 | -14/+38 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'develop' into feature/avatars | Igor Wiedler | 2012-07-21 | 10 | -20/+61 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into feature/avatars | Igor Wiedler | 2012-06-27 | 6 | -57/+295 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | [feature/avatars] Update avatars in database_update | Igor Wiedler | 2012-04-08 | 1 | -2/+22 |
| | | * | | | | | | | | [feature/avatars] Fix avatar_type in create_schema_files | Igor Wiedler | 2012-04-08 | 5 | -9/+9 |
| | | * | | | | | | | | Merge branch 'develop' into feature/avatars | Igor Wiedler | 2012-04-07 | 12 | -391/+105 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | [feature/avatars] Making schema changes for db tables | Cullen Walsh | 2012-03-18 | 4 | -6/+10 |
| * | | | | | | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into develop | Nathaniel Guse | 2013-03-04 | 8 | -17/+134 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | [ticket/10411] Update schema file with new table and remove the column | Joas Schilling | 2013-02-27 | 1 | -7/+11 |
| | * | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 | Joas Schilling | 2013-02-27 | 2 | -2813/+127 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | [ticket/10411] Revert database_update.php changes from for easier update | Joas Schilling | 2013-02-27 | 1 | -36/+16 |
| | * | | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 | Joas Schilling | 2013-02-25 | 14 | -99/+391 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 | Joas Schilling | 2012-12-06 | 3 | -3/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 | Joas Schilling | 2012-11-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | [ticket/10411] Update schema and fix database update | Joas Schilling | 2012-11-14 | 8 | -26/+39 |
| | * | | | | | | | | | | | | | [ticket/10411] Add new table for teampage | Joas Schilling | 2012-11-13 | 7 | -10/+130 |
* | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde... | Joas Schilling | 2013-03-03 | 13 | -2834/+619 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 | Nathaniel Guse | 2013-02-26 | 2 | -2944/+130 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop | David King | 2013-02-26 | 2 | -2813/+127 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into f... | Nathaniel Guse | 2013-02-25 | 3 | -14/+13 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | [feature/migrations] Use the user class for language handling | Nathaniel Guse | 2013-02-23 | 1 | -12/+10 |
| | | | * | | | | | | | | | | | | [feature/migrations] Revert unrelated change to schema_data.sql | Nathaniel Guse | 2013-02-23 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migratio... | Nathaniel Guse | 2013-02-23 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | [feature/migrations] Inject migrator rather than the container. | Nathaniel Guse | 2013-02-25 | 1 | -3/+12 |
| | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | [feature/migrations] Automatically populate migrations table on install | Nathan Guse | 2013-02-06 | 2 | -44/+7 |
| | | * | | | | | | | | | | | | | [feature/migrations] effectively installed check for migration data | Nathan Guse | 2013-02-06 | 1 | -4/+13 |