1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-31 13:48:04 +01:00

12074 Commits

Author SHA1 Message Date
Joas Schilling
c2fbaf3af2 Merge remote-tracking branch 'bantu/ticket/12318-olympus' into develop-olympus
* bantu/ticket/12318-olympus:
  [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
  [ticket/12318] Pin HHVM version to 3.0.0~precise.
  [ticket/12318] Always install new config file on HHVM upgrade conflict.
  [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
  [ticket/12318] Upgrade to a recent stable version of HHVM.
  [ticket/12318] Correctly setup HHVM for functional tests.
2014-03-31 20:53:55 +02:00
Andreas Fischer
297729aa32 [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
PHPBB3-12318
2014-03-30 15:43:55 +02:00
Andreas Fischer
e1be4943d8 [ticket/12318] Pin HHVM version to 3.0.0~precise.
PHPBB3-12318
2014-03-30 15:43:55 +02:00
Andreas Fischer
d53c411d90 [ticket/12318] Always install new config file on HHVM upgrade conflict.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
a53312636a [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
672eab3a9c [ticket/12318] Upgrade to a recent stable version of HHVM.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
04707cbf8d [ticket/12318] Correctly setup HHVM for functional tests.
PHPBB3-12318
2014-03-30 15:43:54 +02:00
Andreas Fischer
dc3cb2205b Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympus
* VSEphpbb/ticket/12316:
  [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
2014-03-30 15:40:30 +02:00
Matt Friedman
a6b988c844 [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
PHPBB3-12316
2014-03-30 00:07:08 -07:00
Joas Schilling
1663a0a5fe Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympus
* bantu/ticket/12319:
  [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
2014-03-29 17:49:51 +01:00
Andreas Fischer
f7f18a3c66 [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
PHPBB3-12319
2014-03-29 12:08:52 +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
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
Joas Schilling
40ed3f6776 Merge remote-tracking branch 'bantu/ticket/12257' into develop-olympus
* bantu/ticket/12257:
  [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
2014-03-27 14:31:23 +01:00
Nils Adermann
47ab801440 Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympus
* marshalrusty/ticket/12310:
  [ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:35:48 -04:00
Yuriy Rusko
dc9ae231e5 [ticket/12310] Don't autocomplete SMTP user/pass on install
PHPBB3-12310
2014-03-26 23:16:39 -04:00
Andreas Fischer
0b9752a594 Merge pull request #2183 from s9e/ticket/12302
Upgrade all composer.phar to 1.0.0-alpha8

* s9e/ticket/12302:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
2014-03-25 17:27:15 +01:00
s9e
55e7459922 [ticket/12302] Added --no-dev to composer call in build.xml
PHPBB3-12302
2014-03-25 17:20:59 +01:00
s9e
53740111f6 [ticket/12302] Updated composer.phar to 1.0.0-alpha8
wget -N https://getcomposer.org/download/1.0.0-alpha8/composer.phar

PHPBB3-12302
2014-03-25 17:09:00 +01:00
Andreas Fischer
ca8fa03659 [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
PHPBB3-12257
2014-03-24 21:42:06 +01:00
Joas Schilling
574a9f4f2a Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympus
* schosser/ticket/10174:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:11 +01:00
Daniel Schosser
a46ad06c19 [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself

PHPBB3-10174
2014-03-23 14:06:32 +01:00
Joas Schilling
5197e5afe3 Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympus
* geetakshi/ticket/12035:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page
2014-03-22 15:07:01 +01:00
geetakshi
663eb74cf3 [ticket/12035] Correcting the condition
PHPBB3-12035
2014-03-20 14:17:03 +05:30
geetakshi
5316c32b10 [ticket/12035] Adding necessary conditions
PHPBB3-12035
2014-03-20 03:36:53 +05:30
Joas Schilling
bdab6dede0 Merge remote-tracking branch 'Elsensee/ticket/11766' into develop-olympus
* Elsensee/ticket/11766:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked
2014-03-19 20:34:22 +01:00
Oliver Schramm
d71fd5d660 [ticket/11766] Hide edit, quote and delete buttons if topic is locked
But show quote button to guests if topic isn't locked

PHPBB3-11766
2014-03-19 20:23:56 +01:00
geetakshi
418034af0e [ticket/12035] Adding link to user posts to ACP page
Adding link of posts behind displayed number of posts of the user

PHPBB3-12035
2014-03-17 00:52:11 +05:30
Joas Schilling
c1b48bdd01 Merge remote-tracking branch 'Elsensee/ticket/12072' into develop-olympus
* Elsensee/ticket/12072:
  [ticket/12072] Fix comment about NEW MEMBERS permission
2014-03-14 14:35:56 +01:00
Oliver Schramm
647f976c30 [ticket/12072] Fix comment about NEW MEMBERS permission
PHPBB3-12072
2014-03-14 14:33:56 +01:00
Joas Schilling
bdce7abc84 Merge remote-tracking branch 'marcosbc/ticket/12247' into develop-olympus
* marcosbc/ticket/12247:
  [ticket/12247] Makes static usernames work
  [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
2014-03-14 13:58:17 +01:00
Joas Schilling
943e4e35ee Merge remote-tracking branch 'exreaction/ticket/12202' into develop-olympus
* exreaction/ticket/12202:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
2014-03-14 13:53:55 +01:00
Nathan Guse
a6b274e8ab Merge pull request #11 from nickvergessen/ticket/exreaction/12202
[ticket/12202] Use an array in the data provider instead of exploding manually
2014-03-14 07:29:22 -05:00
Joas Schilling
1f8ab1c196 [ticket/12202] Use an array in the data provider instead of exploding manually
PHPBB3-12202
2014-03-14 13:18:30 +01:00
Marcos Bjorkelund
4333401a27 [ticket/12247] Makes static usernames work
Relative to the last ticket, this allows static usernames to
work correctly (those inserted in the post-column post_username)
when sending the e-mail, instead of showing just "Anonymous".

PHPBB3-12247
2014-03-14 00:49:20 +01:00
Marcos Bjorkelund
b322cb4c11 [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
It includes the poster's username in the email notifications of
posts that get approved by moderators.

This is done by adding the username to every user_notification()
function located in /phpBB/includes/mcp/mcp_queue.php.

PHPBB3-12247
2014-03-13 23:54:06 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
2014-03-13 10:16:41 +01:00
Andreas Fischer
e123b0c0a0 [ticket/12176] Reword comment about config entries.
PHPBB3-12176
2014-03-13 00:53:07 +01:00
Andreas Fischer
d3ddf29e59 Merge pull request #6 from nickvergessen/ticket/bantu/12176
[ticket/12176] Add newest_user_colour to config array to ensure it exists

* nickvergessen/ticket/bantu/12176:
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
2014-03-13 00:17:59 +01:00
Joas Schilling
ca92ed918a [ticket/12176] Add newest_user_colour to config array to ensure it exists
PHPBB3-12176
2014-03-12 20:08:55 +01:00
Andreas Fischer
d81a604ef8 Merge remote-tracking branch 'Crizz0/ticket/10549' into develop-olympus
* Crizz0/ticket/10549:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"
2014-03-12 16:25:01 +01:00
Crizzo
d95d062a42 [ticket/10549] using correct variable in includes/functions_module.php too
PHPBB3-10549
2014-03-11 18:45:46 +01:00
Crizzo
239f72ddda [ticket/10549] changed "right" to "incorrect"
PHPBB3-10549
2014-03-11 18:24:35 +01:00
Joas Schilling
e65a6dd8f4 Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus
* dhruvgoel92/ticket/11271:
  [ticket/11271] Make path conversion more precise
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.
2014-03-11 09:53:18 +01:00