aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11687] Add assets_version to phpbb_configVjacheslav Trushkin2013-07-131-0/+1
* Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-118-38/+83
|\
| * Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-207-33/+76
| |\
| | * [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-297-7/+7
| | * [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-287-40/+83
| * | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-1/+1
| |\ \
| | * | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-141-1/+1
| * | | [ticket/10325] change language varDhruv2013-04-251-1/+1
| * | | [ticket/10325] add new config value to databaseDhruv2013-04-251-0/+1
| | |/ | |/|
| * | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-281-1/+1
| * | Ticket# 11477 - Allow customisation of "Board index"Tabitha Backoff2013-03-281-0/+1
| * | [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.Andreas Fischer2013-03-191-4/+4
| |/
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-077-0/+71
|\|
| * [ticket/10202] Upgrade TEXT to the bigger MTEXT.Andreas Fischer2013-03-055-6/+6
| * [ticket/10202] Add database schema for phpbb_config_db_text.Andreas Fischer2013-03-057-0/+71
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-058-31/+149
|\|
| * Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-048-14/+15
| |\
| | * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-048-0/+318
| | |\
| | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-077-7/+134
| | |\ \
| | * \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-091-1/+2
| | |\ \ \
| | * | | | [feature/avatars] Unify size of avatar_typeMarc Alexander2012-11-307-14/+14
| | * | | | [feature/avatars] Add allow_avatar_gravatar to schema_data.sqlMarc Alexander2012-11-221-0/+1
| | * | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-127-14/+14
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-218-16/+11
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-271-3/+4
| | | |\ \ \ \ \
| | | * | | | | | [feature/avatars] Fix avatar_type in create_schema_filesIgor Wiedler2012-04-085-9/+9
| | | * | | | | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-078-311/+41
| | | |\ \ \ \ \ \
| | | * | | | | | | [feature/avatars] Making schema changes for db tablesCullen Walsh2012-03-183-6/+6
| * | | | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into developNathaniel Guse2013-03-048-17/+134
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | [ticket/10411] Update schema file with new table and remove the columnJoas Schilling2013-02-271-7/+11
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-258-4/+132
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | [ticket/10411] Update schema and fix database updateJoas Schilling2012-11-147-10/+3
| | * | | | | | | | [ticket/10411] Add new table for teampageJoas Schilling2012-11-137-10/+130
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-038-7/+452
|\| | | | | | | |
| * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-117-0/+106
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge remote-tracking branch 'EXreaction/feature/migrations' into developDavid King2013-02-067-0/+106
| | |\ \ \ \ \ \ \
| | | * | | | | | | [feature/migrations] Store depends on in the database (serialized)Nathan Guse2013-01-107-0/+7
| | | * | | | | | | [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-097-104/+109
| | | * | | | | | | [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-097-0/+94
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-048-2/+9
| | * | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-158-9/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-118-9/+2
| * | | | | | | | | [ticket/11103] Remove Primary Key on user_notifications tableNathan Guse2013-01-317-22/+5
| * | | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-157-3/+24
| |\| | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-147-3/+24
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | [ticket/11171] DB additions for these changesBruno Ais2012-12-057-7/+28
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | [ticket/11321] Recreate schema files with develop/create_schema_files.phpJoas Schilling2013-01-117-10/+10
| | | |/ / / / / | | |/| | | | |
| * | | | | | | [ticket/11103] data -> notification_dataNathan Guse2012-12-157-7/+7
| * | | | | | | [ticket/11103] unread -> notification_readNathan Guse2012-12-157-14/+14
| * | | | | | | [ticket/11103] time -> notification_timeNathan Guse2012-12-157-7/+7