aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-04162-3467/+11651
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (255 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| * Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-022-2/+2
| |\ | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/6723] Show info that message has been deleted before delivery
| | * Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/6723: [ticket/6723] Show info that message has been deleted before delivery
| | | * [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the message has been deleted before the delivery it will still show in the message history, although with an empty message. This patch will change that behavior to showing the info that it has been deleted before it was delivered in red letters. The red letters ensure that users won't mistake the info for the actual message. PHPBB3-6723
| * | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * remotes/upstream/develop-olympus: [ticket/11368] Fix background color for PM report rows by using accessing var.
| | * | Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympusNathaniel Guse2013-03-021-1/+1
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11368: [ticket/11368] Fix background color for PM report rows by using accessing var.
| | | * [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
| | |/ | | | | | | | | | PHPBB3-11368
| * | Merge remote-tracking branch 'EXreaction/ticket/11386' into developDavid King2013-03-0210-63/+155
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11386: [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files
| | * | [ticket/11386] Fix failing tests from constructor changesNathaniel Guse2013-03-023-4/+5
| | | | | | | | | | | | | | | | PHPBB3-11386
| | * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386Nathaniel Guse2013-03-023-29/+35
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/extension/finder.php
| | * | | [ticket/11386] Fix circular reference error & serialize errorNathaniel Guse2013-03-023-4/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11386
| | * | | [ticket/11386] Remove tests that check if finder cache is workingNathaniel Guse2013-03-021-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These don't seem necessary and are much more complicated to get working now with the changes in this PR PHPBB3-11386
| | * | | [ticket/11386] Forgot to get the migration classesNathaniel Guse2013-03-021-5/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-11386
| | * | | [ticket/11386] Update tests with new constructors for ext.manager/migratorNathaniel Guse2013-03-024-6/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-11386
| | * | | [ticket/11386] Use finder to find migration filesNathaniel Guse2013-03-025-59/+100
| | | | | | | | | | | | | | | | | | | | PHPBB3-11386
| * | | | Merge branch 'ticket/11385' into developNathaniel Guse2013-03-021-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | # By OpenShift guest * ticket/11385: [ticket/11385] Fix issue with migration module tool not getting extension module info
| | * | | [ticket/11385] Fix issue with migration module tool not getting extension ↵OpenShift guest2013-03-021-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | module info PHPBB3-11385
| * | | Merge remote-tracking branch 'EXreaction/ticket/11363-2' into developDavid King2013-03-012-28/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11363-2: [ticket/11363] Fix to make get_module_infos get from all extensions
| | * | | [ticket/11363] Fix to make get_module_infos get from all extensionsNathaniel Guse2013-03-012-28/+34
| | |/ / | | | | | | | | | | | | | | | | | | | | Depends on 11381 PHPBB3-11363
| * | | Merge remote-tracking branch 'EXreaction/ticket/11381' into developDavid King2013-03-012-11/+28
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11381: [ticket/11381] Make finder able to search in all available extensions
| | * | [ticket/11381] Make finder able to search in all available extensionsNathaniel Guse2013-03-012-11/+28
| |/ / | | | | | | | | | PHPBB3-11381
| * | Merge remote-tracking branch 'EXreaction/ticket/11103' into developDavid King2013-02-2899-491/+8033
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (169) and others # Via Nathan Guse (29) and Nathaniel Guse (7) * EXreaction/ticket/11103: (217 commits) [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11103] Notifications Migration file [ticket/11103] Restore new/unread messages info/link in header (properly) [ticket/11103] Add newlines to bottom of css file [ticket/11103] HTML encode double arrow character [ticket/11103] Add Notification Settings link in flyout menu [ticket/11103] Restore new/unread messages info/link in header [ticket/11103] Update styling of UCP Notifications in subsilver2 [ticket/11103] Update styling of UCP Notifications in prosilver [ticket/11103] Update styling of subsilver2 notification modal [ticket/11103] Update styling of prosilver notification modal [ticket/11103] Remove title attribute from notification link [ticket/11103] Mark/Unmark All buttons [ticket/11103] Make the number of notifications strong if > 0 [ticket/11103] Rounded Corners and antialiased pointer ...
| | * | [ticket/11103] Revert whitespace changesNathan Guse2013-02-281-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11103
| | * | [ticket/11103] Few more minor language thingsNathan Guse2013-02-281-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11103
| | * | [ticket/11103] Don't call generate_board_url many timesNathan Guse2013-02-283-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fix a URL and some comments PHPBB3-11103
| | * | [ticket/11103] Case time in queries as an intNathan Guse2013-02-281-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11103
| | * | [ticket/11103] Fix effectively installed checkNathan Guse2013-02-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11103
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-02-282-41/+30
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via David King (2) and Nathaniel Guse (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too
| * | | Merge remote-tracking branch 'EXreaction/ticket/11363' into developDavid King2013-02-281-28/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11363: [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11363] Load module info files for extensions too
| | * | | [ticket/11363] Fix a couple bugs and throw errors if the file not foundNathaniel Guse2013-02-271-0/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11363
| | * | | [ticket/11363] Load module info files for extensions tooNathaniel Guse2013-02-271-34/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the acp_modules::get_module_infos function instead of our own include code PHPBB3-11363
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11372' into developDavid King2013-02-281-13/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11372: [ticket/11372] Migrator should only check if effectively installed if not
| | * | | | [ticket/11372] Migrator should only check if effectively installed if notNathaniel Guse2013-02-271-13/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | installed at all PHPBB3-11372
| | | * | Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ↵Nathan Guse2013-02-286-9/+25
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11103 # By Matt Friedman # Via Matt Friedman * remotes/VSE/ticket/11103-VSEphpbb: [ticket/11103] Remove padding from notifications for now. [ticket/11103] Add newlines to bottom of css file [ticket/11103] HTML encode double arrow character [ticket/11103] Update styling of UCP Notifications in subsilver2 [ticket/11103] Update styling of UCP Notifications in prosilver [ticket/11103] Update styling of subsilver2 notification modal [ticket/11103] Update styling of prosilver notification modal [ticket/11103] Remove title attribute from notification link
| | | | * | [ticket/11103] Remove padding from notifications for now.Matt Friedman2013-02-272-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Add newlines to bottom of css fileMatt Friedman2013-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] HTML encode double arrow characterMatt Friedman2013-02-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Update styling of UCP Notifications in subsilver2Matt Friedman2013-02-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Update styling of UCP Notifications in prosilverMatt Friedman2013-02-142-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Update styling of subsilver2 notification modalMatt Friedman2013-02-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Update styling of prosilver notification modalMatt Friedman2013-02-142-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | | * | [ticket/11103] Remove title attribute from notification linkMatt Friedman2013-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | | * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-02-281-23/+18
| | | |\ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via David King (2) and Nathaniel Guse (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11370] Effectively installed migrations not inserted into table [ticket/11369] Reverting migration throws error
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11370' into developDavid King2013-02-281-22/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11370: [ticket/11370] Effectively installed migrations not inserted into table
| | * | | | | [ticket/11370] Effectively installed migrations not inserted into tableNathaniel Guse2013-02-261-22/+17
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insert_migration() function now handles inserting/updating Move all insert/update code to insert_migration() function to prevent this from occurring again. PHPBB3-11370
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11369' into developDavid King2013-02-281-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11369: [ticket/11369] Reverting migration throws error
| | * | | | [ticket/11369] Reverting migration throws errorNathaniel Guse2013-02-261-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | String is attempted to be unserialized PHPBB3-11369
| | * | | [ticket/11103] Notifications Migration fileNathaniel Guse2013-02-261-0/+160
| | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| | * | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-2679-3080/+3896
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11367' into developDavid King2013-02-261-3/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (1) and Nathaniel Guse (1) # Via Nathan Guse * EXreaction/ticket/11367: [ticket/11367] Always freeresult [ticket/11367] Migrator throws error if migrations table does not exist
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 19:39:31 +0000