aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
Commit message (Expand)AuthorAgeFilesLines
* [feature/passwords] Add schema changes for new hash typesMarc Alexander2013-09-141-1/+1
* [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-062-0/+0
* Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-0/+19
|\
| * Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12Joas Schilling2013-07-301-2/+19
| |\
| | * [ticket/11753] Remove ?> from MySQL Upgrader.Andreas Fischer2013-07-301-2/+0
| | * [ticket/11753] Update MySQL upgrader schema data.Andreas Fischer2013-07-301-0/+19
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-1/+2
|\ \ \ | |/ /
| * | [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"Andreas Fischer2013-07-301-1/+2
| |/
* | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-111-6/+10
|\ \
| * | [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-291-5/+5
| * | [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-281-11/+15
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-071-0/+8
|\ \ \ | |/ /
| * | [ticket/10202] Upgrade TEXT to the bigger MTEXT.Andreas Fischer2013-03-051-1/+1
| * | [ticket/10202] Add database schema for phpbb_config_db_text.Andreas Fischer2013-03-051-0/+8
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-051-3/+13
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-041-2/+2
| |\ \
| | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-041-0/+36
| | |\ \
| | * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-071-12/+28
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-094-4/+4
| | |\ \ \ \
| | * | | | | [feature/avatars] Unify size of avatar_typeMarc Alexander2012-11-301-2/+2
| | * | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-121-2/+2
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-213-6/+4
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-2710-98/+57
| | | |\ \ \ \ \ \
| | | * | | | | | | [feature/avatars] Fix avatar_type in create_schema_filesIgor Wiedler2012-04-081-2/+2
| * | | | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10411-2' into developNathaniel Guse2013-03-041-1/+11
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-251-12/+28
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-12-064-4/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | [ticket/10411] Update schema and fix database updateJoas Schilling2012-11-141-1/+0
| | * | | | | | | | [ticket/10411] Add new table for teampageJoas Schilling2012-11-131-0/+11
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-031-12/+64
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-111-0/+13
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge remote-tracking branch 'EXreaction/feature/migrations' into developDavid King2013-02-061-0/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | [feature/migrations] Store depends on in the database (serialized)Nathan Guse2013-01-101-0/+1
| | | * | | | | | | [feature/migrations] Migrations now somewhat worksNathan Guse2013-01-091-2/+2
| | | * | | | | | | [feature/migrations] Move migrator to service containerNathan Guse2013-01-091-1/+13
| | | * | | | | | | [feature/migrations] Moved database_update info to individual migration classesNils Adermann2013-01-091-14/+0
| | | * | | | | | | [feature/migrations] Basic migrations with schema and data changesNils Adermann2013-01-091-0/+14
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-043-2/+5
| | * | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-153-5/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-113-5/+2
| | | |/ / / / / /
| * | | | | | | | [ticket/11103] Remove Primary Key on user_notifications tableNathan Guse2013-01-311-6/+0
| * | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-12/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | [ticket/11171] DB additions for these changesBruno Ais2012-12-051-12/+15
| | |/ / / / / /
| * | | | | | | [ticket/11103] data -> notification_dataNathan Guse2012-12-151-1/+1
| * | | | | | | [ticket/11103] unread -> notification_readNathan Guse2012-12-151-2/+2
| * | | | | | | [ticket/11103] time -> notification_timeNathan Guse2012-12-151-8/+8
| * | | | | | | [ticket/11103] Move is_enabled to a separate table for better performanceNathan Guse2012-12-151-1/+8
| * | | | | | | [ticket/11103] Update indexes on notifications/user notifications tablesNathan Guse2012-12-081-12/+2
| * | | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-074-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-101-10/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |