aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | [ticket/13849] Fix development environmentNicofuma2015-05-191-3/+3
* | | | | | | | | | Merge pull request #3586 from s9e/ticket/13680Nicofuma2015-05-203-12/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authorsJoshyPHP2015-05-153-5/+5
| * | | | | | | | | | [ticket/13680] Updated quote notificationsJoshyPHP2015-05-153-12/+52
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | [ticket/13801] Updated event description [ci skip]JoshyPHP2015-05-181-2/+3
* | | | | | | | | | [ticket/13801] Updated comments for clarityJoshyPHP2015-05-182-2/+3
* | | | | | | | | | [ticket/13801] Removed user dependency from text_formatter.s9e.parserJoshyPHP2015-05-181-19/+8
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '3.1.x'Nicofuma2015-05-171-3/+23
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | * | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
* | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-166-9/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-163-1/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-043-1/+17
* | | | | | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-142-3/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| * | | | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-3/+43
* | | | | | | | | Merge pull request #3577 from MateBartus/ticket/13800Nicofuma2015-05-141-7/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | [ticket/13800] Make router's extension manager dependency optionalMateBartus2015-05-021-7/+10
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch '3.1.x'Nicofuma2015-05-062-10/+159
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-062-10/+159
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | * | | | | | | [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-022-5/+30
| | * | | | | | | [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | * | | | | | | [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-021-4/+101
* | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-053-9/+29
* | | | | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
* | | | | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
* | | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-041-2/+2
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-031-0/+32
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-0/+32
| |\ \ \ \ \ \
| | * | | | | | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
* | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-031-0/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-0/+37
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
* | | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-021-6/+6
* | | | | | [ticket/13762] Optional DI injectable default language module arrayMateBartus2015-05-021-5/+14
* | | | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-028-234/+1015
* | | | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-017-47/+20
* | | | | | Merge branch '3.1.x'Joas Schilling2015-04-291-0/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
| |\ \ \ \ \ | | |/ / / /
| | * | | | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-0/+32