aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/12100] Ensure enabled extensions are fresh in Twig environmentMatt Friedman2014-01-272-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12100
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-02-023-2121/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12140] Remove the diff class / MOD text build script Conflicts: build/build_diff.php
| * \ \ \ \ \ Merge remote-tracking branch 'naderman/ticket/12140' into develop-olympusAndreas Fischer2014-02-023-2123/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/12140: [ticket/12140] Remove the diff class / MOD text build script
| | * | | | | | [ticket/12140] Remove the diff class / MOD text build scriptNils Adermann2014-02-023-2123/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12140
* | | | | | | | Merge remote-tracking branch 'prototech/ticket/12135' into developJoas Schilling2014-02-021-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12135] Reduce verbosity in bbfontstyle() by using textarea var.Cesar G2014-01-261-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12135
* | | | | | | | | Merge remote-tracking branch 'prototech/ticket/12124' into developJoas Schilling2014-02-021-15/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/12124] IE8 does not support indexOf() for arrays.Cesar G2014-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12124
| * | | | | | | | | [ticket/12124] The textarea selector is failing in IE8 & 9.Cesar G2014-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12124
| * | | | | | | | | [ticket/12124] Set attachment data to preserve AJAX delete functionality.Cesar G2014-01-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12124
| * | | | | | | | | [ticket/12124] Remove double bang.Cesar G2014-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12124
| * | | | | | | | | [ticket/12124] Revert to basic uploader if the html5 runtime is not supported.Cesar G2014-01-241-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12124
* | | | | | | | | | Merge pull request #1959 from prototech/ticket/12131Andreas Fischer2014-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12131] Remove invalid imageset var in viewtopic print view. * prototech/ticket/12131: [ticket/12131] Remove invalid imageset var in viewtopic print view.
| * | | | | | | | | | [ticket/12131] Remove invalid imageset var in viewtopic print view.Cesar G2014-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12131
* | | | | | | | | | | Merge remote-tracking branch 'prototech/ticket/12123' into developJoas Schilling2014-02-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ticket/12123] Add soft delete to phpbb/permissions.php.Cesar G2014-01-251-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12123
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-01-272-4/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12119] Remove meta tags from view-print templates Conflicts: phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html phpBB/styles/prosilver/template/viewtopic_print.html
| * | | | | | | | | Merge remote-tracking branch 'vinny/ticket/12119' into develop-olympusAndreas Fischer2014-01-272-4/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vinny/ticket/12119: [ticket/12119] Remove meta tags from view-print templates
| | * | | | | | | | | [ticket/12119] Remove meta tags from view-print templatesMarcus Vinicius2014-01-272-4/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12119
* | | | | | | | | | Merge pull request #1965 from prototech/ticket/12137Andreas Fischer2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12137] Fix spacing in smiley block. * prototech/ticket/12137: [ticket/12137] Fix spacing in smiley block.
| * | | | | | | | | [ticket/12137] Fix spacing in smiley block.Cesar G2014-01-261-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12137
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-01-262-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12118] Add noindex meta tag to subsilver2 view-print templates Conflicts: phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html
| * | | | | | | Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympusAndreas Fischer2014-01-262-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vinny/ticket/12118: [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
| | * | | | | | | [ticket/12118] Add noindex meta tag to subsilver2 view-print templatesMarcus Vinicius2014-01-262-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12118
* | | | | | | | Merge remote-tracking branch 'prototech/ticket/12125' into developJoas Schilling2014-01-242-4/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/12125: [ticket/12125] Specify nth-child selectors separately - IE8 does not like them
| * | | | | | | [ticket/12125] Specify nth-child selectors separately - IE8 does not like themCesar G2014-01-242-4/+20
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12125
* | | | | | | Merge branch 'develop-olympus' into developCesar G2014-01-231-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympusCesar G2014-01-231-1/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/12120] Restore alphabetic orderJoas Schilling2014-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12120
| | * | | | | | [ticket/12120] Add prototech to authorsJoas Schilling2014-01-231-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12120
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11950' into developJoas Schilling2014-01-221-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11950: [ticket/11950] Fix prior commit
| * | | | | | | [ticket/11950] Fix prior commitNathan Guse2014-01-221-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-11950
* | | | | | | Merge pull request #1952 from suheb/ticket/11950Nathan Guse2014-01-223-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/11950 - Added 'forgot password' link to index page.
| * | | | | | | Adding 'forgot password' link to index pageSuhaib Khan2014-01-223-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11950 Signed-off-by: Suhaib Khan <suhebjerk@gmail.com>
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11902' into developJoas Schilling2014-01-181-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11902: [ticket/11902] Use phpbb\php\ini class [ticket/11902] Prevent errors if set_time_limit disabled [ticket/11902] Set max execution time to 0 in db update
| * | | | | | | [ticket/11902] Use phpbb\php\ini classNathan Guse2013-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11902
| * | | | | | | [ticket/11902] Prevent errors if set_time_limit disabledNathan Guse2013-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11902
| * | | | | | | [ticket/11902] Set max execution time to 0 in db updateNathaniel Guse2013-10-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11902
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/12006' into developJoas Schilling2014-01-183-7/+78
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/12006: [ticket/12006] global $phpbb_dispatcher; [ticket/12006] Missing a space [ticket/12006] Add module_auth event [ticket/12006] Test for ext module auth [ticket/12006] Add extension enabled check token to module auth [ticket/12006] Cleanup the module auth function token replacement code
| * | | | | | | | [ticket/12006] global $phpbb_dispatcher;Nathan Guse2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | | | | [ticket/12006] Missing a spaceNathan Guse2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | | | | [ticket/12006] Add module_auth eventNathan Guse2014-01-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | | | | [ticket/12006] Test for ext module authNathan Guse2013-12-302-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | | | | [ticket/12006] Add extension enabled check token to module authNathan Guse2013-12-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
| * | | | | | | | [ticket/12006] Cleanup the module auth function token replacement codeNathan Guse2013-12-301-2/+20
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-12006
* | | | | | | | Merge pull request #1866 from prototech/ticket/11915Nathan Guse2014-01-1728-500/+850
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11915] Improve Plupload integration
| * | | | | | | | [ticket/11915] Pass the data to the template instead of scraping HTML for it.Cesar G2014-01-173-35/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11915
| * | | | | | | | [ticket/11915] Replace inline onclick event for inserting attachment bbcodes.Cesar G2014-01-172-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11915
| * | | | | | | | [ticket/11915] Remove files that are no longer used.Cesar G2014-01-1713-188/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11915
| * | | | | | | | [ticket/11915] Hide attachments table when removing last failed file.Cesar G2014-01-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11915