Commit graph

22039 commits

Author SHA1 Message Date
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
Oliver Schramm
02378e94e7 [ticket/10423] Remove * from search or highlight string
PHPBB3-10423
2014-03-28 22:28:14 +01: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
Crizzo
cde4070b19 [ticket/9758] Remove unnessary if-question for include functions_display
PHPBB3-9758
2014-03-28 19:26:56 +01:00
Crizzo
4f2a512052 [ticket/9758] Slims the line 4775 in includes/functions.php
PHPBB3-9758
2014-03-28 19:26:53 +01:00
Crizzo
9568181b98 [ticket/9758] Adds id and changes filter to fix travis CI test
PHPBB3-9758
2014-03-28 19:26:28 +01:00
Crizzo
d48d47c916 [ticket/9758] Removed the needless space after first ENDIF
PHPBB3-9758
2014-03-28 19:12:37 +01:00
Crizzo
175d83146e [ticket/9758] Adding impr. for overall_header display of avatar and username
PHPBB3-9758
2014-03-28 19:12:36 +01:00
Crizzo
aa6077c150 [ticket/9758] Fixed bug in mcp_warn.php
PHPBB3-9758
2014-03-28 19:12:35 +01:00
Crizzo
ce1b4da59e [ticket/9758] Optimises the html code of avatar image in header
PHPBB3-9758
2014-03-28 19:12:34 +01:00
Crizzo
9d568986ad [ticket/9758] Error because of missing functions_display.php fixed
PHPBB3-9758
2014-03-28 19:12:32 +01:00
Crizzo
0d4968f735 [ticket/9758] Removed useless if-conditions to include functions.php
PHPBB3-9758
2014-03-28 19:12:31 +01:00
Crizzo
e149c266ce [ticket/9758] Changes class name of new "span" in overall_header.html
PHPBB3-9758
2014-03-28 19:12:29 +01:00
Crizzo
ddbdde53ab [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
PHPBB3-9758
2014-03-28 19:12:28 +01: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
Joas Schilling
d2572888f9 [ticket/12286] Reword section about plurals
PHPBB3-12286
2014-03-28 17:24:59 +01:00
Joas Schilling
c985b018a7 [ticket/12286] Fix spelling of elephant(s) in the sample
PHPBB3-12286
2014-03-28 17:19:03 +01:00
Joas Schilling
99dccc2df8 [ticket/12286] Correctly capitalize PHP
PHPBB3-12286
2014-03-28 17:16:56 +01:00
Joas Schilling
f88e9d1c04 [ticket/12286] Fix nesting of ul inside li element
PHPBB3-12286
2014-03-28 17:14:09 +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
Joas Schilling
95b0ee3724 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11360] Updating default value of $display_online_list
  [ticket/11360] Avoiding online list where not required
  [ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:50 +01:00
Joas Schilling
6af942740c Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus
* geetakshi/ticket/11360:
  [ticket/11360] Updating default value of $display_online_list
  [ticket/11360] Avoiding online list where not required
  [ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:16 +01:00
Matt Friedman
ba9bc9c7dc [ticket/12311] Use valid composer schema - license - for extensions
http://tracker.phpbb.com/browse/PHPBB3-12311

PHPBB3-12311
2014-03-27 23:27:30 -07:00
Matt Friedman
619e844c1b [ticket/12300] Fix broken link to last post in topic subscriptions list
PHPBB3-12300
2014-03-27 17:32:15 -07:00