aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympusJoas Schilling2014-03-291-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12319: [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
| | * | | [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.Andreas Fischer2014-03-291-0/+3
| |/ / / | | | | | | | | | | | | PHPBB3-12319
* | | | Merge remote-tracking branch 'prosk8er/ticket/12298' into develop-ascraeusJoas Schilling2014-03-293-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * prosk8er/ticket/12298: [ticket/12298] Template Event memberlist_view_contact_before/after
| * | | | [ticket/12298] Template Event memberlist_view_contact_before/afterProsk8er2014-03-293-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add template event memberlist_view_contact_before and memberlist_view_contact_after PHPBB3-12298
* | | | | Merge remote-tracking branch 'prosk8er/ticket/12301' into develop-ascraeusJoas Schilling2014-03-297-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * prosk8er/ticket/12301: [ticket/12301] Template Event overall_header_body_before
| * | | | | [ticket/12301] Template Event overall_header_body_beforeProsk8er2014-03-297-0/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | add template event overall_header_body_before PHPBB3-12301
* | | | | Merge branch 'ticket/paybas/12308' into develop-ascraeusJoas Schilling2014-03-293-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/paybas/12308: [ticket/12308] Template Event forumlist_body_last_row_after
| * | | | | [ticket/12308] Template Event forumlist_body_last_row_afterPayBas2014-03-293-0/+10
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-12308
* | | | | Merge remote-tracking branch 'paybas/ticket/12304' into develop-ascraeusJoas Schilling2014-03-296-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12304: [ticket/12304] Add CSS class to rules-link container
| * | | | | [ticket/12304] Add CSS class to rules-link containerPayBas2014-03-296-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a forum has a forum-rules link instead of forum-rules text, there is no way to distinguish in the styling of the container (or the button) it will have. It should be possible to style the <div class="rules"> container differently if there is only a link (no text). PHPBB3-12304
* | | | | | Merge branch 'ticket/paybas/12309' into develop-ascraeusJoas Schilling2014-03-293-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/paybas/12309: [ticket/12309] Template Event quickreply_editor_panel_before/after
| * | | | | | [ticket/12309] Template Event quickreply_editor_panel_before/afterPayBas2014-03-293-2/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12309
* | | | | | Merge branch 'ticket/lucifer4o/12276' into develop-ascraeusJoas Schilling2014-03-291-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/lucifer4o/12276: [ticket/12276] Expand core.memberlist_view_profile [ticket/12276] Expand core.memberlist_view_profile
| * | | | | | [ticket/12276] Expand core.memberlist_view_profilelucifer4o2014-03-291-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand core.memberlist_view_profile to include zebra states PHPBB3-12276
| * | | | | | [ticket/12276] Expand core.memberlist_view_profilelucifer4o2014-03-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand core.memberlist_view_profile to include zebra states PHPBB3-12276
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeusJoas Schilling2014-03-2911-42/+49
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12300: [ticket/12300] Make only red topic/forum row icons clickable to unread posts [ticket/12300] Fix broken link to last post in topic subscriptions list [ticket/12300] Fix alignment of clickable icons [ticket/12300] Make all topic row icons clickable [ticket/12300] Rename new class for row icon links [ticket/12300] Make topic icon links clickable to newest unread posts [ticket/12300] Revert topic title links back to default behavior
| * | | | | | [ticket/12300] Make only red topic/forum row icons clickable to unread postsMatt Friedman2014-03-289-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12300
| * | | | | | [ticket/12300] Fix broken link to last post in topic subscriptions listMatt Friedman2014-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12300
| * | | | | | [ticket/12300] Fix alignment of clickable iconsMatt Friedman2014-03-272-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12300
| * | | | | | [ticket/12300] Make all topic row icons clickableMatt Friedman2014-03-274-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forum list icons link to first page of forum UCP subscribed forums icons link to first page of forum MCP Forum page topic icons link to first (or first unread) post PM Icons link to the message PHPBB3-12300
| * | | | | | [ticket/12300] Rename new class for row icon linksMatt Friedman2014-03-277-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12300
| * | | | | | [ticket/12300] Make topic icon links clickable to newest unread postsMatt Friedman2014-03-247-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12300
| * | | | | | [ticket/12300] Revert topic title links back to default behaviorMatt Friedman2014-03-245-41/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-12300
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-294-347/+468
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema Conflicts: phpBB/install/schemas/mssql_schema.sql
| * | | | | Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into ↵Joas Schilling2014-03-294-338/+448
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * noxwizard/ticket/naderman/9725: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema
| | * | | | | [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Do not use deprecated views to remove default constraintsPatrick Webster2014-03-281-32/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Move primary key creation to the correct locationPatrick Webster2014-03-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Remove trailing spaces from MSSQL schemaPatrick Webster2014-03-282-174/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Create MSSQL primary keys if none existPatrick Webster2014-03-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Remove explicit filegroup designationsPatrick Webster2014-03-281-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Fetch Azure db stats from proper tablePatrick Webster2014-03-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Add dummy indexes for AzureHenry Sudhof2014-03-012-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SQL Azure requires a primary AKA clustered key on every table. This adds a dummy INT column to act as key, avoiding possible duplicate entries. so that these columns can support bigger (speak: huge) tables PHPBB3-9725
| | * | | | | [ticket/9725] Create an Azure SQL compatible SchemaHenry Sudhof2014-03-012-279/+325
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two problems were encountered when installing on AzureSQL: -Azure SQL does not support the ON clause of T-SQL -Azure SQL requries a clustered index AKA primary key on all tables The fix is makeshift; it introduces questionable primary indices, which should be replaced with auto--increment columns. PHPBB3-9725
* | | | | | | Merge pull request #2192 from bantu/ticket/12314Nils Adermann2014-03-281-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
| * | | | | | | [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslashAndreas Fischer2014-03-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12314
* | | | | | | | Merge pull request #2194 from bantu/ticket/12317Nils Adermann2014-03-288-14/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12317] Fix notification tests for DBMS drivers using int for integers ;-)
| * | | | | | | | [ticket/12317] Cast string to int to refix DBMSes not using int for integers.Andreas Fischer2014-03-284-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12317
| * | | | | | | | [ticket/12317] Fix notification tests for DBMSes returning integers as int.Andreas Fischer2014-03-283-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12317
| * | | | | | | | [ticket/12317] Do not repeat SQL query in notification_submit_post_base.Andreas Fischer2014-03-281-6/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12317
* | | | | | | | Merge remote-tracking branch 'crizz0/ticket/11336' into develop-ascraeusJoas Schilling2014-03-286-6/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/11336: [ticket/11336] Adds 301 info to redirect [ticket/11336] Adds redirect for old "leaders" mode [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
| * | | | | | | [ticket/11336] Adds 301 info to redirectCrizzo2014-03-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11336
| * | | | | | | [ticket/11336] Adds redirect for old "leaders" modeCrizzo2014-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11336
| * | | | | | | [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAMCrizzo2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11336
| * | | | | | | [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-285-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12315' into develop-ascraeusJoas Schilling2014-03-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12315: [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
| * | | | | | | [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.phpMatt Friedman2014-03-281-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12315
* | | | | | | Merge branch 'ticket/suheb/11666' into develop-ascraeusJoas Schilling2014-03-281-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/suheb/11666: [ticket/11666] Rewording POST_DELETED and [ticket/11666] Removing MESSAGE_DELETED..
| * | | | | | | [ticket/11666] Rewording POST_DELETED andSuhaib Khan2014-03-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverting removal of MESSAGE_DELETED. PHPBB3-11666
| * | | | | | | [ticket/11666] Removing MESSAGE_DELETED..Suhaib Khan2014-03-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..in /en/posting.php as it is not used. PHPBB3-11666