aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14933] Make "route not found" more user-friendlyOliver Schramm2017-09-093-2/+17
| | | | PHPBB3-14933
* Merge branch '3.1.x' into 3.2.xOliver Schramm2017-09-082-6/+6
|\
| * Merge pull request #4929 from marc1706/ticket/15347Oliver Schramm2017-09-082-6/+6
| |\ | | | | | | | | | [ticket/15347] Use single quotes in update hashes query
| | * [ticket/15347] Fix query quotes in update hashes cli commandMarc Alexander2017-09-081-3/+3
| | | | | | | | | | | | PHPBB3-15347
| | * [ticket/15347] Use single quotes in update hashes queryMarc Alexander2017-09-071-3/+3
| |/ | | | | | | PHPBB3-15347
* | Merge pull request #4936 from marc1706/ticket/7845Oliver Schramm2017-09-081-1/+1
|\ \ | | | | | | | | | [ticket/7845] Ensure config script path is not empty
| * | [ticket/7845] Ensure config script path is not emptyMarc Alexander2017-09-081-1/+1
| | | | | | | | | | | | PHPBB3-7845
* | | Merge pull request #4934 from marc1706/ticket/7488Oliver Schramm2017-09-081-0/+6
|\ \ \ | | | | | | | | | | | | [ticket/7488] Display no forums message if user can't see forums of category
| * | | [ticket/7488] Display no forums message if user can't see forums of categoryMarc Alexander2017-09-081-0/+6
| |/ / | | | | | | | | | PHPBB3-7488
* | | Merge pull request #4935 from JimMH/patch-4Oliver Schramm2017-09-081-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/15352] Descriptions are not used in categories
| * | [ticket/15352] Descriptions are not using in categoriesJim Mossing Holsteyn2017-09-081-1/+1
|/ / | | | | | | PHPBB3-15352
* | Merge pull request #4928 from Crizz0/ticket/15350Tristan Darricau2017-09-073-3/+3
|\ \ | | | | | | | | | | | | | | | | | | [ticket/15350] Changes outdated wiki-link for plural-rules to new docs/ * github.com:phpbb/phpbb: [ticket/15350] Changes outdated wiki-link to new docs/
| * | [ticket/15350] Changes outdated wiki-link to new docs/Crizzo2017-09-073-3/+3
| | | | | | | | | | | | PHPBB3-15350
* | | Merge pull request #4900 from rxu/ticket/15318Máté Bartus2017-09-072-4/+21
|\ \ \ | | | | | | | | [ticket/15318] Make user option to disable word censoring effective again
| * | | [ticket/15318] Add UCP censoring switch testingrxu2017-08-121-1/+10
| | | | | | | | | | | | | | | | PHPBB3-15318
| * | | [ticket/15318] Fix testsrxu2017-08-121-3/+3
| | | | | | | | | | | | | | | | PHPBB3-15318
| * | | [ticket/15318] Make user option to disable word censoring effective againrxu2017-08-121-0/+8
| | | | | | | | | | | | | | | | PHPBB3-15318
* | | | Merge pull request #4902 from MoleDJ/patch-1Máté Bartus2017-09-071-0/+4
|\ \ \ \ | | | | | | | | | | [ticket/15320] Redis cache does not save keys withouth expiration
| * | | | [ticket/15320] Fix to accomplish coding guidelinesJagoba Los Arcos2017-08-141-1/+1
| | | | |
| * | | | [ticket/15320] Redis cache does not save keys withouth expirationJagoba Los Arcos2017-08-131-0/+4
| | | | | | | | | | | | | | | | | | | | In some functions like sql_save in cache/memory.php, code try to save a key/value in cache with ttl = 0 so key should never expire. In current redis.php cache driver, it fails so key never get cached. This cause for example that when you create a subforum, it not appear in the forum box in the admincp. To solve, if ttl is 0, we use redis->set instead of setex
* | | | | Merge pull request #4903 from rxu/ticket/15323Máté Bartus2017-09-074-7/+102
|\ \ \ \ \ | | | | | | | | | | | | [ticket/15323] Allow Twig syntax in bbcode.html
| * | | | | [ticket/15323] Run s9e configurator tests on twigified bbcode.htmlrxu2017-08-152-5/+95
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15323
| * | | | | [ticket/15323] Allow Twig syntax in bbcode.htmlrxu2017-08-152-2/+7
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15323
* | | | | Merge pull request #4920 from hanakin/ticket/15262Tristan Darricau2017-09-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/15262] Update button font-weight * github.com:phpbb/phpbb: [ticket/15262] Update the font-weight of buttons
| * | | | [ticket/15262] Update the font-weight of buttonsMichael Miday2017-08-301-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-15262
* | | | Merge pull request #4919 from sdschulze/ticket/15309Tristan Darricau2017-09-074-13/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15309] Fix pagination overlap in prosilver via "left-box" * github.com:phpbb/phpbb: [ticket/15309] Add margin to pagination [ticket/15309] Right-align responsive pagination for consistency [ticket/15309] Fix pagination overlap
| * | | | [ticket/15309] Add margin to paginationSoeren D. Schulze2017-08-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set margin-top and margin-bottom of pagination to 3px PHPBB3-15309
| * | | | [ticket/15309] Right-align responsive pagination for consistencySoeren D. Schulze2017-08-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Left-aligning pagination is no longer needed after fix PHPBB3-15309
| * | | | [ticket/15309] Fix pagination overlapSoeren D. Schulze2017-08-283-4/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | Mark the contents of the column as "left-box", enabling proper alignment PHPBB3-15309
* | | | Merge pull request #4913 from kasimi/ticket/15333Tristan Darricau2017-09-071-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15333] Call callback when confirm dialog is canceled * github.com:phpbb/phpbb: [ticket/15333] Call callback when confirm dialog is canceled
| * | | | [ticket/15333] Call callback when confirm dialog is canceledkasimi2017-08-211-3/+1
| |/ / / | | | | | | | | | | | | PHPBB3-15333
* | | | Merge pull request #4905 from rxu/ticket/15324Máté Bartus2017-09-078-7/+112
|\ \ \ \ | | | | | | | | | | [ticket/15324] Add more core and template events
| * | | | [ticket/15324] Add more core and template eventsrxu2017-08-168-7/+112
| |/ / / | | | | | | | | | | | | PHPBB3-15324
* | | | Merge pull request #4906 from rxu/ticket/15327Máté Bartus2017-09-071-1/+1
|\ \ \ \ | | | | | | | | | | [ticket/15327] Add post anchor to the log postlink
| * | | | [ticket/15327] Add post anchor to the log postlinkrxu2017-08-171-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-15327
* | | | Merge pull request #4912 from kasimi/ticket/15332Tristan Darricau2017-09-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15332] Don't remove dark background if fadedark is false * github.com:phpbb/phpbb: [ticket/15332] Don't remove dark background if fadedark is false
| * | | | [ticket/15332] Don't remove dark background if fadedark is falsekasimi2017-08-211-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-15332
* | | | Merge pull request #4908 from hubaishan/ticket/15317Máté Bartus2017-09-071-0/+1
|\ \ \ \ | | | | | | | | | | [ticket/15317] Fix phpbbcli language
| * | | | [ticket/15317] Fix phpbbcli languagehubaishan2017-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated as Nicofuma said PHPBB3-15317
| * | | | [ticket/15317] Fix phpbbcli languagehubaishan2017-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix language by adding set_default_language PHPBB3-15317
* | | | | Merge pull request #4914 from kasimi/ticket/15334Máté Bartus2017-09-072-0/+8
|\ \ \ \ \ | | | | | | | | | | | | [ticket/15334] Add template event viewtopic_topic_title_before
| * | | | | [ticket/15334] Add template event viewtopic_topic_title_beforekasimi2017-08-212-0/+8
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-15334
* | | | | Merge pull request #4918 from kasimi/ticket/15328Máté Bartus2017-09-076-11/+42
|\ \ \ \ \ | | | | | | | | | | | | [ticket/15328] Disable checkbox if notification method isn't supported
| * | | | | [ticket/15328] Use type_interfacekasimi2017-09-073-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15328
| * | | | | [ticket/15328] Disable checkbox if notification method isn't supportedkasimi2017-08-246-11/+36
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15328
* | | | | Merge pull request #4922 from DavidIQ/ticket/15340Tristan Darricau2017-09-071-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15340] Update plupload to version 2.3.3 * github.com:phpbb/phpbb: [ticket/15340] Update plupload to version 2.3.3
| * | | | | [ticket/15340] Update plupload to version 2.3.3David Colón2017-08-311-9/+9
| |/ / / /
* | | | | Merge pull request #4924 from rubencm/ticket/15346Máté Bartus2017-09-072-0/+9
|\ \ \ \ \ | | | | | | | | | | | | [ticket/15346] Check if extension is enableable during install
| * | | | | [ticket/15346] Add log message if extension is not enableableRubén Calvo2017-09-052-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15346
| * | | | | [ticket/15346] Check if extension is enableable during installRubén Calvo2017-09-031-0/+7
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-15346