aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-4/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
| | * | | | | | | | | [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | | | | | | | [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts listedbrunoais2015-03-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | | | | | | | [ticket/13664] From string query in mcp_front unapproved posts to built querybrunoais2015-03-011-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13664
* | | | | | | | | | | 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 perms
| | * | | | | | | | | | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13822
* | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_front
| | * | | | | | | | | | | [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| | * | | | | | | | | | | [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| | * | | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13660
* | | | | | | | | | | | Merge pull request #3568 from s9e/ticket/10268Andreas Fischer2015-05-072-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10268] Added regression test * s9e/ticket/10268: [ticket/10268] Added regression test
| * | | | | | | | | | | | [ticket/10268] Added regression testJoshyPHP2015-04-292-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10268
* | | | | | | | | | | | | Merge pull request #3573 from s9e/ticket/9073Andreas Fischer2015-05-073-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9073] Word censoring in URLs * s9e/ticket/9073: [ticket/9073] Added regression test
| * | | | | | | | | | | | | [ticket/9073] Added regression testJoshyPHP2015-04-303-0/+18
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9073
* | | | | | | | | | | | | Merge pull request #3571 from s9e/ticket/13425Andreas Fischer2015-05-073-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13425] Smiley code at start of text being quoted doesn't show smiley image in quote * s9e/ticket/13425: [ticket/13425] Added regression test
| * | | | | | | | | | | | | [ticket/13425] Added regression testJoshyPHP2015-04-303-0/+25
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13425
* | | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-061-5/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3521 from rxu/ticket/13745Marc Alexander2015-05-061-5/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13745] Add viewtopic.php core event to allow manipulating poll data
| | * | | | | | | | | | | | [ticket/13745] Add viewtopic.php core events to allow manipulating poll datarxu2015-04-151-5/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13745
* | | | | | | | | | | | | | Merge branch '3.1.x'Nicofuma2015-05-064-21/+203
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-064-21/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13807 Allow building changesets for the event list
| | * | | | | | | | | | | | | [ticket/13807] Add version to the usage outputJoas Schilling2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Only output the header for diffJoas Schilling2015-05-021-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Fix "changed version" to match our version numberingJoas Schilling2015-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-023-14/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
| | * | | | | | | | | | | | | [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-022-6/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13807
* | | | | | | | | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-05-062-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
| * | | | | | | | | | | | | Merge pull request #3595 from marc1706/ticket/13819Andreas Fischer2015-05-062-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/ * marc1706/ticket/13819: [ticket/13819] Add missing sql_freeresult() to files in includes/
| | * | | | | | | | | | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-052-0/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13819
* | | | | | | | | | | | | Merge pull request #3432 from Nicofuma/ticket/13638Joas Schilling2015-05-0515-17/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13638] Prepend the assets path phpbb root
| * | | | | | | | | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-0515-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638
| * | | | | | | | | | | | | [ticket/13638] Add testsNicofuma2015-05-041-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638
| * | | | | | | | | | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638
| * | | | | | | | | | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13638
* | | | | | | | | | | | | Merge branch '3.1.x'Nicofuma2015-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3564 from VSEphpbb/ticket/13516Nicofuma2015-05-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13516] Do not search ICC profiles in extension vendors
| | * | | | | | | | | | | [ticket/13516] Update image search scriptMatt Friedman2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13516
| | * | | | | | | | | | | [ticket/13516] Do not search ICC profiles in extension vendorsMatt Friedman2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13516
* | | | | | | | | | | | | Merge pull request #3590 from rxu/ticket/13814Tristan Darricau2015-05-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating files
| * | | | | | | | | | | | | [ticket/13814] Prevent phpbb_is_writable() method from truncating filesrxu2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpbb_is_writable() of filesystem class uses 'w' mode to fopen files which causes checked files to be truncated. Use the 'c' mode instead. PHPBB3-13814
* | | | | | | | | | | | | | Merge pull request #3589 from marc1706/ticket/13782Tristan Darricau2015-05-0416-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13782] Rename classes that use reserved PHP7 keywords
| * | | | | | | | | | | | | | [ticket/13782] Rename null driver test to dummy driver testMarc Alexander2015-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782
| * | | | | | | | | | | | | | [ticket/13782] Rename null log to dummy for PHP7 compatibilityMarc Alexander2015-05-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782
| * | | | | | | | | | | | | | [ticket/13782] Rename null driver to dummy for PHP7 compatibilityMarc Alexander2015-05-0413-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13782