mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
12,237 Commits 17 Branches 190 Tags
Commit Graph

12237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
b32f91b9c6 [task/sami] Add sami/sami as a composer development dependency. 
PHPBB3-12495
 2014-05-16 17:55:41 +02:00
Andreas Fischer
f2500da8ec Merge pull request #2454 from nickvergessen/ticket/12540 
[ticket/12540] Fix broken placeholders in language files

* nickvergessen/ticket/12540:
  [ticket/12540] Fix broken placeholders in language files
 2014-05-15 13:36:06 +02:00
Tristan Darricau
d53336af06 [ticket/11224] Remove new line in acm_memory.php 
PHPBB3-11224
 2014-05-15 12:36:22 +02:00
Tristan Darricau
292908ca4a [ticket/11224] Use assertNotEquals(false) instead of assertNotFalse() 
assertNotFalse() is unavailable with the version of phpunit used with php
5.2

PHPBB3-11224
 2014-05-15 01:50:44 +02:00
Tristan Darricau
7c99e30920 [ticket/11224] Fix coding style 
PHPBB3-11224
 2014-05-15 01:17:02 +02:00
Tristan Darricau
b7f54e42b2 [ticket/11224] Add unit test 
PHPBB3-11224
 2014-05-15 00:22:27 +02:00
Tristan Darricau
9dd71fa32e [ticket/11224] Fix the blank line after ?> 
PHPBB3-11224
 2014-05-14 20:23:27 +02:00
Tristan Darricau
0c4b53e2f1 [ticket/11224] Fix returned data 
PHPBB3-11224
 2014-05-14 20:22:36 +02:00
Tristan Darricau
0c109c9d37 [ticket/11224] SQL cache destroy does not destroy queries to tables joined 
https://tracker.phpbb.com/browse/PHPBB3-11224

PHPBB3-11224
 2014-05-14 20:00:04 +02:00
Joas Schilling
dceea23b1f [ticket/12540] Fix broken placeholders in language files 
PHPBB3-12540
 2014-05-13 21:41:11 +02:00
Andreas Fischer
cc0446dc17 Merge pull request #2430 from nickvergessen/ticket/10839-olympus 
[Ticket/10839] olympus - Remove phpunit configuration files

* nickvergessen/ticket/10839-olympus:
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default
 2014-05-10 17:14:00 +02:00
Joas Schilling
333120a992 [ticket/10839] Fix note about running slow tests and build task 
PHPBB3-10839
 2014-05-09 11:19:49 +02:00
Joas Schilling
8a9b1a8fed [ticket/10839] Removing phpunit.xml.all 
To run all tests, just append
    --group slow
to your call

PHPBB3-10839
 2014-05-09 11:19:48 +02:00
Joas Schilling
d6ac4a1130 [ticket/10839] Always run functional tests by default 
They are skipped anyway, if $phpbb_functional_url is not configured.
If you want to run tests without functional tests, just append
    --exclude-group functional
to your call

PHPBB3-10839
 2014-05-09 11:19:48 +02:00
Joas Schilling
436e388b87 Merge pull request #2396 from Nicofuma/ticket/12485 
[ticket/12485] Broken tests due to absolute 'exclude'

* Nicofuma/ticket/12485:
  [ticket/12485] Broken tests due to absolute exclude
 2014-05-03 10:19:52 +02:00
Nicofuma
3dee1db260 [ticket/12485] Broken tests due to absolute exclude 
PHPBB3-12485
 2014-05-03 04:05:25 +02:00
