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

17887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Chase
9dbd42e945 [ticket/11620] Space between . in directory import concatenation 
PHPBB3-11620
 2013-07-22 13:51:06 -07:00
Marc Alexander
974da6449c [ticket/11723] Correctly redirect user to agreement page and let him leave 
This patch consists of two changes. The first one will make sure that $agree
is correctly reset to 0 and the user redirected back to the agreement page
after changing the display language. Secondly, by reseting 'change_lang',
the user will be able to agree to the terms on the agreement page again.
The changed language will still be kept, as this is correctly saved in the
'lang' field that is passed to the ucp_register page.
The variable $agree has also been changed to be boolean. It is not used as
an integer anywere in the ucp_register file.

PHPBB3-11723
 2013-07-22 22:20:55 +02: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
Bruno Ais
580131b5c3 [ticket/11640] removed the unset 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
 2013-07-22 11:16:47 +01: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
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [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:50:49 +02:00
Andreas Fischer
148df3607b Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-release-3.0.12 
* marc1706/ticket/11720-prep-release:
  [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:32:35 +02:00
Marc Alexander
865bf0db3d [ticket/11720] Add functional test for submitting report as user 
The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
56df3fd8ca [ticket/11720] Do not call $captcha->validate if $captcha is not set 
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies 
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
 2013-07-20 21:21:36 +02:00
Bruno Ais
43b172c8aa [ticket/11655] wrong var names for the uid and for the bitfield 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
 2013-07-20 16:44:24 +01:00
Bruno Ais
67ba959d9b [ticket/11654] first parameter fail 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
 2013-07-20 16:35:28 +01:00
Bruno Ais
0ef1bcac2b [ticket/11639] Whitespace fixing 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
 2013-07-20 16:31:08 +01:00
Bruno Ais
7341482304 [ticket/11638] Fixed not following guidelines for brackets 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-20 16:25:05 +01:00
Bruno Ais
fc64e6997f [ticket/11638] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-20 16:24:31 +01:00
Bruno Ais
f1bfbde3f5 [ticket/11643] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
 2013-07-20 16:19:27 +01:00
Bruno Ais
b3ad2fc23f [ticket/11642] Fixed typo in the variable name. 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
 2013-07-20 16:16:10 +01:00
Marc Alexander
e48f0555e9 [ticket/11531] Reduced amount of avatar functional tests to minimum 
The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
 2013-07-20 14:36:38 +02:00
Nathan Guse
e60816eeb1 Merge pull request #1584 from marc1706/ticket/11713 
[ticket/11713] Do not remove module if it couldn't be deleted
 2013-07-19 15:31:30 -07:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected 
PHPBB3-11707
 2013-07-19 14:12:28 -05:00