aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:phpbb/phpbb3 into developIgor Wiedler2012-02-170-0/+0
|\
| * Merge branch 'prep-release-3.0.10'Andreas Fischer2012-01-02157-3144/+2284
| |\
| * \ Merge branch 'prep-release-3.0.9'Andreas Fischer2011-07-11228-2110/+6130
| |\ \
| * \ \ Merge commit 'release-3.0.8'Nils Adermann2010-11-20231-1182/+7971
| |\ \ \
* | \ \ \ Merge pull request #576 from cyberalien/ticket/10652Igor Wiedler2012-02-171-1/+1
|\ \ \ \ \
| * | | | | [ticket/10652] Fixing typo in template classVjacheslav Trushkin2012-02-151-1/+1
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10645' into developOleg Pudeyev2012-02-161-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10645] Missing CSS for checkboxesVjacheslav Trushkin2012-02-131-2/+2
* | | | | | Merge pull request #526 from p/ticket/10500Igor Wiedler2012-02-142-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/10500] Use correct class name in @uses.Oleg Pudeyev2011-12-031-1/+1
| * | | | | [ticket/10500] Fix phpbb_template_compile instantiation.Oleg Pudeyev2011-12-031-1/+1
* | | | | | Merge pull request #546 from p/ticket/10614Igor Wiedler2012-02-112-2/+151
|\ \ \ \ \ \
| * | | | | | [ticket/10614] Change not installed heading to available.Oleg Pudeyev2012-02-111-1/+1
| * | | | | | [ticket/10614] Unbreak all_available on extension manager.Oleg Pudeyev2012-02-111-1/+2
| * | | | | | [ticket/10614] Check if cache exists before destroying itIgor Wiedler2012-02-091-5/+20
| * | | | | | [ticket/10614] Remove ext manager exceptions for nowIgor Wiedler2012-02-091-19/+1
| * | | | | | [ticket/10614] Refactor list command to use manager APIIgor Wiedler2012-02-092-53/+33
| * | | | | | [ticket/10614] Add purge commandIgor Wiedler2012-02-091-0/+17
| * | | | | | [ticket/10614] Tweak list output, show state, purge cache, handle missing extsIgor Wiedler2012-02-092-11/+38
| * | | | | | [ticket/10614] Make script accessible from anywhereIgor Wiedler2012-02-091-1/+1
| * | | | | | [ticket/10614] Better usage outputIgor Wiedler2012-02-061-29/+21
| * | | | | | [ticket/10614] Add a script to enable, disable and view status of extensions.Oleg Pudeyev2012-02-031-0/+135
* | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10641' into developAndreas Fischer2012-02-112-27/+3
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10641] Update MCP template with new plurality formsPatrick Webster2012-02-112-27/+3
* | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-111-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympusOleg Pudeyev2012-02-111-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10633] Stop leaking filename of attachments when thumbnail is requestedAndreas Fischer2012-02-091-1/+1
* | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-113-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympusOleg Pudeyev2012-02-113-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).Andreas Fischer2012-02-092-2/+2
| | * | | | | | | | [ticket/10606] Fix incorrect hidden fields array name in page_header().James King2012-02-091-1/+1
| | |/ / / / / / /
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-102-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-102-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10569] Invalid string comparison in prosilverVjacheslav Trushkin2012-02-071-2/+2
| | * | | | | | | | [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
* | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10076' into developOleg Pudeyev2012-02-101-20/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/10076] STARTTLS support for SMTP via smtp_class.Andreas Fischer2012-01-281-0/+57
| * | | | | | | | | | [ticket/10076] Move EHLO/HELO code into its own method.Andreas Fischer2012-01-281-23/+39
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10636' into developOleg Pudeyev2012-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().Andreas Fischer2012-02-091-2/+2
* | | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10637' into developOleg Pudeyev2012-02-106-25/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/10637] Leftovers from implementation of extensions in convertorVjacheslav Trushkin2012-02-091-6/+4
| * | | | | | | | | | | [ticket/10637] Leftovers from implementation of extensions in develop toolsVjacheslav Trushkin2012-02-092-4/+1
| * | | | | | | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_postVjacheslav Trushkin2012-02-091-4/+2
| * | | | | | | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_mainVjacheslav Trushkin2012-02-091-7/+2
| * | | | | | | | | | | [ticket/10637] Leftovers from implementation of extensionsVjacheslav Trushkin2012-02-091-4/+2
* | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10495' into developOleg Pudeyev2012-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc dropAndreas Fischer2012-02-041-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-101-18/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympusOleg Pudeyev2012-02-101-18/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |