Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/15251] Use dispatcher_interface in help manager | Agris | 2017-06-25 | 1 | -3/+3 |
| | | | | | | Allow TraceableEventDispatcher for webprofiler PHPBB3-15251 | ||||
* | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 1 | -1/+15 |
|\ | |||||
| * | Merge pull request #4855 from dsinn/ticket/15250 | Marc Alexander | 2017-06-25 | 1 | -1/+15 |
| |\ | | | | | | | | | | [ticket/15250] Add core event to MCP at the end of merge_posts | ||||
| | * | [ticket/15250] Add core event to MCP at the end of merge_posts | Daniel Sinn | 2017-06-20 | 1 | -1/+15 |
| | | | | | | | | | | | | PHPBB3-15250 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 2 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4850 from rxu/ticket/15246 | Marc Alexander | 2017-06-25 | 2 | -4/+4 |
| |\ \ | | | | | | | | | | | | | [ticket/15246] Allow use of Unix socket as memcache(d) host | ||||
| | * | | [ticket/15246] Allow use of Unix socket as memcache(d) host | rxu | 2017-06-17 | 2 | -4/+4 |
| | |/ | | | | | | | | | | PHPBB3-15246 | ||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #4842 from rxu/ticket/15238-3.1 | Marc Alexander | 2017-06-25 | 3 | -0/+145 |
| |\ \ | | |/ | |/| | | | | [ticket/15238] Add console command to fix forums/modules left/right IDs | ||||
| | * | [ticket/15238] Add missing protected keyword | rxu | 2017-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| | * | [ticket/15238] More code cleanup | rxu | 2017-06-18 | 1 | -1/+2 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| | * | [ticket/15238] Code cleanup, add docblocks | rxu | 2017-06-18 | 1 | -11/+39 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| | * | [ticket/15238] Add console command to fix forums/modules left/right IDs | rxu | 2017-06-18 | 3 | -0/+116 |
| |/ | | | | | | | PHPBB3-15238 | ||||
* | | Merge pull request #4843 from rxu/ticket/15238 | Marc Alexander | 2017-06-25 | 3 | -0/+148 |
|\ \ | | | | | | | | | | [ticket/15238] Add console command to fix forums/modules left/right IDs | ||||
| * | | [ticket/15238] Add missing protected keyword | rxu | 2017-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| * | | [ticket/15238] More code cleanup | rxu | 2017-06-18 | 1 | -1/+2 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| * | | [ticket/15238] Code cleanup, add docblocks | rxu | 2017-06-18 | 1 | -11/+39 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
| * | | [ticket/15238] Add console command to fix forums/modules left/right IDs | rxu | 2017-06-18 | 3 | -0/+119 |
| | | | | | | | | | | | | PHPBB3-15238 | ||||
* | | | Merge pull request #4824 from senky/ticket/15217 | Marc Alexander | 2017-06-25 | 1 | -3/+28 |
|\ \ \ | | | | | | | | | | | | | [ticket/15217] Add core.user_format_date_override event | ||||
| * | | | [ticket/15217] Add core.user_format_date_override event | Jakub Senko | 2017-06-05 | 1 | -3/+28 |
| | | | | | | | | | | | | | | | | PHPBB3-15217 | ||||
* | | | | Merge pull request #4794 from lr94/ticket/15176 | Marc Alexander | 2017-06-24 | 5 | -3/+44 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/15176] Add setting for user activity display limit. | ||||
| * | | | | [ticket/15176] Add setting for user activity display limit. | lr94 | 2017-04-16 | 5 | -3/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to phpBB 3.2 the maximum number of posts a user must have to have his activity shown is 5000. This limit is hardcoded in functions_display.php. It would be useful if board administrators could choose to disable the limit or to set an higher value. PHPBB3-15176 | ||||
* | | | | | Merge pull request #4856 from rxu/ticket/15252 | Marc Alexander | 2017-06-24 | 1 | -0/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | [ticket/15252] Fix editing a topic with poll by user not permitted to edit poll | ||||
| * | | | | [ticket/15252] Fix editing a topic with poll by user not permitted to edit poll | rxu | 2017-06-21 | 1 | -0/+5 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Basically, decoding the original poll title and options text was missing. PHPBB3-15252 | ||||
* | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-16 | 2 | -0/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #4845 from javiexin/ticket/15241 | Marc Alexander | 2017-06-16 | 2 | -0/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | [ticket/15241] Add ACP template event acp_profile_contact_last | ||||
| | * | | | [ticket/15241] Add ACP template event acp_profile_contact_last | javiexin | 2017-06-05 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event to place code in Profile Field configuration screen, as additional information for Contact Profile Fields. PHPBB-15241 | ||||
* | | | | | Merge pull request #4849 from rubencm/ticket/15243 | Marc Alexander | 2017-06-16 | 2 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/15243] Check permissions before installing with SQLite | ||||
| * | | | | | [ticket/15243] Check permissions before installing with SQLite | Rubén Calvo | 2017-06-15 | 2 | -0/+10 |
|/ / / / / | | | | | | | | | | | | | | | | PHPBB3-15243 | ||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-11 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4797 from marc1706/ticket/15178 | Marc Alexander | 2017-06-11 | 2 | -68/+82 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/15178] Update dependencies for 3.1.x | ||||
* | \ \ \ \ | Merge pull request #4799 from marc1706/ticket/15179 | Marc Alexander | 2017-06-11 | 5 | -188/+210 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15179] Update dependencies and fix compatibility with newer twig | ||||
| * | | | | | | [ticket/15179] Replace spaces with a tab | Marc Alexander | 2017-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15179 | ||||
| * | | | | | | Merge branch 'ticket/15178' into ticket/15179 | Marc Alexander | 2017-05-31 | 4 | -187/+209 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | [ticket/15178] Run update again | Marc Alexander | 2017-05-31 | 1 | -13/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15178 | ||||
| | * | | | | | [ticket/15178] Update dependencies for 3.1.x | Marc Alexander | 2017-04-17 | 2 | -64/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15178 | ||||
* | | | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2017-06-06 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | * 3.1.x: | ||||
| * | | | | | | Merge pull request #4825 from marc1706/ticket/15219 | Tristan Darricau | 2017-06-06 | 7 | -0/+315 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15219] Update hashes to bcrypt with cron * github.com:phpbb/phpbb: [ticket/15219] Add console command for updating hashes to bcrypt [ticket/15219] Add missing space [ticket/15219] Update hashes to bcrypt with cron | ||||
* | \ \ \ \ \ \ | Merge pull request #4826 from marc1706/ticket/15219-rhea | Tristan Darricau | 2017-06-06 | 7 | -0/+316 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15219] Update hashes to bcrypt with cron -- Rhea * github.com:phpbb/phpbb: [ticket/15219] Add console command for updating hashes to bcrypt [ticket/15219] Add missing space [ticket/15219] Update hashes to bcrypt with cron | ||||
| * \ \ \ \ \ \ \ | Merge branch 'ticket/15219' into ticket/15219-rhea | Marc Alexander | 2017-06-03 | 3 | -0/+132 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | [ticket/15219] Add console command for updating hashes to bcrypt | Marc Alexander | 2017-06-03 | 3 | -0/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15219 | ||||
| * | | | | | | | | Merge branch 'ticket/15219' into ticket/15219-rhea | Marc Alexander | 2017-05-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | [ticket/15219] Add missing space | Marc Alexander | 2017-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15219 | ||||
| * | | | | | | | | Merge branch 'ticket/15219' into ticket/15219-rhea | Marc Alexander | 2017-05-05 | 4 | -0/+184 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | [ticket/15219] Update hashes to bcrypt with cron | Marc Alexander | 2017-05-05 | 4 | -0/+184 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15219 | ||||
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-05 | 5 | -5/+20 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4840 from rmcgirr83/ticket_15237 | Marc Alexander | 2017-06-05 | 5 | -5/+20 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15237] Fix unguarded includes to functions_user | ||||
| | * | | | | | | | [ticket/15237] Fix unguarded includes to functions_user | RMcGirr83 | 2017-05-24 | 5 | -5/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15237 PHPBB3-15237 | ||||
* | | | | | | | | | Merge pull request #4833 from javiexin/ticket/15227 | Marc Alexander | 2017-06-05 | 4 | -85/+7 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15227] Check PHP version and remove old unused code | ||||
| * | | | | | | | | | [ticket/15227] Remove function deregister_globals, not needed | javiexin | 2017-05-21 | 1 | -58/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227 |