Nils Adermann
af7ec71967 Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympus 
* github-bantu/ticket/11860:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:11 +02:00
Nils Adermann
7b94368d52 Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus 
* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:42:54 +02:00
Andreas Fischer
30dc3afb69 [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. 
PHPBB3-12429
 2014-05-02 20:19:10 +02:00
Nils Adermann
1cd2aaf92f Merge remote-tracking branch 'github-nickvergessen/ticket/12472' into develop-olympus 
* github-nickvergessen/ticket/12472:
  [ticket/12472] Set fast_finish for travis
 2014-05-02 18:58:15 +02:00
Marc Alexander
cb2538dc84 Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus 
* nickvergessen/ticket/12120:
  [ticket/12120] Add Marc Alexander to AUTHORS
 2014-05-02 18:36:08 +02:00
Joas Schilling
acdaad2625 [ticket/12472] Set fast_finish for travis 
Now, a build will finish as soon as a job has failed,
or when the only jobs left allow failures.
http://docs.travis-ci.com/user/build-configuration/#Fast-finishing

PHPBB3-12472
 2014-05-02 17:59:22 +02:00
Joas Schilling
797cb02f06 [ticket/12120] Add Marc Alexander to AUTHORS 
PHPBB3-12120
 2014-05-02 17:12:44 +02:00
Nils Adermann
c7450592d8 Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus 
* github-bantu/ticket/12468:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 15:36:59 +02:00
Andreas Fischer
370015c1a5 [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'. 
PHPBB3-12468
 2014-05-02 14:41:08 +02:00
Andreas Fischer
43c6fd768f Merge pull request #2371 from nickvergessen/ticket/12467 
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 14:21:54 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore 
PHPBB3-12467
 2014-05-02 13:47:30 +02:00
Nils Adermann
fa230b48ec Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus 
* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
 2014-05-02 13:25:29 +02:00
Joas Schilling
06e9d8871c Merge pull request #2319 from n-aleha/ticket/12186 
[ticket/12186] Move PM reports below post reports while installing

* n-aleha/ticket/12186:
  [ticket/12186] Move PM reports below post reports while installing
 2014-04-29 21:28:54 +02:00
Nicofuma
4f6441b411 [ticket/11480] PM : "Unknown folder" returned when inbox folder is full 
https://tracker.phpbb.com/browse/PHPBB3-11480

PHPBB3-11480
 2014-04-25 01:04:00 +02:00
n-aleha
5a91399dac [ticket/12186] Move PM reports below post reports while installing 
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
 2014-04-23 22:43:20 +03:00
Andreas Fischer
c0f3011b53 Merge pull request #2341 from nickvergessen/ticket/12413 
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
 2014-04-22 19:24:43 +02:00
Joas Schilling
f9cdec90fc [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.

PHPBB3-12413
 2014-04-22 18:55:17 +02:00
Joas Schilling
d735129d6e Merge pull request #2324 from bantu/ticket/12417 
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai...

* bantu/ticket/12417:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
 2014-04-16 22:46:41 +02:00
Andreas Fischer
04893e3f98 [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail." 
hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize
unserializable builtin class DOMElement" errors when running functional tests.

This reverts commit ff7cc77f9db66b7fddacd77f215d85cf0243b2fa.

PHPBB3-12417
 2014-04-16 22:16:52 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397 
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
 2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block 
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
 2014-04-16 00:55:05 +03:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423 
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
 2014-04-15 23:23:26 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php 
PHPBB3-10423
 2014-04-15 20:43:16 +02:00
Oliver Schramm
601ecd3da1 [ticket/10423] Remove unnecessary include in test 
PHPBB3-10423
 2014-04-15 20:43:01 +02:00
Marc Alexander
c6fd2f01eb [ticket/8960] Allow changing avatar path if it's not writable 
This change will allow users to change the avatar path even if it's not
writable. However, this will get rid of the error message that the path is
not writable. Due to this, a minor addition to the explain message in the ACP
settings has been made.

PHPBB3-8960
 2014-04-14 22:44:37 +02:00
Oliver Schramm
dde7ac3b2b [ticket/10423] Match multiple wildcards 
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.

PHPBB3-10423
 2014-04-13 21:36:09 +02:00
Oliver Schramm
face175471 [ticket/10423] Move code into a function and add tests for it 
PHPBB3-10423
 2014-04-13 21:15:14 +02:00
Andreas Fischer
b19ee00b9c [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. 
HHVM MySQLi has been fixed and works for us now.

PHPBB3-12384
 2014-04-12 01:58:54 +02:00
Cesar G
e64c2326bd Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympus 
* marc1706/ticket/10687:
  [ticket/10687] Improve error message if unable to get image dimensions
 2014-04-10 17:42:14 -07:00
Andreas Fischer
7d54fbd31a Merge pull request #2279 from Elsensee/ticket/12381 
[ticket/12381] Fix broken error message when selecting invalid DB driver

* Elsensee/ticket/12381:
  [ticket/12381] Fix broken error message when selecting invalid DB driver
 2014-04-10 15:44:35 +02:00
Oliver Schramm
87cfcda638 [ticket/12381] Fix broken error message when selecting invalid DB driver 
PHPBB3-12381
 2014-04-10 15:05:16 +02:00
Joas Schilling
f0f479c517 Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympus 
* bantu/ticket/12320:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
 2014-04-10 13:38:01 +02:00
Andreas Fischer
4d206e2ced [ticket/12320] Install a nightly build of HHVM. 
PHPBB3-12320
 2014-04-10 11:37:25 +02:00
Andreas Fischer
ff7cc77f9d [ticket/12320] No longer allow Travis CI HHVM environment to fail. 
PHPBB3-12320
 2014-04-10 11:36:48 +02:00