mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-01 21:27:55 +02:00
Code Issues Releases Wiki Activity
24,432 Commits 18 Branches 192 Tags
Commit Graph

24432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
19a47c7bac Merge branch 'develop-ascraeus' into develop 2014-11-18 13:12:08 +01:00
Marc Alexander
b84d151afa Merge pull request #3151 from nickvergessen/ticket/13298 
[ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
 2014-11-18 13:11:55 +01:00
Marc Alexander
2e467c8569 Merge branch 'develop-ascraeus' into develop 2014-11-18 13:09:19 +01:00
Marc Alexander
17d76de7b8 Merge pull request #3152 from prototech/ticket/13277 
[ticket/13277] Force IE to not cache AJAX requests.
 2014-11-18 13:08:58 +01:00
Cesar G
e1865df7dd Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before

Conflicts:
	phpBB/styles/subsilver2/template/posting_buttons.html
 2014-11-18 01:33:13 -08:00
Cesar G
052fdcc8d9 Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus 
* Nicofuma/ticket/13023:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
 2014-11-18 01:30:06 -08:00
Cesar G
266755bd82 [ticket/13277] Force IE to not cache AJAX requests. 
Caching causes problems, such as the inability to move a forum/CPF/module in the
same direction by more than one row.

PHPBB3-13277
 2014-11-18 00:41:57 -08:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php 
PHPBB3-13298
 2014-11-17 23:56:33 +01:00
Joas Schilling
cddb768772 Merge branch 'develop-ascraeus' into develop 2014-11-17 23:33:04 +01:00
Joas Schilling
4f96688bf7 Merge pull request #3145 from bantu/ticket/13338 
[ticket/13338] Make all tests run on their own. Avoid _test suffix for abstract test case classes.
 2014-11-17 23:32:45 +01:00
Joas Schilling
c09c95599b Merge branch 'develop-ascraeus' into develop 2014-11-17 22:47:58 +01:00
Joas Schilling
f261c748b6 Merge branch 'develop-olympus' into develop-ascraeus 2014-11-17 22:47:46 +01:00
Joas Schilling
2b55476df0 Merge pull request #3147 from bantu/ticket/13341-ascraeus 
[ticket/13341] Change coverage to whitelist to prevent errors with temp files
 2014-11-17 22:47:41 +01:00
Joas Schilling
d4fd5e3365 Merge pull request #3146 from bantu/ticket/13341 
[ticket/13341] Change coverage to whitelist to prevent errors with temp ...
 2014-11-17 22:47:17 +01:00
Andreas Fischer
21c8985fe8 [ticket/13338] Add include statements for dependencies. 
PHPBB3-13338
 2014-11-17 21:54:02 +01:00
Andreas Fischer
765d72d194 [ticket/13338] Do not use the _test.php suffix for abstract test case classes. 
PHPBB3-13338
 2014-11-17 21:53:27 +01:00
Andreas Fischer
a918abe113 [ticket/13338] Move insert_config_array_test to functions_acp, add deps. 
PHPBB3-13338
 2014-11-17 21:53:27 +01:00
Nils Adermann
6104be6b4d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:29 +01:00
Nils Adermann
4ffdb12938 Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus 
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:15 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object 
PHPBB3-13280
 2014-11-16 16:45:19 +01:00
Tristan Darricau
f1b88706b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:23:04 +01:00
Tristan Darricau
e27b69f42a Merge pull request #3136 from marc1706/ticket/13332 
[ticket/13332] Pass user row to passwords manager check method

* marc1706/ticket/13332:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:22:51 +01:00
Tristan Darricau
074b91497b [ticket/13023] Add template event posting_editor_buttons_custom_tags_before 
PHPBB3-13023
 2014-11-16 11:52:30 +01:00
Andreas Fischer
8297f700d0 Merge pull request #3146 from bantu/ticket/13341 
[ticket/13341] Change coverage to whitelist to prevent errors with temp ...

* bantu/ticket/13341:
  [ticket/13341] Change coverage to whitelist to prevent errors with temp files.

Conflicts:
	phpunit.xml.dist
 2014-11-14 17:27:15 +01:00
Andreas Fischer
c40d7f0896 [ticket/13341] Change coverage to whitelist to prevent errors with temp files. 
b4f95deefc9d456c5a2d0f6338f6dcecc0829652 suggests that this can lead to issues
with classes having the same name. However, this does not seem to be a problem
with the current version of PHPUnit we are using.

Despite https://phpunit.de/manual/4.1/en/code-coverage-analysis.html saying
that addUncoveredFilesFromWhitelist="true" is optional, this seems to be on by
default in PHPUnit 4.1.0. As a result, all files are considered for code
coverage; which is what we want.

processUncoveredFilesFromWhitelist is however false (by default) and as such
even files that are considered for code coverage are not processed through PHP
when not used in actual tests. Since it is already impossible to test multiple
classes with the same name in the same test run (without process isolation),
because that would already lead to "cannot redeclare class" errors, it is also
impossible for "cannot redeclare class" errors to happen in test coverage.

PHPBB3-13341
 2014-11-14 13:44:42 +01:00
Marc Alexander
1f2ec038fb Merge branch 'develop-ascraeus' into develop 2014-11-13 17:12:09 +01:00
Marc Alexander
c9db08873f Merge pull request #3141 from bantu/ticket/13325 
[ticket/13325] Make installing composer dependencies in tests folder optional.
 2014-11-13 17:11:48 +01:00
Marc Alexander
0795766837 Merge branch 'develop-ascraeus' into develop 2014-11-13 01:03:07 +01:00
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318 
[ticket/13318] login_username needs to have the multibyte parameter set to true
 2014-11-13 01:02:49 +01:00
Marc Alexander
f0bdf02b32 Merge branch 'develop-ascraeus' into develop 2014-11-13 00:16:46 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209 
[ticket/13209] Fix loss of CPF language field values when switching steps
 2014-11-13 00:14:54 +01:00
Joas Schilling
9406f1fe11 Merge branch 'develop-ascraeus' into develop 2014-11-12 23:04:23 +01:00
Joas Schilling
a520edb8fa Merge branch 'develop-olympus' into develop-ascraeus 2014-11-12 23:04:10 +01:00
Joas Schilling
12fd9a8827 Merge pull request #3143 from bantu/ticket/13331-ascraeus 
[ticket/13331] Use docs target for this branch, add docs-all for all branches
 2014-11-12 23:04:07 +01:00
Joas Schilling
b99fbd0be0 Merge pull request #3142 from bantu/ticket/13331 
[ticket/13331] Use docs target for this branch, add docs-all for all branches
 2014-11-12 22:55:30 +01:00
Andreas Fischer
968360fed6 [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php. 
PHPBB3-13331
 2014-11-12 21:45:03 +01:00
Andreas Fischer
0103478521 Merge pull request #3142 from bantu/ticket/13331 
[ticket/13331] Use docs target for this branch, add docs-all for all branches

* bantu/ticket/13331:
  [ticket/13331] Use docs target for this branch, add docs-all for dev branches.

Conflicts:
	build/build.xml
	build/sami-checkout.conf.php
 2014-11-12 21:43:56 +01:00
Andreas Fischer
b55d744e77 [ticket/13331] Use docs target for this branch, add docs-all for dev branches. 
PHPBB3-13331
 2014-11-12 21:40:26 +01:00
Andreas Fischer
1e4ff6105a [ticket/13325] Make installing composer dependencies in tests folder optional. 
Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
 2014-11-12 20:34:36 +01:00
Andreas Fischer
8df63a4499 [ticket/13325] Remove whitespace at end of line. 
PHPBB3-13325
 2014-11-12 20:32:36 +01:00
Andreas Fischer
e1bf699ad4 [ticket/13325] Update / Fix composer.lock hash. 
PHPBB3-13325
 2014-11-12 20:31:41 +01:00
Tristan Darricau
526a97db7c [ticket/13280] Add new tests 
PHPBB3-13280
 2014-11-12 15:43:20 +01:00
Tristan Darricau
f142ed28e4 [ticket/13280] Make the tests failing 
PHPBB3-13280
 2014-11-12 15:43:12 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" 
This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing
changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb.

PHPBB3-13280
 2014-11-12 15:42:23 +01:00
Marc Alexander
1b439ee2b7 Merge branch 'develop-ascraeus' into develop 2014-11-12 13:05:04 +01:00
Marc Alexander
09ad1d529e Merge pull request #3139 from prototech/ticket/13239 
[ticket/13239] Ensure "Add files" button position is correctly calculated.
 2014-11-12 13:04:46 +01:00
Marc Alexander
63022f3c59 [ticket/13332] Fix auth provider tests 
PHPBB3-13332
 2014-11-12 11:42:08 +01:00
Cesar G
430c6aa32f [ticket/13239] Ensure "Add files" button position is correctly calculated. 
PHPBB3-13239
 2014-11-11 17:30:34 -08:00
Cesar G
ec220d6494 [ticket/13209] Gather language field values for boolean CPF's in all steps. 
The user can move back and forth between all three steps and as such the lang
field data should be expected in all steps.

PHPBB3-13209
 2014-11-11 16:32:04 -08:00
Cesar G
3108d0b060 [ticket/13209] Fix expected request value of CPF language fields. 
Multiple languages can be edited, thus the expected value is an array.

PHPBB3-13209
 2014-11-11 16:28:06 -08:00