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
17,651 Commits 17 Branches 190 Tags
Commit Graph

17651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
7d8e80241c Merge remote-tracking branch 'EXreaction/ticket/11718' into develop 
* EXreaction/ticket/11718:
  [ticket/11718] Quick test for fixes in ELSEIF
  [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF

Conflicts:
	tests/template/template_test.php
 2013-07-23 04:24:05 +02:00
Andreas Fischer
1004aaf787 Merge remote-tracking branch 'asperous/ticket/11620' into develop 
* asperous/ticket/11620: (46 commits)
  [ticket/11620] Whitespace and combine function into test_case
  [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity
  [ticket/11620] Changed incorrect global variable
  [ticket/11620] Minor indentation changes and comment clarity
  [ticket/11620] Expected and actual test conditions wrongly swapped
  [ticket/11620] Space between . in directory import concatenation
  [ticket/11620] Changes to match merge
  [ticket/11620] Changes for code guidelines consistency
  [ticket/11620] Fix a static calls to non-static for session captcha
  [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick
  [ticket/11620] Update auth_provider for new interface
  [ticket/11620] Added garbage_collection_test
  [ticket/11620] Fixed check_ban_test errors with cache and ban warning message
  [ticket/11620] Fixed a typo on check_ban_test
  [ticket/11620]  Refactored check_isvalid_test to use session_test_case
  [ticket/11615] Refactored isvalid test to be more imperative
  [ticket/11615]  Rename continue -> check_isvalid for clarity
  [ticket/11620] Added a test for checking if users are banned
  [ticket/11620] Remove typo in beginning of session_key_test
  [ticket/11620] Typo in file name session_key_tests -> test
  ...
 2013-07-23 03:12:33 +02:00
Andy Chase
2fe2724e68 [ticket/11620] Whitespace and combine function into test_case 
PHPBB3-11620
 2013-07-22 17:39:45 -07:00
Andy Chase
0c54fb034b [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity 
PHPBB3-11620
 2013-07-22 17:39:14 -07:00
Andy Chase
568de3b8ce [ticket/11620] Changed incorrect global variable 
PHPBB3-11620
 2013-07-22 16:27:22 -07:00
Andy Chase
cc6147f876 [ticket/11620] Minor indentation changes and comment clarity 
PHPBB3-11620
 2013-07-22 16:27:18 -07:00
Andy Chase
be16459b89 Merge branch 'develop' into ticket/11620 2013-07-22 16:27:07 -07:00
Andreas Fischer
017d809e74 Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop 
* nickvergessen/ticket/11733:
  [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
 2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da [ticket/11733] Fix "Illegal offset type" Warning caused by overall feed 
PHPBB3-11733
 2013-07-23 00:59:51 +02:00
Joas Schilling
8dc8ee205a [ticket/11733] Add browse test for feed.php 
PHPBB3-11733
 2013-07-23 00:58:03 +02:00
Andreas Fischer
7c8e71845f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11726] Don't run lint tests on Travis on postgres
 2013-07-23 00:33:07 +02:00
Andreas Fischer
c0795cc4da Merge remote-tracking branch 'EXreaction/ticket/11726' into develop-olympus 
* EXreaction/ticket/11726:
  [ticket/11726] Don't run lint tests on Travis on postgres
 2013-07-23 00:32:58 +02:00
Andreas Fischer
c2d919f12d Merge remote-tracking branch 'asperous/ticket/11731' into develop 
* asperous/ticket/11731:
  [ticket/11731] Remove static calls to captcha garbage collector
 2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2 [ticket/11731] Remove static calls to captcha garbage collector 
PHPBB3-11731
 2013-07-22 15:04:30 -07:00
Andreas Fischer
73ae52d057 Merge remote-tracking branch 'nickvergessen/ticket/11728' into develop 
* nickvergessen/ticket/11728:
  [ticket/11728] Replace topic_approved with topic_visibility
 2013-07-22 23:21:46 +02:00
Joas Schilling
aa77367267 [ticket/11728] Replace topic_approved with topic_visibility 
PHPBB3-11728
 2013-07-22 22:54:55 +02:00
Andy Chase
9d38ded228 [ticket/11620] Expected and actual test conditions wrongly swapped 
PHPBB3-11620
 2013-07-22 13:52:17 -07:00
Andy Chase
9dbd42e945 [ticket/11620] Space between . in directory import concatenation 
PHPBB3-11620
 2013-07-22 13:51:06 -07:00
Andy Chase
28e98466d9 [ticket/11620] Changes to match merge 
PHPBB3-11620
 2013-07-22 12:26:02 -07:00
Nathan Guse
127ee62edd Merge pull request #1589 from marc1706/ticket/11717 
[ticket/11717] Use topic_posts_approved instead of topic_replies
 2013-07-22 12:20:17 -07:00
Andy Chase
e2a769ac79 Merge branch 'develop' into ticket/11620 2013-07-22 11:29:36 -07:00
Nathan Guse
b71038486e Merge pull request #1513 from nickvergessen/ticket/11582 
Ticket/11582 Split permission logic from translations
 2013-07-22 11:28:55 -07:00
Andy Chase
cc1aef47fb [ticket/11620] Changes for code guidelines consistency 
PHPBB3-11620
 2013-07-22 11:13:31 -07:00
asperous
de2cb59533 [ticket/11620] Fix a static calls to non-static for session captcha 
These changes fixes an error in certain version of php that throws
an error if you call a non-static method statically.

PHPBB3-11620
 2013-07-22 11:07:48 -07:00
asperous
25b189d33b [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick 
PHPBB3-11620
 2013-07-22 11:07:47 -07:00
asperous
30f198c61a [ticket/11620] Update auth_provider for new interface 
PHPBB3-11620
 2013-07-22 11:07:46 -07:00
asperous
7dbd85ad02 [ticket/11620] Added garbage_collection_test 
PHPBB3-11620
 2013-07-22 11:07:45 -07:00
asperous
af3a4ee33a [ticket/11620] Fixed check_ban_test errors with cache and ban warning message 
PHPBB3-11620
 2013-07-22 11:07:45 -07:00
asperous
13e4271c50 [ticket/11620] Fixed a typo on check_ban_test 
PHPBB3-11620
 2013-07-22 11:07:44 -07:00
asperous
2d850ba7a8 [ticket/11620] Refactored check_isvalid_test to use session_test_case 
Since the continue->isvalid refactoring is now in a branch with the
session_test_case framework, this test can be refactored to use that framework.

PHPBB3-11620
 2013-07-22 11:07:43 -07:00
Andy Chase
e74abfaa2c [ticket/11615] Refactored isvalid test to be more imperative 
Refactoring the continue/is_valid test to remove
the confusing data provider work around, while
still keeping redundancies down to a minimum.

PHPBB3-11615
 2013-07-22 11:07:43 -07:00
Andy Chase
362480263c [ticket/11615] Rename continue -> check_isvalid for clarity 
PHPBB3-11615
 2013-07-22 11:07:42 -07:00
asperous
d533e8807c [ticket/11620] Added a test for checking if users are banned 
PHPBB3-11620
 2013-07-22 11:07:41 -07:00
asperous
016faad668 [ticket/11620] Remove typo in beginning of session_key_test 
PHPBB3-11620
 2013-07-22 11:07:40 -07:00
asperous
750ea77108 [ticket/11620] Typo in file name session_key_tests -> test 
PHPBB3-11620
 2013-07-22 11:07:40 -07:00
asperous
f5a09858d0 [ticket/11620] Added a session key reset test 
PHPBB3-11620
 2013-07-22 11:07:39 -07:00
asperous
f7da773c06 [ticket/11620] Added manual key test 
PHPBB3-11620
 2013-07-22 11:07:38 -07:00
Andy Chase
87e65224d4 [ticket/11620] Cherry-Pick merge tests from session-storage-cache 
PHPBB3-11620
 2013-07-22 11:07:17 -07:00
Joas Schilling
0f70864624 [ticket/11582] Move global declaration to beginning of block 
PHPBB3-11582
 2013-07-22 20:06:30 +02:00
asperous
62d7a05700 [ticket/11620] Abstracted session setUp into a test_case class 
When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.

PHPBB3-11620
 2013-07-22 10:53:52 -07:00
Nathan Guse
960c3bb4fb Merge pull request #1401 from marc1706/ticket/11531 
[ticket/11531] Add basic set of functional tests for new avatar system
 2013-07-22 10:25:32 -07:00
Nathan Guse
43538fdca1 [ticket/11726] Don't run lint tests on Travis on postgres 
PHPBB3-11726
 2013-07-22 12:23:53 -05:00
Andreas Fischer
0f18ff6228 Merge remote-tracking branch 'marc1706/ticket/11725' into develop 
* marc1706/ticket/11725:
  [ticket/11725] Use new paths for phpbb_class_loader in file.php
 2013-07-22 18:30:59 +02:00
Nathan Guse
1d050635d2 Merge pull request #1592 from bantu/ticket/11722 
[ticket/11722] Remove reference assignment for $captcha in report.php
 2013-07-22 09:19:36 -07:00
Marc Alexander
2eb32ef515 [ticket/11531] Check if uploaded avatar is properly displayed in tests 
PHPBB3-11531
 2013-07-22 13:38:19 +02:00
Marc Alexander
128af41a7c [ticket/11725] Use new paths for phpbb_class_loader in file.php 
In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to
"{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed
in all files that use it.

PHPBB3-11725
 2013-07-22 12:47:32 +02:00
Marc Alexander
effafa4b4d [ticket/11717] Add 'has' to boolean variable and reduce line length 
PHPBB3-11717
 2013-07-22 10:42:46 +02:00
Andreas Fischer
570e21285b [ticket/11722] Remove reference assignment for $captcha in report.php 
PHPBB3-11722
 2013-07-22 03:30:27 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop 
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
 2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:51:03 +02:00