aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-1682-658/+1860
|\ | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-1682-658/+1860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | Merge branch '3.1.x'Andreas Fischer2015-04-161-1/+1
|\ \ | | | | | | | | | | | | * 3.1.x: [ticket/13763] Fix typo in extension lang file
| * \ Merge pull request #3537 from RMcGirr83/ticket/13763Andreas Fischer2015-04-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13763] Fix typo in extension lang file * RMcGirr83/ticket/13763: [ticket/13763] Fix typo in extension lang file
| | * | [ticket/13763] Fix typo in extension lang fileRichard McGirr2015-04-151-1/+1
| |/ / | | | | | | | | | PHPBB3-13763
* | | Merge branch '3.1.x'Dhruv2015-04-142-2/+55
|\ \ \ | |/ /
| * | Merge pull request #3533 from Elsensee/ticket/13756Dhruv Goel2015-04-142-2/+55
| |\ \ | | | | | | | | [ticket/13756] Fix resize after upload with plupload
| | * | [ticket/13756] Add test for generate_resize_string()Oliver Schramm2015-04-121-0/+53
| | | | | | | | | | | | | | | | PHPBB3-13756
| | * | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
| |/ / | | | | | | | | | PHPBB3-13756
* | | Merge branch '3.1.x'Joas Schilling2015-04-103-2/+148
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-103-3/+3
| | |
| * | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-108-9/+155
| |\ \
| | * | [prep-release-3.1.4] Add changelog for 3.1.4-RC1Joas Schilling2015-04-091-1/+116
| | | |
| | * | [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
| | | |
| | * | Update version to 3.1.4-RC1Joas Schilling2015-04-096-8/+8
| |/ /
* | | Merge branch '3.1.x'Oliver Schramm2015-04-061-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3525 from marc1706/ticket/13749Oliver Schramm2015-04-061-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13749] Add missing slash to base uri in helper route tests
| | * | [ticket/13749] Add missing slash to base uri in helper route testsMarc Alexander2015-04-061-1/+1
| |/ / | | | | | | | | | PHPBB3-13749
* | | Merge branch '3.1.x'Joas Schilling2015-04-063-1/+55
|\ \ \ | |/ /
| * | Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-063-1/+55
| |\ \ | | | | | | | | | | | | [ticket/13493] Append page name to base url if it doesn't contain it
| | * | [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-113-1/+55
| | | | | | | | | | | | | | | | PHPBB3-13493
* | | | Merge branch '3.1.x'Joas Schilling2015-04-062-1/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-063-1/+30
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13710] Allow template events near smilies display
| | * | | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-193-1/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-13710
* | | | | Merge branch '3.1.x'Joas Schilling2015-04-062-0/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-062-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13701] Adds two new events to posting_pm_layout.html Conflicts: phpBB/docs/events.md
| | * | | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-132-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events wrap the includes of posting_pm_header.html to add some content before and after it. PHPBB3-13701
* | | | | | Merge branch '3.1.x'Joas Schilling2015-04-062-1/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_poll_body.html
| * | | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-063-1/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13739] Add template core event posting_poll_body_options_after
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing order of if statement and event PHPBB3-13739
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing if else construct in prosilver so that the event is placed correctly PHPBB3-13739
| | * | | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-033-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template event added for the poll options while posting a topic so that you may add additional options for polls. PHPBB3-13739
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3523 from Nicofuma/ticket/13747Joas Schilling2015-04-061-0/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13747] Add assertions to test_validate_path_linux
| | * | | | | | [ticket/13747] Add assertions to test_validate_path_linuxTristan Darricau2015-04-061-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13747
* | | | | | | Merge pull request #3522 from nickvergessen/ticket/13522Oliver Schramm2015-04-061-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13522] Fix globals for 3.2 in Q&A tests
| * | | | | | | [ticket/13522] Fix globals for 3.2 in Q&A testsJoas Schilling2015-04-061-4/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-04-061-6/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3458 from nickvergessen/ticket/8494Tristan Darricau2015-04-061-6/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8494] Ignore errors from the database schema preparation
| | * | | | | | [ticket/8494] Ignore errors from the database schema preparationJoas Schilling2015-03-011-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows installing phpBB twice in the same database with a different prefix PHPBB3-8494
* | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed
| | * | | | | | | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12368
| | * | | | | | | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to set the avatar type to string value to check if new avatar types are supported. PHPBB3-12368
* | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| | * | | | | | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424
| | * | | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11424
* | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-04-061-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3402 from brunoais/ticket/13621Joas Schilling2015-04-061-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:12:49 +0000