aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10897] Bot list updatedCarlo2012-11-091-11/+5
* 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 #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 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 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/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 remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-183-1/+80
|\ \
| * | [ticket/10848] Move include up.Oleg Pudeyev2012-10-171-1/+2
| * | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-173-3/+3
| * | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-173-1/+79
* | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-172-1/+3
|\ \ \ | |/ / |/| |
| * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-022-1/+3
* | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-164-5/+7
|\ \ \
| * | | [ticket/8743] Include poster´s name in mail notificationsJoas Schilling2012-03-154-5/+7
* | | | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
|\ \ \ \
| * | | | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | |/ / | |/| |
* | | | Merge branch 'ticket/russellwwest/11093' into develop-olympusAndreas Fischer2012-10-161-1/+2
|\ \ \ \
| * | | | [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
|/ / / /
* | | | Merge PR #973 branch 'bantu/ticket/11069' into develop-olympusOleg Pudeyev2012-10-101-1/+1
|\ \ \ \
| * | | | [ticket/11069] Add closing span back to credit line in subsilver2 simple footerAndreas Fischer2012-08-261-1/+1
* | | | | Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympusOleg Pudeyev2012-10-091-1/+1
|\ \ \ \ \
| * | | | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
* | | | | | Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympusAndreas Fischer2012-10-0610-10/+10
|\ \ \ \ \ \
| * | | | | | [ticket/11135] Full replacement of credit link to httpsVinny2012-10-0510-10/+10
|/ / / / / /
* | | | | | Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympusAndreas Fischer2012-10-022-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-012-3/+3
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympusAndreas Fischer2012-09-291-7/+8
|\ \ \ \ \
| * | | | | [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributorsJoas Schilling2012-09-271-7/+8
|/ / / / /
* | | | | Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympusAndreas Fischer2012-09-1411-0/+166
|\ \ \ \ \
| * | | | | [ticket/11045] Removed file conflict tests for compress classFyorl2012-09-111-13/+2
| * | | | | [ticket/11045] Replaced __DIR__ with dirname(__FILE__)Fyorl2012-09-011-8/+8
| * | | | | [ticket/11045] Opening brace on its own lineFyorl2012-08-281-1/+2
| * | | | | [ticket/11045] Explicitely check for zlib and bz2Fyorl2012-08-281-2/+1
| * | | | | [ticket/11045] Added tests for file conflictsFyorl2012-08-281-5/+21
| * | | | | [ticket/11045] Added unit tests for the compress classFyorl2012-08-2811-0/+161
* | | | | | Merge remote-tracking branch 'github-imkingdavid/task/functional' into develo...Nils Adermann2012-09-014-3/+112
|\ \ \ \ \ \
| * | | | | | [task/functional] Fixed DEBUG_TEST related issuesDavid King2012-09-012-2/+6
| * | | | | | [task/functional] Allow tests to bypass certain restrictions with DEBUG_TESTDavid King2012-09-013-11/+6
| * | | | | | [task/functional] Added posting tests (reply and new topic)David King2012-09-011-0/+110
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-o...Nils Adermann2012-09-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10873] Change language for notice about undelivered, deleted PM.David King2012-08-211-1/+1
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympusNils Adermann2012-08-261-1/+0
|\ \ \ \ \ \
| * | | | | | [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.phpJordan Rogers2012-08-231-1/+0
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympusNils Adermann2012-08-261-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |