Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3592 from Nicofuma/ticket/13388 | Nils Adermann | 2015-05-30 | 1 | -7/+124 |
|\ | |||||
| * | [ticket/13388] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -0/+1 |
| * | [ticket/13388] Fix deprecations | Tristan Darricau | 2015-05-29 | 1 | -1/+1 |
| * | [ticket/13388] Fix rebase | Tristan Darricau | 2015-05-29 | 1 | -0/+1 |
| * | [ticket/13388] Address comments | Tristan Darricau | 2015-05-29 | 1 | -5/+4 |
| * | [ticket/13388] Integrate routing and di parameters resolution | Tristan Darricau | 2015-05-29 | 1 | -7/+123 |
* | | [ticket/13896] Fix coding style | Tristan Darricau | 2015-05-30 | 1 | -1/+1 |
* | | Merge branch '3.1.x' | Nils Adermann | 2015-05-30 | 16 | -17/+3 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #3560 from Nicofuma/ticket/13790 | Nils Adermann | 2015-05-30 | 16 | -17/+3 |
| |\ | |||||
| | * | [ticket/13790] Update phpcs | Tristan Darricau | 2015-05-19 | 16 | -17/+3 |
* | | | Merge pull request #3561 from s9e/ticket/10922 | Tristan Darricau | 2015-05-29 | 1 | -2/+13 |
|\ \ \ | |||||
| * | | | [ticket/10922] Replaced urlencode() with rawurlencode() | JoshyPHP | 2015-04-28 | 1 | -1/+1 |
| * | | | [ticket/10922] Added support for body and subject in email BBCode | JoshyPHP | 2015-04-28 | 1 | -2/+13 |
* | | | | Merge pull request #3613 from nickvergessen/ticket/13844 | Tristan Darricau | 2015-05-29 | 6 | -15/+466 |
|\ \ \ \ | |||||
| * | | | | [ticket/13844] Add events | Joas Schilling | 2015-05-20 | 2 | -11/+57 |
| * | | | | [ticket/13844] Remove hacky code for the help array | Joas Schilling | 2015-05-17 | 2 | -15/+4 |
| * | | | | [ticket/13844] FAQ in new controller format | Joas Schilling | 2015-05-16 | 1 | -0/+165 |
| * | | | | [ticket/13844] Refactor bbcode help to the new system | Joas Schilling | 2015-05-16 | 3 | -0/+251 |
* | | | | | Merge pull request #3616 from s9e/ticket/13847 | Tristan Darricau | 2015-05-29 | 2 | -0/+50 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortest | JoshyPHP | 2015-05-25 | 1 | -3/+4 |
| * | | | | | [ticket/13847] Move quote generation to text_formatter.utils | JoshyPHP | 2015-05-25 | 2 | -0/+49 |
* | | | | | | Merge pull request #3622 from s9e/ticket/13860 | Tristan Darricau | 2015-05-29 | 1 | -1/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/13860] Fixed array-to-string conversion | JoshyPHP | 2015-05-28 | 1 | -1/+7 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3625 from s9e/ticket/11742 | Tristan Darricau | 2015-05-29 | 1 | -43/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [ticket/11742] Removed tabs-to-space conversion in [code] | JoshyPHP | 2015-05-23 | 1 | -43/+0 |
* | | | | | | | Merge pull request #3554 from Nicofuma/ticket/13770 | Nils Adermann | 2015-05-29 | 1 | -245/+251 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ticket/13770] Use dummy cache driver | Nicofuma | 2015-05-14 | 1 | -1/+1 |
| * | | | | | | | [ticket/13770] Fix tests | Nicofuma | 2015-05-14 | 1 | -35/+48 |
| * | | | | | | | [ticket/13770] Update tests | Tristan Darricau | 2015-05-14 | 1 | -1/+4 |
| * | | | | | | | [ticket/13770] Wither interface for container_builder | Tristan Darricau | 2015-05-14 | 1 | -257/+247 |
* | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-28 | 2 | -3/+87 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3633 from nickvergessen/ticket/13872 | Marc Alexander | 2015-05-28 | 2 | -3/+87 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/13872] Allow template events to have a changed version | Joas Schilling | 2015-05-28 | 2 | -3/+87 |
* | | | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-05-28 | 1 | -15/+70 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Merge pull request #3457 from brunoais/ticket/13661 | Joas Schilling | 2015-05-28 | 1 | -15/+70 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | [ticket/13661] BUMP version to 3.1.5-dev | brunoais | 2015-05-06 | 1 | -1/+1 |
| | * | | | | | | [ticket/13661] Brackets in their own line | brunoais | 2015-03-02 | 1 | -1/+2 |
| | * | | | | | | [ticket/13661] Re-Fixed $log_type -> $log_time | brunoais | 2015-03-01 | 1 | -1/+1 |
| | * | | | | | | [ticket/13661] Wrong event @since version | brunoais | 2015-03-01 | 1 | -1/+1 |
| | * | | | | | | [ticket/13661] Removed superfluous whitespace | brunoais | 2015-03-01 | 1 | -1/+1 |
| | * | | | | | | [ticket/13661] bugfix: The conditional is the log_time, not log_type | brunoais | 2015-03-01 | 1 | -3/+3 |
| | * | | | | | | [ticket/13661] Fixed the "FROM" in the built query. | brunoais | 2015-03-01 | 1 | -1/+4 |
| | * | | | | | | [ticket/13661] Add event to allow editing the queries used to get the logs | brunoais | 2015-03-01 | 1 | -2/+45 |
| | * | | | | | | [ticket/13661] Transform queries to get logs and log count into built queries | brunoais | 2015-02-28 | 1 | -15/+23 |
* | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-05-22 | 1 | -5/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge pull request #3624 from VSEphpbb/ticket/13861 | Marc Alexander | 2015-05-22 | 1 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/13861] Fix undefined variables in style update migration | Matt Friedman | 2015-05-21 | 1 | -3/+3 |
* | | | | | | | | Merge pull request #3608 from Nicofuma/ticket/13829 | Marc Alexander | 2015-05-20 | 1 | -22/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ticket/13829] Don't fail if the cache isn't writeable | Nicofuma | 2015-05-14 | 1 | -22/+37 |
* | | | | | | | | | Merge pull request #3621 from Nicofuma/ticket/13849 | Marc Alexander | 2015-05-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ |