Commit graph

20290 commits

Author SHA1 Message Date
Joas Schilling
751d43a142 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12308] Template Event forumlist_body_last_row_after
2014-03-29 12:51:04 +01:00
Joas Schilling
3ac8b8b40d Merge branch 'ticket/paybas/12308' into develop-ascraeus
* ticket/paybas/12308:
  [ticket/12308] Template Event forumlist_body_last_row_after
2014-03-29 12:50:40 +01:00
PayBas
e8b43a1bb8 [ticket/12308] Template Event forumlist_body_last_row_after
PHPBB3-12308
2014-03-29 12:50:23 +01:00
Joas Schilling
0c4b96154b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12304] Add CSS class to rules-link container
2014-03-29 12:36:41 +01:00
Joas Schilling
1e0af0d252 Merge remote-tracking branch 'paybas/ticket/12304' into develop-ascraeus
* paybas/ticket/12304:
  [ticket/12304] Add CSS class to rules-link container
2014-03-29 12:36:05 +01:00
Joas Schilling
6770e224fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12309] Template Event quickreply_editor_panel_before/after
2014-03-29 12:18:10 +01:00
Joas Schilling
f3e9fe6de8 Merge branch 'ticket/paybas/12309' into develop-ascraeus
* ticket/paybas/12309:
  [ticket/12309] Template Event quickreply_editor_panel_before/after
2014-03-29 12:17:37 +01:00
PayBas
0d84a42cd4 [ticket/12309] Template Event quickreply_editor_panel_before/after
PHPBB3-12309
2014-03-29 12:17:11 +01:00
Joas Schilling
4e60f7e0fa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12276] Expand core.memberlist_view_profile
  [ticket/12276] Expand core.memberlist_view_profile
2014-03-29 12:10:49 +01:00
Joas Schilling
7f6aff1d09 Merge branch 'ticket/lucifer4o/12276' into develop-ascraeus
* ticket/lucifer4o/12276:
  [ticket/12276] Expand core.memberlist_view_profile
  [ticket/12276] Expand core.memberlist_view_profile
2014-03-29 12:10:02 +01:00
lucifer4o
2e7f66b16c [ticket/12276] Expand core.memberlist_view_profile
Expand core.memberlist_view_profile to include zebra states

PHPBB3-12276
2014-03-29 12:09:42 +01:00
Joas Schilling
3b124a8048 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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
2014-03-29 11:46:47 +01:00
PayBas
7a5639816a [ticket/12304] Add CSS class to rules-link container
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
2014-03-29 11:20:03 +01:00
Joas Schilling
fd16a50baf Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeus
* 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
2014-03-29 11:09:33 +01:00
Joas Schilling
13d30b0b0e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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
2014-03-29 10:51:23 +01:00
Joas Schilling
70a2110223 Merge branch 'develop-olympus' into develop-ascraeus
* 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
2014-03-29 10:50:18 +01:00
Joas Schilling
4e8aef7cd6 Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into 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
2014-03-29 10:43:09 +01:00
Matt Friedman
96ac2790fc [ticket/12300] Make only red topic/forum row icons clickable to unread posts
PHPBB3-12300
2014-03-28 20:54:49 -07:00
Nils Adermann
1c6b3fe073 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12317] Cast string to int to refix DBMSes not using int for integers.
  [ticket/12317] Fix notification tests for DBMSes returning integers as int.
  [ticket/12317] Do not repeat SQL query in notification_submit_post_base.
  [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
2014-03-28 22:28:13 -04:00
Nils Adermann
b7909ba71b Merge pull request #2192 from bantu/ticket/12314
[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
2014-03-28 22:25:48 -04:00
Nils Adermann
6d0b7bba3f Merge pull request #2194 from bantu/ticket/12317
[ticket/12317] Fix notification tests for DBMS drivers using int for integers ;-)
2014-03-28 22:24:57 -04:00
Joas Schilling
cff5c8ac38 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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
2014-03-28 23:32:20 +01:00
Joas Schilling
c7d18eaadd Merge remote-tracking branch 'crizz0/ticket/11336' into develop-ascraeus
* 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
2014-03-28 23:32:05 +01:00
Patrick Webster
79492d4110 [ticket/9725] Code sniffer fixes
PHPBB3-9725
2014-03-28 17:07:50 -05:00
Patrick Webster
aaa846cb3a [ticket/9725] Do not use deprecated views to remove default constraints
PHPBB3-9725
2014-03-28 17:05:37 -05:00
Patrick Webster
31e610f0b1 [ticket/9725] Move primary key creation to the correct location
PHPBB3-9725
2014-03-28 17:05:25 -05:00
Patrick Webster
a2580687ee [ticket/9725] Remove trailing spaces from MSSQL schema
PHPBB3-9725
2014-03-28 17:05:13 -05:00
Patrick Webster
83be990701 [ticket/9725] Create MSSQL primary keys if none exist
PHPBB3-9725
2014-03-28 17:04:56 -05:00
Patrick Webster
68ae8dfa97 [ticket/9725] Remove explicit filegroup designations
PHPBB3-9725
2014-03-28 17:04:41 -05:00
Patrick Webster
80a844d38c [ticket/9725] Fetch Azure db stats from proper table
PHPBB3-9725
2014-03-28 17:04:29 -05:00
Andreas Fischer
ad2ed01623 [ticket/12317] Cast string to int to refix DBMSes not using int for integers.
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
c489244895 [ticket/12317] Fix notification tests for DBMSes returning integers as int.
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
043b6a207a [ticket/12317] Do not repeat SQL query in notification_submit_post_base.
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
bd0ba37207 [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
PHPBB3-12314
2014-03-28 21:47:23 +01:00
Crizzo
28f17897b4 [ticket/11336] Adds 301 info to redirect
PHPBB3-11336
2014-03-28 19:36:12 +01:00
Crizzo
38d2efe829 [ticket/11336] Adds redirect for old "leaders" mode
PHPBB3-11336
2014-03-28 19:36:10 +01:00
Crizzo
c5eccedfb6 [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
PHPBB3-11336
2014-03-28 19:36:09 +01:00
Crizzo
76558fbce5 [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
PHPBB3-11336
2014-03-28 19:36:08 +01:00
Joas Schilling
e361896d07 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
2014-03-28 19:31:46 +01:00
Joas Schilling
e742d1ec26 Merge remote-tracking branch 'vsephpbb/ticket/12315' into develop-ascraeus
* vsephpbb/ticket/12315:
  [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
2014-03-28 19:31:36 +01:00
Matt Friedman
e2c2692e9c [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
PHPBB3-12315
2014-03-28 11:27:25 -07:00
Joas Schilling
c2214705a6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11666] Rewording POST_DELETED and
  [ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:43:13 +01:00
Joas Schilling
0be6582d7f Merge branch 'ticket/suheb/11666' into develop-ascraeus
* ticket/suheb/11666:
  [ticket/11666] Rewording POST_DELETED and
  [ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:42:34 +01:00
Suhaib Khan
96291d9e6e [ticket/11666] Rewording POST_DELETED and
reverting removal of MESSAGE_DELETED.

PHPBB3-11666
2014-03-28 17:41:42 +01:00
Joas Schilling
f0c9240e8f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12311] Use British-English spelling of licence in lang file
  [ticket/12311] Use valid composer schema - license - for extensions
2014-03-28 17:31:57 +01:00
Joas Schilling
ce6e3966cf Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeus
* vsephpbb/ticket/12311:
  [ticket/12311] Use British-English spelling of licence in lang file
  [ticket/12311] Use valid composer schema - license - for extensions
2014-03-28 17:29:56 +01:00
Joas Schilling
a0f0ffc236 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11230] Add missing last returns to dock block
  [ticket/11230] Update cache driver dock blocks
  [ticket/11230] Use inheritdoc in docblocks in cache drivers
2014-03-28 17:27:36 +01:00
Joas Schilling
968da05e51 Merge remote-tracking branch 'vsephpbb/ticket/11230' into develop-ascraeus
* vsephpbb/ticket/11230:
  [ticket/11230] Add missing last returns to dock block
  [ticket/11230] Update cache driver dock blocks
  [ticket/11230] Use inheritdoc in docblocks in cache drivers
2014-03-28 17:27:14 +01:00
Matt Friedman
dab35589fe [ticket/11230] Add missing last returns to dock block
PHPBB3-11230
2014-03-28 09:12:42 -07:00
Matt Friedman
368dd23d4b [ticket/12311] Use British-English spelling of licence in lang file
PHPBB3-12311
2014-03-28 09:08:11 -07:00