Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-04-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #4268 from marc1706/ticket/14532 | Tristan Darricau | 2016-04-03 | 1 | -1/+1 |
| |\ | |||||
| | * | [ticket/14532] Do not escape column default in mssql | Marc Alexander | 2016-03-31 | 1 | -1/+1 |
* | | | Merge pull request #4277 from JoshyPHP/ticket/14260 | Tristan Darricau | 2016-04-03 | 2 | -0/+2 |
|\ \ \ | |||||
| * | | | [ticket/14260] Added regression test | JoshyPHP | 2016-04-03 | 2 | -0/+2 |
|/ / / | |||||
* | | | Merge branch 'ticket/14426' into 3.2.x | Marc Alexander | 2016-04-03 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | [ticket/14426] Fixed undefined offset error | JoshyPHP | 2016-04-03 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #4271 from kasimi/ticket/14562-3.2.x | Tristan Darricau | 2016-04-02 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | [ticket/14562] Language fallback for extension permissions (3.2.x) | kasimi | 2016-04-01 | 1 | -2/+2 |
* | | | | Revert "[ticket/14562] Language fallback for extension permissions" | Tristan Darricau | 2016-04-02 | 1 | -31/+2 |
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-04-02 | 1 | -2/+31 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #4270 from kasimi/ticket/14562 | Tristan Darricau | 2016-04-02 | 1 | -2/+31 |
| |\ \ \ | |||||
| | * | | | [ticket/14562] Language fallback for extension permissions | kasimi | 2016-04-01 | 1 | -2/+31 |
| | | |/ | | |/| | |||||
* | | | | Merge pull request #4274 from marc1706/ticket/14495 | Tristan Darricau | 2016-04-02 | 7 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | [ticket/14495] Specify correct version numbers in 3.2.x | Marc Alexander | 2016-04-02 | 7 | -11/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-04-02 | 0 | -0/+0 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #4272 from marc1706/ticket/14577 | Tristan Darricau | 2016-04-02 | 5 | -12/+12 |
| |\ \ \ | | |_|/ | |/| | | |||||
* | | | | Merge pull request #4273 from marc1706/ticket/14577-3.2.x | Tristan Darricau | 2016-04-02 | 5 | -12/+12 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'ticket/14577' into ticket/14577-3.2.x | Marc Alexander | 2016-04-02 | 5 | -12/+12 |
| |\ \ \ |/ / / / | | | _ | |||||
| * | | [ticket/14577] Do not calculate size of array in for loop | Marc Alexander | 2016-04-02 | 5 | -12/+12 |
| |/ | |||||
* | | Merge pull request #4255 from CHItA/ticket/14393 | Tristan Darricau | 2016-03-31 | 3 | -11/+14 |
|\ \ | |||||
| * | | [ticket/14393] Fix db update progress bar | Máté Bartus | 2016-03-30 | 1 | -2/+1 |
| * | | [ticket/14393] Fix init for conflict archive | Máté Bartus | 2016-03-27 | 1 | -7/+6 |
| * | | [ticket/14393] Fix updater behaviour | Máté Bartus | 2016-03-27 | 3 | -4/+9 |
* | | | Merge pull request #4269 from VSEphpbb/ticket/14576 | Tristan Darricau | 2016-03-31 | 141 | -289/+10 |
|\ \ \ | |||||
| * | | | [ticket/14576] Move common required files to bootstrap | Matt Friedman | 2016-03-31 | 141 | -289/+10 |
|/ / / | |||||
* | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-03-31 | 32 | -0/+160 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #4264 from VSEphpbb/ticket/14570 | Marc Alexander | 2016-03-31 | 32 | -0/+160 |
| |\ \ | |||||
| | * | | [ticket/14570] Use phpbb_version_compare | Matt Friedman | 2016-03-29 | 32 | -32/+32 |
| | * | | [ticket/14570] Add effectively installed to 3.1.x versions | Matt Friedman | 2016-03-29 | 32 | -0/+160 |
* | | | | Merge pull request #4267 from GregRyckman/ticket/14572 | Marc Alexander | 2016-03-30 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | [ticket/14572] Fix quote notification deletion | Greg Ryckman | 2016-03-30 | 1 | -2/+2 |
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-03-30 | 1 | -0/+0 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge pull request #4259 from Nicofuma/ticket/14565 | Marc Alexander | 2016-03-30 | 2 | -0/+5 |
| |\ \ \ | |||||
| | * | | | [ticket/14565] Workaround for php 5.3.3 | Tristan Darricau | 2016-03-29 | 1 | -0/+5 |
| | * | | | [ticket/14565] Updates composer.phar to 1.0.0-beta2 | Tristan Darricau | 2016-03-27 | 1 | -0/+0 |
* | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-03-30 | 1 | -6/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4262 from Senky/ticket/10356 | Marc Alexander | 2016-03-30 | 1 | -6/+7 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/10356] Find inactive users in livesearch when having permissions | Jakub Senko | 2016-03-29 | 1 | -6/+7 |
| |/ / / / | |||||
* | | | | | Merge branch '3.1.x' into 3.2.x | Máté Bartus | 2016-03-28 | 2 | -7/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #4260 from VSEphpbb/ticket/14568 | Máté Bartus | 2016-03-28 | 2 | -7/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | [ticket/14568] Update the repository readme | Matt Friedman | 2016-03-28 | 2 | -7/+7 |
| | |/ / | |||||
* | | | | Merge pull request #4257 from CHItA/ticket/14564 | Marc Alexander | 2016-03-28 | 1 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | [ticket/14564] Fix cookie domain calculation | Máté Bartus | 2016-03-27 | 1 | -1/+8 |
|/ / / / | |||||
* | | | | Merge pull request #4252 from RMcGirr83/ticket_14329 | Tristan Darricau | 2016-03-27 | 1 | -0/+10 |
|\ \ \ \ | |||||
| * | | | | [ticket/14329] Add missing ACP language vars | Richard McGirr | 2016-03-27 | 1 | -0/+10 |
* | | | | | Merge branch '3.1.x' into 3.2.x | Tristan Darricau | 2016-03-27 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #4021 from marc1706/ticket/14272 | Tristan Darricau | 2016-03-27 | 39 | -93/+139 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge pull request #4251 from marc1706/ticket/14272-3.2.x | Tristan Darricau | 2016-03-27 | 33 | -87/+130 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x | Marc Alexander | 2016-03-27 | 33 | -87/+130 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | |