1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

15751 Commits

Author SHA1 Message Date
Joas Schilling
3f86d50338 Merge remote-tracking branch 'brunoais/ticket11639' into develop
* brunoais/ticket11639:
  [ticket/11639] Changing how censorship is handled.
  [ticket/11639] Removed a non-needed unset
  [ticket/11639] Whitespace fixing
  [ticket/11639] Whitespace fixing
  [ticket/11639] Added an useful comment.
  [ticket/11639] generate_text_for_display on functions_posting.php
2013-08-04 01:56:39 +02:00
brunoais
28a0a9e0b1 [ticket/11639] Changing how censorship is handled.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-08-03 21:46:06 +01:00
Joas Schilling
02435f92ba Merge remote-tracking branch 'brunoais/ticket/11642' into develop
* brunoais/ticket/11642:
  [ticket/11642] Use $parse_flags
  [ticket/11642] Fixed typo in the variable name.
  [ticket/11642] generate_text_for_display on mcp/mcp_post.php
2013-08-03 17:52:31 +02:00
Joas Schilling
a4fc7840b1 Merge remote-tracking branch 'brunoais/ticket/11643' into develop
* brunoais/ticket/11643:
  [ticket/11643] Use $parse_flags
  [ticket/11643] Fixed typo in the variable name.
  [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
2013-08-03 17:47:02 +02:00
Joas Schilling
96cef7f549 Merge remote-tracking branch 'brunoais/ticket/11641' into develop
* brunoais/ticket/11641:
  [ticket/11641] Use $parse_flags
  [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
2013-08-03 17:37:54 +02:00
Oliver Schramm
71ababe6fb [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error
PHPBB3-11763
2013-08-03 17:30:28 +02:00
Joas Schilling
78623bf2ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11762] Added call to test class's parent::setUp().
  [ticket/11762] Fixed test's filename
  [ticket/11762] Use the === operator to distinguish "0" from ""
2013-08-03 15:37:01 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
rechosen
351abf3883 [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.html
Per request of nickvergessen, break up the long post buttons line in
viewtopic_body.html of subsilver2 into nicely indented parent and child
elements. Keep the whitespace in such a way that browsers display the buttons
pixel-perfectly equal to the old code.

In the process, move the viewtopic_body_post_buttons_before event to a more
logical (though possibly less intuitive) place (only in subsilver2).

PHPBB3-9550
2013-08-02 14:07:49 +02:00
rechosen
61fd61692b [ticket/9550] Improve template event descriptions in phpBB/docs/events.md
Update the custom_fields template events descriptions according to
nickvergessen's suggestions.

PHPBB3-9550
2013-08-02 11:44:07 +02:00
rechosen
f61910c3f8 [ticket/9550] Improve template event descriptions in phpBB/docs/events.md
Per suggestion of nickvergessen, stick to "before" and "after" in the template
event descriptions instead of "at the top of" and "at the bottom of".

PHPBB3-9550
2013-08-02 11:38:25 +02:00
rechosen
8c565ea1a6 [ticket/9550] Add the new template events to phpBB/docs/events.md
The newly added template events weren't listed and described yet in events.md.
Fixed now.

PHPBB3-9550
2013-08-02 11:36:00 +02:00
rechosen
075f491cb8 [ticket/9550] Add template event memberlist_body_username_prepend
Adds the prepend counterpart of a template event required for the karma
extension. It allows adding information before every username in the
memberlist.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
ee251fe45b [ticket/9550] Add template event memberlist_body_username_append
Adds a template event required for the karma extension. It allows adding
information after every username in the memberlist.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected every listed user is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
cd0b1be208 [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding data after the custom fields under the username
and avatar next to every private message in prosilver.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
2f1635116c [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_before
Adds a template event required for the karma extension. It allows adding data
before the custom fields under the username and avatar next to every private
message in prosilver.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows users
to see how respected the pm sender is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
8468968014 [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding data after the custom fields under the username
and avatar next to every post.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
c049c8d6f0 [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_before
Adds a template event required for the karma extension. It allows adding data
before the custom fields, under the username and avatar next to every post.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows users
to see how respected the post author is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
fd8ab92559 [ticket/9550] Add template event viewtopic_body_post_buttons_before
Adds the prepend counterpart of a template event required for the karma
extension. It allows adding post buttons to posts (next to the quote and edit
buttons).

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
ef7861bffc [ticket/9550] Add template event viewtopic_body_post_buttons_after
Adds a template event required for the karma extension. It allows adding
post buttons to posts (next to the quote and edit buttons).

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add thumbs up/down icons that allow users to
give karma on posts.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
a10ab3e7d9 [ticket/9550] Add template event memberlist_view_user_statistics_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding entries to the user statistics part of any user
profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
d7e048da10 [ticket/9550] Add template event memberlist_view_user_statistics_before
Adds a template event required for the karma extension. It allows adding
entries to the user statistics part of any user profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected this user is. Prepend because karma score is often
a more meaningful statistic than the bottom statistics (like "Most active
topic"), and should therefore be more prominent.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
Oliver Schramm
7d90f0a8a0 [ticket/11759] Change lowercase to uppercase
PHPBB3-11759
2013-08-02 02:49:28 +02:00
Andreas Fischer
d01c07c887 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
2013-08-01 17:32:32 +02:00
Andreas Fischer
02b4f1c874 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-08-01 17:30:21 +02:00
Andreas Fischer
0a73d64b97 [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. 2013-08-01 17:28:21 +02:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Joas Schilling
9f60a38539 Merge remote-tracking branch 'brunoais/ticket/11653' into develop
* brunoais/ticket/11653:
  [ticket/11653] Use $parse_flags
  [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
2013-08-01 16:50:50 +02:00
Joas Schilling
498f6ccbfc Merge remote-tracking branch 'brunoais/ticket/11655' into develop
* brunoais/ticket/11655:
  [ticket/11653] Use $parse_flags
  [ticket/11653] Missing ";"
  [ticket/11655] Use $parse_flags
  [ticket/11655] wrong var names for the uid and for the bitfield
  [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.php
2013-08-01 11:39:17 +02:00
Bruno Ais
2f25197279 [ticket/11641] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
2013-08-01 10:16:33 +01:00
Bruno Ais
3ae33910fc [ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:14:34 +01:00
Bruno Ais
a302a09ffb [ticket/11642] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
2013-08-01 10:12:58 +01:00
Bruno Ais
ea6938d3e5 [ticket/11643] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
2013-08-01 10:11:08 +01:00
Bruno Ais
c806375828 [ticket/11653] Missing ";"
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:09:11 +01:00
Bruno Ais
776773522b [ticket/11653] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-08-01 10:07:58 +01:00
Bruno Ais
c2aff70cf5 [ticket/11655] Use $parse_flags
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11655
2013-08-01 10:03:04 +01:00
Joas Schilling
ca07be9c57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:40:35 +02:00
Joas Schilling
4e1e5865d0 Merge remote-tracking branch 'Elsensee/ticket/10037' into develop-olympus
* Elsensee/ticket/10037:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:39:06 +02:00
Nathan Guse
d536a69e29 Merge pull request #1563 from cyberalien/ticket/11688
[ticket/11688] Purge TWIG cache
2013-07-31 08:10:46 -07:00
Oliver Schramm
6f883b6791 [ticket/10037] Fix table in subsilver2
Thanks, nickvergessen! ;-)

PHPBB3-10037
2013-07-31 14:04:50 +02:00
Joas Schilling
60641d7dbe Merge pull request #1632 from Elsensee/ticket/11464
[ticket/11464] Add missing and remove unnecessary database entry
2013-07-31 02:54:53 -07:00
Oliver Schramm
715e408ee6 [ticket/11464] Add missing and remove unnecessary database entry
PHPBB3-11464
2013-07-31 10:46:14 +02:00
Joas Schilling
bbc04e8607 Merge remote-tracking branch 'Elsensee/ticket/8228' into develop
* Elsensee/ticket/8228:
  [ticket/8228] Fix still existing problems with code in firefox
  [ticket/8228] Fix whitespaces before code in Firefox
2013-07-31 02:20:27 +02:00
Oliver Schramm
8892205644 [ticket/11757] Fix typo in signature_module_auth migration
PHPBB3-11757
2013-07-30 22:41:12 +02:00
Vjacheslav Trushkin
5eb321d311 [ticket/11688] Fix docblock
PHPBB3-11688
2013-07-30 21:02:40 +03:00
Oliver Schramm
95c603d545 [ticket/8228] Fix still existing problems with code in firefox
A user of a board mentioned that there are still some problems
in firefox if php-highlighting is on. So I used a snippet which
they worked on for weeks. Link to the snippet (in german):
http://www.ongray-design.de/forum/viewtopic.php?t=541

PHPBB3-8228
2013-07-30 18:00:47 +02:00
Joas Schilling
07ba2ed872 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into develop
# By Bruno Ais
# Via Bruno Ais (1) and Joas Schilling (1)
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11638] Variable names goof...
2013-07-30 14:17:46 +02:00
Joas Schilling
21ee4c1854 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
2013-07-30 14:15:09 +02:00
Joas Schilling
63a017ec90 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
2013-07-30 14:14:32 +02:00
Joas Schilling
fc89fa2fec Merge remote-tracking branch 'bantu/ticket/11753' into prep-release-3.0.12
* bantu/ticket/11753:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
2013-07-30 14:13:31 +02:00