aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [feature/avatars] Reduce module auth of ucp avatar settingsMarc Alexander2013-03-041-1/+1
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-04168-3585/+11297
|\
| * Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-022-2/+2
| |\
| | * Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
| | |\
| | | * [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
| * | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
| | |/
| * | Merge remote-tracking branch 'EXreaction/ticket/11386' into developDavid King2013-03-025-52/+91
| |\ \
| | * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386Nathaniel Guse2013-03-023-29/+35
| | |\ \
| | * | | [ticket/11386] Fix circular reference error & serialize errorNathaniel Guse2013-03-023-4/+13
| | * | | [ticket/11386] Forgot to get the migration classesNathaniel Guse2013-03-021-5/+11
| | * | | [ticket/11386] Use finder to find migration filesNathaniel Guse2013-03-025-59/+100
| * | | | [ticket/11385] Fix issue with migration module tool not getting extension mod...OpenShift guest2013-03-021-1/+1
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'EXreaction/ticket/11363-2' into developDavid King2013-03-012-28/+34
| |\ \ \
| | * | | [ticket/11363] Fix to make get_module_infos get from all extensionsNathaniel Guse2013-03-012-28/+34
| | |/ /
| * | | [ticket/11381] Make finder able to search in all available extensionsNathaniel Guse2013-03-012-11/+28
| |/ /
| * | [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
| | | | |/ / | | | |/| |
| | * | | | [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-2676-3052/+3855
| |\ \ \ \ | | |/ / /
| | * | | 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