aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4193 from marc1706/ticket/14497Tristan Darricau2016-03-253-16/+61
|\ | | | | | | | | | | | | | | | | | | [ticket/14497] Support second app.php script in install folder * marc1706/ticket/14497: [ticket/14497] Do not check for doctype on index and use correct return [ticket/14497] Add test for visiting installer [ticket/14497] Use nginx sample config in travis tests [ticket/14497] Support second app.php script in install folder
| * [ticket/14497] Do not check for doctype on index and use correct returnMarc Alexander2016-03-051-4/+4
| | | | | | | | PHPBB3-14497
| * [ticket/14497] Add test for visiting installerMarc Alexander2016-03-051-0/+30
| | | | | | | | PHPBB3-14497
| * [ticket/14497] Use nginx sample config in travis testsMarc Alexander2016-03-051-15/+7
| | | | | | | | PHPBB3-14497
| * [ticket/14497] Support second app.php script in install folderMarc Alexander2016-02-251-1/+24
| | | | | | | | PHPBB3-14497
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-253-5/+32
|\ \ | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * \ Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-253-5/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14241] Prevent empty q&a as a result of improper settings * marc1706/ticket/14241: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| | * | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-122-4/+9
| | | | | | | | | | | | | | | | PHPBB3-14241
| | * | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-112-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improper setup of the q&a captcha in combination with the admin choosing a default language that does not have any questions and answers set might result in the user being presented empty questions and answers. This change will try to fall back to any question in case the admin incorrectly set the default language and has no questions & answers set. If that does not work, the captcha will not allow passing it and suggest to contact the board admin to resolve this issue. PHPBB3-14241
* | | | Merge pull request #4218 from marc1706/ticket/14527Tristan Darricau2016-03-253-2/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14527] Retrieve link URL from href and not link text * marc1706/ticket/14527: [ticket/14527] Decode automatically generated postlink without prefix [ticket/14527] Add tests for reverted improper fix [ticket/14527] Retrieve link URL from href and not link text
| * | | | [ticket/14527] Decode automatically generated postlink without prefixMarc Alexander2016-03-133-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The http prefix gets automatically added and should be removed prior to outputting the post to the user. PHPBB3-14527
| * | | | [ticket/14527] Add tests for reverted improper fixMarc Alexander2016-03-131-1/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-14527
| * | | | [ticket/14527] Retrieve link URL from href and not link textMarc Alexander2016-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14527
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-252-2/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 3.1.x: [ticket/13630] Prevent empty parameter select_single
| * | | | Merge pull request #4231 from Senky/ticket/13630Tristan Darricau2016-03-252-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13630] Prevent empty parameter select_single * Senky/ticket/13630: [ticket/13630] Prevent empty parameter select_single
| | * | | | [ticket/13630] Prevent empty parameter select_singleJakub Senko2016-03-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13630
* | | | | | Merge pull request #4239 from marc1706/ticket/14530Tristan Darricau2016-03-253-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14530] Only generate text again if sig was parsed for storage * marc1706/ticket/14530: [ticket/14530] Only generate text again if sig was parsed for storage [ticket/14530] Add accidentally removed sig_parsed flag
| * | | | | | [ticket/14530] Only generate text again if sig was parsed for storageMarc Alexander2016-03-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14530
| * | | | | | [ticket/14530] Add accidentally removed sig_parsed flagMarc Alexander2016-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed by accident previously while moving from the use of the old bbcode class to the generate_test_for_display function. PHPBB3-14530
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14290] Correctly use modified since header
| * | | | | | Merge pull request #4244 from marc1706/ticket/14290Tristan Darricau2016-03-251-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14290] Correctly use modified since header * marc1706/ticket/14290: [ticket/14290] Correctly use modified since header
| | * | | | | | [ticket/14290] Correctly use modified since headerMarc Alexander2016-03-241-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14290
* | | | | | | Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-2511-14/+104
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14381] Set the mode in message parser to "reparse" * JoshyPHP/ticket/14381: [ticket/14381] Set the mode in message parser to "reparse" [ticket/14495] Updates the version to 3.3.0-a1-dev
| * | | | | | | [ticket/14381] Set the mode in message parser to "reparse"JoshyPHP2016-03-243-1/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default mode is "post". By setting it to something else, all limits pertaining to posts (min/max length, etc...) should be disabled. PHPBB3-14381
| * | | | | | | Merge branch '3.2.x'Marc Alexander2016-03-241-0/+27
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-231-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '3.2.x'Tristan Darricau2016-03-161-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14540] Adjust recursive_dot_prefix_filter_iterator for performance
| * \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-151-135/+139
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14538] Update dependencies for 3.2.x [ticket/14538] Update composer dependencies
| * \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14528] Add back itemprop definitions to breadcrumbs [ticket/14528] Update navbar_header.html for valid microdata
| * \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-119-60/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14523] Replace prototype definition with shared services
| * | | | | | | | | | | | Merge branch '3.2.x'Tristan Darricau2016-03-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14529] Stop using --prefer-source for composer
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-101-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14496] Destroy update_list_time cache variable on intro [ticket/14496] Cache last update of update list instead of using filemtime
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-091-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-091-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/13264] Link to post if user can view it [ticket/13264] Do not force approved state if post visibility is known
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-083-14/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14132] Use transaction for adding notifications to type table [ticket/14519] Skip query if all unread notifications are retrieved [ticket/14483] Do not send headers by default on access via controller
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-073-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [release-3.2.0-b2] Update versions to 3.2.0-3-dev
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-071-8/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14510] Prevent infinite loop in add_bots task
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-019-9/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-2912-25/+510
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-02-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.2.x: [ticket/14503] Enable superglobals in cli
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-282-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-271-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-271-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-272-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-13 23:44:24 +0000