aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11103' into developDavid King2013-02-2899-491/+8033
|\
| * [ticket/11103] Revert whitespace changesNathan Guse2013-02-281-0/+2
| * [ticket/11103] Few more minor language thingsNathan Guse2013-02-281-3/+3
| * [ticket/11103] Don't call generate_board_url many timesNathan Guse2013-02-283-6/+9
| * [ticket/11103] Case time in queries as an intNathan Guse2013-02-281-3/+3
| * [ticket/11103] Fix effectively installed checkNathan Guse2013-02-281-1/+1
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-02-282-41/+30
| |\ | |/ |/|
* | Merge remote-tracking branch 'EXreaction/ticket/11363' into developDavid King2013-02-281-28/+17
|\ \
| * | [ticket/11363] Fix a couple bugs and throw errors if the file not foundNathaniel Guse2013-02-271-0/+12
| * | [ticket/11363] Load module info files for extensions tooNathaniel Guse2013-02-271-34/+11
* | | Merge remote-tracking branch 'EXreaction/ticket/11372' into developDavid King2013-02-281-13/+13
|\ \ \
| * | | [ticket/11372] Migrator should only check if effectively installed if notNathaniel Guse2013-02-271-13/+13
| |/ /
| | * Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/...Nathan Guse2013-02-286-9/+25
| | |\
| | | * [ticket/11103] Remove padding from notifications for now.Matt Friedman2013-02-272-5/+1
| | | * [ticket/11103] Add newlines to bottom of css fileMatt Friedman2013-02-151-1/+2
| | | * [ticket/11103] HTML encode double arrow characterMatt Friedman2013-02-154-4/+4
| | | * [ticket/11103] Update styling of UCP Notifications in subsilver2Matt Friedman2013-02-141-1/+3
| | | * [ticket/11103] Update styling of UCP Notifications in prosilverMatt Friedman2013-02-142-3/+15
| | | * [ticket/11103] Update styling of subsilver2 notification modalMatt Friedman2013-02-142-1/+2
| | | * [ticket/11103] Update styling of prosilver notification modalMatt Friedman2013-02-142-1/+5
| | | * [ticket/11103] Remove title attribute from notification linkMatt Friedman2013-02-142-2/+2
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-02-281-23/+18
| | |\ \ | |_|/ / |/| | |
* | | | Merge remote-tracking branch 'EXreaction/ticket/11370' into developDavid King2013-02-281-22/+17
|\ \ \ \
| * | | | [ticket/11370] Effectively installed migrations not inserted into tableNathaniel Guse2013-02-261-22/+17
| |/ / /
* | | | Merge remote-tracking branch 'EXreaction/ticket/11369' into developDavid King2013-02-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11369] Reverting migration throws errorNathaniel Guse2013-02-261-1/+1
|/ / /
| * | [ticket/11103] Notifications Migration fileNathaniel Guse2013-02-261-0/+160
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-2679-3080/+3896
| |\ \ | |/ / |/| |
* | | 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-2527-152/+441
| |\ \ \
| | * | | [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-2324-139/+430
| | |\ \ \
| * | | | | [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