aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-20/+53
|\
| * Merge pull request #3191 from Elsensee/ticket/13312Joas Schilling2014-12-271-20/+53
| |\ | | | | | | | | | [ticket/13312] Add event core.acp_email_send_before
| | * [ticket/13312] Use empty for usernames arrayOliver Schramm2014-11-261-2/+2
| | | | | | | | | | | | PHPBB3-13312
| | * [ticket/13312] Add event core.acp_email_send_beforeOliver Schramm2014-11-261-19/+52
| | | | | | | | | | | | PHPBB3-13312
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+5
|\ \ \ | |/ /
| * | Merge pull request #3175 from Senky/ticket/13368Joas Schilling2014-12-271-1/+5
| |\ \ | | | | | | | | | | | | [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
| | * | [ticket/13368] Update versionJakub Senko2014-12-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13368
| | * | [ticket/13368] Add @changed entryJakub Senko2014-11-241-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13368
| | * | [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data eventJakub Senko2014-11-241-1/+3
| | | | | | | | | | | | | | | | PHPBB3-13368
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3168 from Senky/ticket/11033Joas Schilling2014-12-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
| | * | | [ticket/11033] Update string to reflect real requirementsJakub Senko2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11033
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-274-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/index.htm phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html phpBB/styles/subsilver2/theme/images/index.htm
| * | | | Merge pull request #3167 from Senky/ticket/12924Joas Schilling2014-12-2710-12/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12924] Make meta tags self-closing
| | * | | | [ticket/12924] Remove newlines at the EOFJakub Senko2014-11-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12924
| | * | | | [ticket/12924] Make meta tags self-closingJakub Senko2014-11-2210-14/+14
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12924
| * | | | Merge pull request #3099 from Senky/ticket/13266Joas Schilling2014-12-271-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined
| | * | | | [ticket/13266] Enable twig dump functionJakub Senko2014-11-011-0/+5
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13266
* | | | | Merge pull request #3170 from Nicofuma/ticket/13266-developJoas Schilling2014-12-274-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13266-develop] Enable twig dump function
| * | | | | [ticket/13266] Enable the debug extension in the development environmentTristan Darricau2014-11-224-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13266
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3159 from Crizz0/ticket/13357Joas Schilling2014-12-271-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
| | * | | | | [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entriesCrizzo2014-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13357
* | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-12-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12567] wrap to top
| * | | | | | Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeusCesar G2014-12-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/12567: [ticket/12567] wrap to top
| | * | | | | | [ticket/12567] wrap to topJakub Senko2014-11-221-1/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-12567
* | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-12-091-7/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13319] Add missing table tags
| * | | | | | Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeusCesar G2014-12-091-7/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/13319: [ticket/13319] Add missing table tags
| | * | | | | | [ticket/13319] Add missing table tagsJakub Senko2014-11-241-7/+9
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13319
* | | | | | | Merge pull request #3220 from nickvergessen/ticket/13421Marc Alexander2014-12-1015-118/+269
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13421 Introduce an interface for db\tools.php
| * | | | | | | [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-0615-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-063-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | [ticket/13421] Inherit docsJoas Schilling2014-12-061-85/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | [ticket/13421] Add an interface for \phpbb\db\toolsJoas Schilling2014-12-062-11/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-061-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3208 from prototech/ticket/13396Joas Schilling2014-12-061-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13396] Normalize multibyte characters in attachment file names.
| | * | | | | | | [ticket/13396] Normalize multibyte characters in attachment file names.Cesar G2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13396
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-062-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [ticket/13400] Information text if the server load id high at searchkochi2014-12-062-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13400
* | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| * | | | | | [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13405
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3192 from Elsensee/ticket/13393Joas Schilling2014-11-291-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13393] Call user->lang function directly
| | * | | | | | [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13393
| * | | | | | [ticket/13391] subsilver2 poll options must have a setting of 1 when editing ↵Prosk8er2014-11-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a post PHPBB3-13391
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3185 from Nicofuma/ticket/13389Marc Alexander2014-11-261-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13389] Replace pattern with path
| | * | | | | [ticket/13389] Replace pattern with pathTristan Darricau2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13389
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3075 from Senky/ticket/11613Marc Alexander2014-11-261-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/11613] Cookies do not work for netbios domain