aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-11-071-1/+1
|\
| * Merge remote-tracking branch 'p/ticket/11081' into develop-olympusAndreas Fischer2012-11-071-1/+1
| |\
| | * [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.Oleg Pudeyev2012-11-061-1/+1
* | | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-062-6/+6
|\ \ \
| * | | [ticket/9918] default values in request_var changed to one stringSenky2012-04-152-3/+3
| * | | [ticket/9918] $redirect variable used from nowSenky2012-04-092-6/+6
* | | | Merge PR #717 branch 'develop-olympus' into developOleg Pudeyev2012-11-061-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympusOleg Pudeyev2012-11-061-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)Adonais Romero González2012-04-051-3/+3
* | | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-0612-31/+53
|\ \ \ \
| * | | | [ticket/10845] Removed one empty line that wasn't supposed to be thereBruno Ais2012-06-141-1/+0
| * | | | [ticket/10845] Two of the three colouns were missing in the DB update fileBruno Ais2012-05-061-1/+3
| * | | | [ticket/10845] Remove censor from textBruno Ais2012-05-022-3/+6
| * | | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| * | | | [ticket/10845] Changed the report system. Now it saves posts with the bbcodeBruno Ais2012-05-019-25/+48
* | | | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEADNils Adermann2012-11-063-4/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1035 from p/ticket/11159-olympusNils Adermann2012-11-0610-19/+19
| |\ \ \ \
| | * | | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-11-0610-19/+19
| |/ / / /
* | | | | Merge PR #858 branch 'callumacrae/ticket/10947' into developOleg Pudeyev2012-11-061-0/+4
|\ \ \ \ \
| * | | | | [ticket/10947] Fixed quickmod autosubmit functionality.Callum Macrae2012-06-201-0/+4
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-051-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'unknownbliss/ticket/111642' into develop-olympusAndreas Fischer2012-11-051-0/+0
| |\ \ \ \ \
| | * | | | | [ticket/11164] Update composer.pharUnknown Bliss2012-11-041-0/+0
| |/ / / / /
* | | | | | Merge remote-tracking branch 'p/ticket/10933-lite' into developIgor Wiedler2012-11-0312-81/+66
|\ \ \ \ \ \
| * | | | | | [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.Oleg Pudeyev2012-11-021-64/+5
| * | | | | | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-028-9/+14
| * | | | | | [ticket/10933] Expanded prose documentation for phpbb_extension_provider.Oleg Pudeyev2012-11-021-2/+10
| * | | | | | [ticket/10933] Specify empty template path for absolute includephp test.Oleg Pudeyev2012-11-021-1/+1
| * | | | | | [ticket/10933] Useful documentation for template locate functionOleg Pudeyev2012-11-021-2/+34
| * | | | | | [ticket/10933] Typo fixesOleg Pudeyev2012-11-022-2/+2
| * | | | | | [ticket/10933] Initialize template context when template is constructed.Oleg Pudeyev2012-11-022-3/+2
|/ / / / / /
* | | | | | Merge pull request #1028 from bantu/ticket/11099Oleg Pudeyev2012-11-011-2/+2
|\ \ \ \ \ \
| * | | | | | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
|/ / / / / /
* | | | | | Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
|\ \ \ \ \ \
| * | | | | | [ticket/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| * | | | | | [ticket/11157] Fix remaining captcha spam.Oleg Pudeyev2012-10-295-14/+14
| * | | | | | [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
* | | | | | | Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-293-7/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/ticket/11158' into develop-olympusAndreas Fischer2012-10-293-7/+13
| |\ \ \ \ \
| | * | | | | [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-292-1/+13
| | * | | | | [ticket/11158] Revert old fix in PHPBB3-10186.Oleg Pudeyev2012-10-291-6/+0
| |/ / / / /
* | | | | | Merge PR #1021 branch 'p/ticket/11156' into developOleg Pudeyev2012-10-291-27/+26
|\ \ \ \ \ \
| * | | | | | [ticket/11156] Delete "Misc" tab of forum based permissions + move itemsRMcGirr832012-10-291-27/+26
|/ / / / / /
* | | | | | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2231-92/+163
|\ \ \ \ \ \
| * | | | | | [ticket/11014] Fix old pagination assignmentJoas Schilling2012-10-171-1/+0
| * | | | | | [ticket/11018] Fix several paginations in ACPJoas Schilling2012-10-173-15/+19
| * | | | | | [ticket/11014] Fix IF statements for new template paginationJoas Schilling2012-10-173-4/+4
| * | | | | | [ticket/11014] Fix text for previous/next links in Subsilver2Joas Schilling2012-10-171-2/+2