Commit graph

17710 commits

Author SHA1 Message Date
Joas Schilling
09de06cf15 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
2013-07-30 00:49:29 +02:00
Joas Schilling
69feffec8b Merge remote-tracking branch 'Elsensee/ticket/10917-2' into develop-olympus
* Elsensee/ticket/10917-2:
  [ticket/10917] Variable used only once so delete it
  [ticket/10917] Revert use of phpbb wrapper
2013-07-30 00:46:18 +02:00
Joas Schilling
db78c11702 Merge pull request #1625 from brunoais/ticket/11640
[ticket/11640] removed the space that I wonder what it was doing there.
2013-07-29 09:09:46 -07:00
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-29 17:00:51 +01:00
Bruno Ais
b8fef3b33a [ticket/11640] removed the space that I wonder what it was doing there.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
2013-07-29 16:55:58 +01:00
Nathan Guse
6da63f3ad8 Merge pull request #1597 from marc1706/ticket/11723
[ticket/11723] Correctly redirect user to agreement page and let him leave
2013-07-29 07:45:51 -07:00
Nathan Guse
7027610e23 Merge pull request #1542 from brunoais/ticket/11638
[ticket/11638] generate_text_for_display on viewtopic.php
2013-07-29 07:42:32 -07:00
Nathan Guse
8cc2725703 Merge pull request #1576 from brunoais/ticket/11640
[ticket/11640] generate_text_for_display on functions_privmsgs.php
2013-07-29 07:29:25 -07:00
Nathan Guse
7003f98d03 Merge pull request #1586 from brunoais/ticket/11654
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
2013-07-29 07:26:15 -07:00
Nathan Guse
6cbe887ea0 Merge pull request #1619 from VSEphpbb/ticket/11749
[ticket/11749] PHP and Template Events for Topic Preview Extension
2013-07-29 07:18:41 -07:00
Matt Friedman
9902f1c751 [ticket/11749] Move event after all template data has been defined
PHPBB3-11749
2013-07-29 00:05:31 -07:00
Oliver Schramm
dd875f13e8 [ticket/10917] Variable used only once so delete it
The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.

Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.

PHPBB3-10917
2013-07-28 13:55:37 +02:00
Oliver Schramm
d8584877a1 [ticket/10917] Revert use of phpbb wrapper
PHPBB3-10917
2013-07-27 22:37:44 +02:00
Matt Friedman
8e636e4572 [ticket/11749] Template events for topic_list_row_pre/append
PHPBB3-11749
2013-07-27 10:48:40 -07:00
Matt Friedman
9ffb150d47 [ticket/11749] PHP Events for viewforum.php
PHPBB3-11749
2013-07-27 10:45:40 -07:00
Matt Friedman
9e68404de5 [ticket/11749] PHP Events for search.php
PHPBB3-11749
2013-07-27 10:44:39 -07:00
Nathaniel Guse
26dac64d45 Merge branch 'develop-olympus' into develop
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
2013-07-25 13:36:52 -05:00
Nathaniel Guse
935001b7a2 Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-olympus
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/10917:
  [ticket/10917] Using phpbb wrapper
  [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
2013-07-25 13:36:29 -05:00
Nathaniel Guse
bea1ce92a1 Merge branch 'develop-olympus' into develop
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
2013-07-25 13:34:10 -05:00
Nathaniel Guse
162ea10b6a Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-olympus
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided
2013-07-25 13:32:23 -05:00
Andreas Fischer
5ebc36f583 Merge remote-tracking branch 'Elsensee/ticket/11741' into develop
* Elsensee/ticket/11741:
  [ticket/11741] Fix empty brackets and remove bullet
2013-07-25 14:20:29 +02:00
Andreas Fischer
8e1801698e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:08:06 +02:00
Andreas Fischer
76a7d544cf Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:07:53 +02:00
Andreas Fischer
469d9ee171 Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.0.12
* unknownbliss/ticket/11740:
  [ticket/11740] Update FAQ to include Ideas Centre
2013-07-25 14:07:10 +02:00
MichaelC
c5de4dd51d [ticket/11740] Update FAQ to include Ideas Centre
PHPBB3-11740
2013-07-25 13:06:11 +01:00
Oliver Schramm
7304ac9c3c [ticket/11062] If user's language is english there is no further work needed
PHPBB3-11062
2013-07-25 13:10:45 +02:00
Oliver Schramm
a9f0577502 [ticket/11062] Load new strings from user's language file if provided
PHPBB3-11062
2013-07-25 12:29:25 +02:00
Joas Schilling
593ab9362e Merge remote-tracking branch 'brunoais/ticket/11656' into develop
* brunoais/ticket/11656:
  [ticket/11656] Made the check for the bitfield just like other PR's
  [ticket/11656] Wrong bitwise OR
  [ticket/11656] Remove line break in function call
  [ticket/11656] generate_text_for_display on memberlist.php
2013-07-24 22:14:52 +02:00
Oliver Schramm
e805036963 [ticket/10917] Using phpbb wrapper
PHPBB3-10917
2013-07-24 19:08:49 +02:00
Oliver Schramm
5af63a7860 [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
PHPBB3-10917
2013-07-24 18:15:03 +02:00
Oliver Schramm
27126e065d [ticket/11741] Fix empty brackets and remove bullet
PHPBB3-11741
2013-07-24 17:22:10 +02:00
Bruno Ais
4cdccbd42b [ticket/11638] Removed the unneeded reset.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:45:23 +01:00
Bruno Ais
6c68348a71 [ticket/11638] Use the $parse_flags like the other commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:38 +01:00
Bruno Ais
029015e154 [ticket/11638] Reverted to use the $parse tags way as the other ones
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:14 +01:00
Bruno Ais
4ed322b5b8 [ticket/11638] Updated: bitwise $parse_flags use optionset()
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 11:59:28 +01:00
Bruno Ais
13fa346e8f [ticket/11656] Made the check for the bitfield just like other PR's
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
2013-07-24 11:38:04 +01:00
Andreas Fischer
f0516b7d2a Merge remote-tracking branch 'EXreaction/ticket/11667' into develop
* EXreaction/ticket/11667:
  [ticket/11667] Use @inheritdoc
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [ticket/11667] Make functions abstract in includeasset
  [ticket/11667] includeasset should be abstract
2013-07-24 02:45:35 +02:00
Nathan Guse
bf04bfcced [ticket/11667] Use @inheritdoc
PHPBB3-11667
2013-07-23 11:16:23 -05:00
Nathan Guse
485c6ab355 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667
# By Joas Schilling (224) and others
# Via Andreas Fischer (23) and others
* 'develop' of github.com:phpbb/phpbb3: (385 commits)
  [ticket/11734] Readd accidently removed language strings of forum permissions
  [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/11733] Fix "Illegal offset type" Warning caused by overall feed
  [ticket/11733] Add browse test for feed.php
  [ticket/11731] Remove static calls to captcha garbage collector
  [ticket/11728] Replace topic_approved with topic_visibility
  [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
  ...
2013-07-23 11:13:25 -05:00
Nathan Guse
be59885d5f Merge pull request #1601 from nickvergessen/ticket/11734
[ticket/11734] Readd accidently removed language strings of forum permissions
2013-07-23 07:31:10 -07:00
Joas Schilling
1d2d3032d3 [ticket/11734] Readd accidently removed language strings of forum permissions
PHPBB3-11734
2013-07-23 16:26:01 +02:00
Bruno Ais
c366998112 [ticket/11654] Moved some code to reduce line width.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
2013-07-23 12:47:18 +01:00
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