aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | [ticket/13366] Ensure plupload_last_gc config entry is dynamic.Cesar G2014-12-091-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13366
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3258 from marc1706/ticket/13385Joas Schilling2015-01-091-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13385] Free result in \phpbb\config\db::set_atomic()
| | * | | | | | | | | [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic()Marc Alexander2015-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13385
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | [ticket/13432] Make sure to add language file when including acp_modulesMarc Alexander2015-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13432
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3221 from MasterShredder/ticket/13422Joas Schilling2015-01-061-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13422] New events for save custom cookies and set custom ban type
| | * | | | | | | | | | [ticket/13422] Changed variable descriptionsMasterShredder2014-12-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13422
| | * | | | | | | | | | [ticket/13422] Deleted event core.session_check_user_sessionMasterShredder2014-12-081-9/+1
| | | | | | | | | | | |
| | * | | | | | | | | | [ticket/13422] Add new event core.session_set_custom_banMasterShredder2014-12-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13422
| | * | | | | | | | | | [ticket/13422] Add new event core.session_check_user_sessionMasterShredder2014-12-071-1/+9
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13422
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-061-0/+44
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3211 from brunoais/ticket/13148Joas Schilling2015-01-061-0/+44
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | [ticket/13148] Creating a final way to modify edit logs output
| | * | | | | | | | | [ticket/13148] Wrong version num; copy & paste failbrunoais2014-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13148
| | * | | | | | | | | [ticket/13148] Fixed my errorbrunoais2014-12-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13148
| | * | | | | | | | | [ticket/13148] Fixed syntax errorbrunoais2014-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13148
| | * | | | | | | | | [ticket/13148] Added more variables as requestedbrunoais2014-12-281-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added more variables as requested and some extra that may be of use. PHPBB3-13148
| | * | | | | | | | | [ticket/13148] Creating a final way to modify edit logs outputbrunoais2014-12-031-0/+14
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13148
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3229 from n-aleha/ticket/13098Joas Schilling2014-12-271-0/+38
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13098] Repair Yahoo contact field
| | * | | | | | | | | [ticket/13098] Repair Yahoo contact fieldn-aleha2014-12-121-0/+38
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Yahoo link of the yahoo profile field. PHPBB3-13098
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3205 from rxu/ticket/13406Joas Schilling2014-12-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13406] Add a space between the index name and columns list
| | * | | | | | | | | [ticket/13406] Add a space between the index name and columns listrxu2014-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's no space between the index name and columns list when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors on earlier MySQL versions like 3.23. PHPBB3-13406
| * | | | | | | | | | Merge pull request #3099 from Senky/ticket/13266Joas Schilling2014-12-271-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined
| | * | | | | | | | | [ticket/13266] Enable twig dump functionJakub Senko2014-11-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13266
* | | | | | | | | | | Merge pull request #3170 from Nicofuma/ticket/13266-developJoas Schilling2014-12-272-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13266-develop] Enable twig dump function
| * | | | | | | | | | | [ticket/13266] Enable the debug extension in the development environmentTristan Darricau2014-11-222-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13266
* | | | | | | | | | | | Merge pull request #3220 from nickvergessen/ticket/13421Marc Alexander2014-12-108-108/+259
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/13421 Introduce an interface for db\tools.php
| * | | | | | | | | | | | [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-068-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | | | | | | [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-063-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | | | | | | [ticket/13421] Inherit docsJoas Schilling2014-12-061-85/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
| * | | | | | | | | | | | [ticket/13421] Add an interface for \phpbb\db\toolsJoas Schilling2014-12-062-11/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13421
* | | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | [ticket/13396] Normalize multibyte characters in attachment file names.Cesar G2014-12-021-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13396
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | | * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| * | | | | | | | | | [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13405
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13393
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3075 from Senky/ticket/11613Marc Alexander2014-11-261-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11613] Cookies do not work for netbios domain
| | * | | | | | | | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11613
* | | | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-251-10/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13381
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-252-0/+63
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | | | | [prep-release-3.1.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| | | | | | | | |
| * | | | | | | | [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
| | | | | | | | |
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-20/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #10 from phpbb/ticket/security-171Joas Schilling2014-11-222-20/+33
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security-171] Use type cast helper for json data