1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

18214 Commits

Author SHA1 Message Date
Andreas Fischer
08a6bd2218 Merge remote-tracking branch 'asperous/ticket/11761' into develop
* asperous/ticket/11761:
  [ticket/11761] Serve blank file locally in functional test
2013-08-06 22:53:15 +02:00
Andy Chase
2508439b02 [ticket/11761] Serve blank file locally in functional test
Example.org no longer serves blank responses, failing functional tests.

this patch creates a  blank file and serve it locally during the test,
instead of hitting the http://example.org servers kindly provided by IANA.

PHPBB3-11761
2013-08-06 12:39:28 -07:00
Vjacheslav Trushkin
3713ff71ea [ticket/11770] Fix class name for pm list
PHPBB3-11770
2013-08-06 21:47:35 +03:00
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
2013-08-05 17:35:44 -04:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page
PHPBB3-11673
2013-08-05 15:38:03 -04:00
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
Joas Schilling
bef1bac895 Merge remote-tracking branch 'Elsensee/ticket/11763' into develop
* Elsensee/ticket/11763:
  [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error
2013-08-03 17:32:24 +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
Joas Schilling
33eb9ad53a Merge remote-tracking branch 's9e/ticket/11762' into develop-olympus
* s9e/ticket/11762:
  [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:35:34 +02:00
s9e
9db1728b4b [ticket/11762] Added call to test class's parent::setUp().
Added call to test class's parent::setUp(). Updated copyright year.

PHPBB3-11762
2013-08-03 14:06:43 +02:00
s9e
68aa974a20 [ticket/11762] Fixed test's filename
PHPBB3-11762
2013-08-03 12:29:23 +02:00
s9e
8a02db317e [ticket/11762] Use the === operator to distinguish "0" from ""
PHPBB3-11762
2013-08-03 12:20:52 +02:00
Joseph Warner
3cbb973160 [feature/oauth] Pass users_table as parameter to OAuth in construct
PHPBB3-11673
2013-08-02 14:37:39 -04:00
Joseph Warner
e16dd958e3 [feature/oauth] OAuth clear tokens on logout
PHPBB3-11673
2013-08-02 14:31:35 -04:00
Joseph Warner
2222f3f380 [feature/oauth] Fix error caused by previous change in OAuth
PHPBB3-11673
2013-08-02 14:23:35 -04:00
Joseph Warner
1ae2283b34 [feature/oauth] Finish updating interface and related code
PHPBB3-11673
2013-08-02 14:21:25 -04:00
Joseph Warner
245e71e4e2 [feature/oauth] Add get_login_data to the auth_provider_interface
PHPBB3-11673
2013-08-02 14:05:44 -04:00
Joas Schilling
73040c6d1d Merge remote-tracking branch 'rechosen/ticket/9550' into develop
* rechosen/ticket/9550:
  [ticket/9550] Break up a long ugly line in subsilver2 viewtopic_body.html
  [ticket/9550] Improve template event descriptions in phpBB/docs/events.md
  [ticket/9550] Improve template event descriptions in phpBB/docs/events.md
  [ticket/9550] Add the new template events to phpBB/docs/events.md
  [ticket/9550] Add template event memberlist_body_username_prepend
  [ticket/9550] Add template event memberlist_body_username_append
  [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_after
  [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_before
  [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_after
  [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_before
  [ticket/9550] Add template event viewtopic_body_post_buttons_before
  [ticket/9550] Add template event viewtopic_body_post_buttons_after
  [ticket/9550] Add template event memberlist_view_user_statistics_after
  [ticket/9550] Add template event memberlist_view_user_statistics_before
  [ticket/11759] Change lowercase to uppercase
  [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.
2013-08-02 19:57:10 +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
Joseph Warner
381e7c347b [feature/oauth] Forgot new line character
PHPBB3-11673
2013-08-01 21:45:25 -04:00
Joseph Warner
abe9f27723 [feature/oauth] Clean up OAuth services
PHPBB3-11673
2013-08-01 21:35:05 -04:00
Joseph Warner
abee776018 [feature/oauth] Clean up oauth.php
PHPBB3-11673
2013-08-01 21:30:51 -04:00
Oliver Schramm
e667481c6c [ticket/11760] Use phpbb_version_compare() wrapper
PHPBB3-11760
2013-08-02 03:28:32 +02:00
Andreas Fischer
22ba1a0c7e Merge remote-tracking branch 'Elsensee/ticket/11759' into develop
* Elsensee/ticket/11759:
  [ticket/11759] Change lowercase to uppercase
2013-08-02 03:10:19 +02:00
Oliver Schramm
7d90f0a8a0 [ticket/11759] Change lowercase to uppercase
PHPBB3-11759
2013-08-02 02:49:28 +02:00
Andreas Fischer
0121de56d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
2013-08-01 17:40:14 +02:00
Andreas Fischer
b7f97cae79 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
2013-08-01 17:40:05 +02:00
Andreas Fischer
acc7cb5e23 Merge branch 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3 into prep-release-3.0.12
* 'prep-release-3.0.12' of git://github.com/phpbb/phpbb3:
  [ticket/11753] Remove ?> from MySQL Upgrader.
  [ticket/11753] Update MySQL upgrader schema data.
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
  [ticket/11752] HTTP -> HTTPs in email/installed.txt
release-3.0.12-RC2
2013-08-01 17:39:52 +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