aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11186] Database unit tests fail on windows using sqlite2Joas Schilling2012-11-101-6/+0
* Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympusOleg Pudeyev2012-11-091-2/+0
|\
| * [ticket/11178] Do not set error_reporting to E_ALL in database_updater.phpAndreas Fischer2012-11-091-2/+0
* | Merge PR #1042 branch 'bantu/ticket/10897' into develop-olympusOleg Pudeyev2012-11-092-11/+60
|\ \ | |/ |/|
| * [ticket/10897] Combine bot updates and bot delete.Andreas Fischer2012-11-091-40/+31
| * [ticket/10897] Use same code/query for deleting.Andreas Fischer2012-11-091-9/+6
| * [ticket/10897] Make sure the user we're fetching is a bot.Andreas Fischer2012-11-091-2/+3
| * [ticket/10897] Do not handle IP address. There is no need.Andreas Fischer2012-11-091-13/+7
| * [ticket/10897] Update by user_id instead of bot_name.Andreas Fischer2012-11-091-7/+8
| * [ticket/10897] Move bot delete data to the relevant foreach loop.Andreas Fischer2012-11-091-9/+9
| * [ticket/10897] Add comment about what's going on.Andreas Fischer2012-11-091-0/+1
| * [ticket/10897] Remove unnecessary string casting.Andreas Fischer2012-11-091-2/+2
| * [ticket/10897] Add space after foreach.Andreas Fischer2012-11-091-2/+2
| * [ticket/10897] Update bots during phpBB updateCarlo2012-11-091-0/+70
| * [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