makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
17991 commits 18 branches 192 tags 207 MiB
Commit graph

17991 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
18164e63e2 [ticket/11752] HTTP -> HTTPs in email/installed.txt 
PHPBB3-11752
 2013-07-30 01:06:10 +02:00
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
5f3f41d6d6 [ticket/11574] Remove old "continue step"-message 
PHPBB3-11574
 2013-07-29 23:47:31 +02:00
Joas Schilling
5bb08a1ab9 [ticket/11574] Change order of files and database update 
PHPBB3-11574
 2013-07-29 21:30:01 +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
Nathan Guse
0215e0bd95 [ticket/11724] Replace spaces with tabs 
PHPBB3-11724
 2013-07-28 21:31:12 -05: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
Nathan Guse
d5c56c5d50 [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way 
PHPBB3-11724
 2013-07-27 20:02:03 -05: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
Nathan Guse
57bc3c7d3a [ticket/11628] phpbb_template, not phpbb_template_interface 
PHPBB3-11628
 2013-07-25 09:32:28 -05:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes 
PHPBB3-10037
 2013-07-25 15:47:55 +02: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
Nathaniel Guse
ce0a1bb3c5 [ticket/11628] Remove remaining style_path_provider_test 
PHPBB3-11628
 2013-07-24 13:44:39 -05:00
Nathaniel Guse
ffbc144a73 [ticket/11628] Make get_template_vars protected 
Remove all references to it and the hacky code in messenger that was using it

PHPBB3-11628
 2013-07-24 13:38:12 -05:00
Nathaniel Guse
427fa17f7f [ticket/11628] Fix a bug I noticed in template->destroy 
Should not be setting $this->context = array()!

PHPBB3-11628
 2013-07-24 13:34:41 -05:00
Nathaniel Guse
8795a354fe [ticket/11628] Remove the one usage of get_style_path() 
Makes the code easier to follow

PHPBB3-11628
 2013-07-24 13:31:09 -05:00
Nathaniel Guse
3b46f77e4e [ticket/11628] Shorten an if to an inline statement 
PHPBB3-11628
 2013-07-24 13:26:55 -05:00
Nathaniel Guse
12c2258506 [ticket/11628] Remove template_path option on set_custom_style 
This was set to default 'template/' to append template/ to all the paths,
but every location was actually just setting it to '' to not append anything.
So removed the option entirely (additional paths can be appended to the paths
being sent to the function already)

PHPBB3-11628
 2013-07-24 13:25:20 -05:00
Nathaniel Guse
863592a8be [ticket/11628] Remove set_style_names function, moved to set_custom_style 
PHPBB3-11628
 2013-07-24 13:19:20 -05:00
Nathaniel Guse
4414278209 [ticket/11628] Set admin namespace in the constructor 
PHPBB3-11628
 2013-07-24 13:05:27 -05:00
Nathaniel Guse
67627f3336 [ticket/11628] Change set_custom_style $template path to default to string 
Rather than default to false and compare === false ? 'template/' : value just
assign this default in the arguments

PHPBB3-11628
 2013-07-24 13:01:30 -05:00
Nathaniel Guse
4b761f6575 [ticket/11628] Remove third parameter ($names) from set_custom_style 
This was basically duplicating functionality. $names would be used if not
empty, else array($name) would be used. Merged functionality into the first
argument

PHPBB3-11628
 2013-07-24 12:56:39 -05:00
Nathaniel Guse
bfbc7aa742 [ticket/11628] Return $this from set_style, set_custom_style 
PHPBB3-11628
 2013-07-24 12:45:35 -05:00
Nathaniel Guse
ecaed319ab [ticket/11628] Move setting core namespace to set_style() 
PHPBB3-11628
 2013-07-24 12:42:37 -05:00
Nathaniel Guse
85ff05bec6 [ticket/11628] Remove $this->names, $this->style_names from phpbb_template 
These are not used anywhere

PHPBB3-11628
 2013-07-24 12:34:22 -05:00
Nathaniel Guse
5d1afb4532 [ticket/11628] Remove phpbb_style (move methods to phpbb_template) 
PHPBB3-11628
 2013-07-24 12:24:35 -05:00