aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4116 from marc1706/ticket/14402Tristan Darricau2016-01-181-4/+12
|\
| * [ticket/14402] Directly pass user id and ipMarc Alexander2016-01-151-3/+1
| * [ticket/14402] Get rid of globals in tidy_plupload cronMarc Alexander2016-01-151-6/+14
| * [ticket/14402] Do not expect user id and ip to be available in cronMarc Alexander2016-01-151-1/+3
* | Merge pull request #4121 from marc1706/ticket/11875Tristan Darricau2016-01-184-5/+371
|\ \
| * | [ticket/11875] Change more columns to use UINT and add missings onesMarc Alexander2016-01-131-14/+120
| * | [ticket/11875] Add migration fileMarc Alexander2016-01-131-0/+252
| * | Merge pull request #2064 from hjpotter92/ticket/11875Marc Alexander2016-01-133-5/+13
| |\ \
| | * | [ticket/11875] Recreate schemas for installhjpotter922014-03-181-4/+4
| | * | [ticket/11875] Create new map for UNSIGNED 4-byte integerhjpotter922014-03-181-2/+10
* | | | Merge branch '3.1.x'Marc Alexander2016-01-171-0/+5
|\ \ \ \
| * \ \ \ Merge pull request #3718 from javiexin/ticket/13908Marc Alexander2016-01-171-0/+5
| |\ \ \ \
| | * | | | [ticket/13908] "After" clause in migration not workingjaviexin2015-06-021-1/+1
| | * | | | [ticket/13908] "After" clause in migration not workingjaviexin2015-06-011-0/+5
* | | | | | Merge pull request #4077 from Nicofuma/ticket/14306Marc Alexander2016-01-151-49/+79
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/14306] CS and correctly handle exception loopTristan Darricau2016-01-091-4/+10
| * | | | | [ticket/14306] Update the error messageTristan Darricau2016-01-091-1/+2
| * | | | | [ticket/14306] Doesn't try to build a "safe" container in the dev envTristan Darricau2016-01-091-9/+21
| * | | | | [ticket/14306] Automatically enable a safe mode when container building failsTristan Darricau2016-01-091-49/+60
* | | | | | Merge branch '3.1.x'Marc Alexander2016-01-151-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #4117 from Elsensee/ticket/14403Marc Alexander2016-01-151-2/+2
| |\ \ \ \ \
| | * | | | | [ticket/14403] Don't expect user_id and user_ip in phpbb\logOliver Schramm2016-01-101-2/+2
* | | | | | | [ticket/13442] UTF-8 symbols for database hostlavigor2016-01-141-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #4059 from JoshyPHP/ticket/14323Marc Alexander2016-01-132-3/+168
|\ \ \ \ \ \
| * | | | | | [ticket/14323] Added should_shorten()JoshyPHP2015-12-281-1/+16
| * | | | | | [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXTJoshyPHP2015-12-272-31/+25
| * | | | | | [ticket/14323] Added comment [ci skip]JoshyPHP2015-12-261-0/+3
| * | | | | | [ticket/14323] Moved autolink-related functions to a separate helperJoshyPHP2015-12-263-54/+135
| * | | | | | [ticket/14323] Stylistic change [ci skip]JoshyPHP2015-12-261-5/+7
| * | | | | | [ticket/14323] Added support for truncating local URLsJoshyPHP2015-12-262-11/+17
| * | | | | | [ticket/14323] Added support for truncating long URLsJoshyPHP2015-12-262-2/+66
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-131-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | [ticket/14407] Fix removing users from Newly Registered Users groupZoddo2016-01-131-1/+1
* | | | | | | [ticket/14405] Force a lookahead check on [URL] BBCodesJoshyPHP2016-01-121-1/+1
* | | | | | | Merge branch '3.1.x'Marc Alexander2016-01-122-4/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3929 from kilianr/ticket/12618Marc Alexander2016-01-122-4/+11
| |\ \ \ \ \ \
| | * | | | | | [ticket/12618] Change ssl:// to tls://Kilian2016-01-101-1/+1
| | * | | | | | [ticket/12618] Allow extension author to use SSL for version-checkKilian2015-09-252-4/+11
* | | | | | | | Merge branch '3.1.x'Joas Schilling2016-01-091-0/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2016-01-091-0/+31
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | [prep-release-3.1.7] Add migration for 3.1.7-pl1Joas Schilling2016-01-091-0/+31
| * | | | | | | Merge pull request #4097 from Nicofuma/ticket/14382Marc Alexander2016-01-091-1/+6
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14382] Specify the branch-alias in the composer.json filesTristan Darricau2016-01-091-1/+6
| | |/ / / / / /
* | | | | | | | Merge pull request #4058 from marc1706/ticket/13454Tristan Darricau2016-01-0927-67/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13454] Add excessively removed code backMarc Alexander2016-01-061-1/+1
| * | | | | | | | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-064-6/+5
| * | | | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-064-6/+5
| * | | | | | | | [ticket/13454] Fix a few issues introduced by overdeleting stuffMarc Alexander2016-01-063-1/+8
| * | | | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-067-11/+3
| * | | | | | | | [ticket/13454] Remove unused variablesMarc Alexander2016-01-068-13/+5