Commit graph

2369 commits

Author SHA1 Message Date
David King
f02a8cf0e6 Merge pull request #1705 from EXreaction/ticket/11833
Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
2013-09-12 21:17:22 -07:00
Nathan Guse
94b3d38392 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/11829] Use report_closed to determine status in MCP report_details

Conflicts:
	phpBB/styles/prosilver/template/mcp_post.html
2013-09-12 14:57:26 -05:00
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
Nathan Guse
0cb4ceabf4 [ticket/11833] Fix bad template loop
PHPBB3-11833
2013-09-09 11:24:12 -05:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
2013-09-06 20:35:54 -04:00
Nathan Guse
dd86e8d0ae Merge pull request #1618 from VSEphpbb/ticket/11747
[ticket/11747] UCP Prefs Core and Template Events
2013-09-05 11:36:25 -07:00
Nathan Guse
9d5ab7615f Merge pull request #1435 from cyberalien/ticket/11562
forum_fn.js cleanup
2013-09-05 11:27:42 -07:00
Nathan Guse
ab0af38629 Merge pull request #1651 from cyberalien/ticket/11782
Fix layout of notices in posts
2013-09-05 08:26:29 -07:00
rechosen
77845e366e [ticket/11829] Use report_closed to determine status in MCP report_details
Instead of using post_reported of the post or message_reported of the pm, use
report_closed of the report itself to reliably determine whether this
particular report is closed or not in the report_details view of the MCP.
This fixes a bug where the report_details view would not show that the report
shown was closed and display a "Close report" button that had no effect.

PHPBB3-11829
2013-09-04 13:37:39 +02:00
Joseph Warner
ae18f921ea [feature/oauth] More small fixes
PHPBB3-11673
2013-09-02 16:52:41 -04:00
Vjacheslav Trushkin
2624d1ea14 [ticket/11562] Use jQuery in subPanels
PHPBB-11562
2013-08-30 14:52:45 +03:00
Vjacheslav Trushkin
d091c4f829 [ticket/11562] Remove submit_default_button from forum_fn
Remove submit_default_button() and related functions
from forum_fn.js

PHPBB3-11562
2013-08-30 14:52:45 +03:00
Vjacheslav Trushkin
2c4fc9c8bd [ticket/11562] Convert marklist() to jQuery
PHPBB3-11562
2013-08-30 14:52:45 +03:00
Nathan Guse
dcf82d9a5a Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into develop
* remotes/brunoais/ticket/11803:
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
2013-08-28 12:49:44 -05:00
brunoais
cc93f189a0 [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
When it was made the min number of options allowed to a user was 1 but 0 can also be used as it means unlimited.

PHPBB3-11803
2013-08-26 19:56:27 +01:00
Joseph Warner
8f75edb8a1 [feature/oauth] Add newline at end of file
PHPBB3-11673
2013-08-22 19:10:57 -04:00
Marcus Vinny
83092e0269 [ticket/11804] Remove </li> from overall_header which was not open
PHPBB3-11804
2013-08-20 04:25:06 -03:00
Andreas Fischer
8fd49f9df8 Merge remote-tracking branch 'cyberalien/ticket/11796' into develop
* cyberalien/ticket/11796:
  [ticket/11796] Replace pagination with pagination.html
2013-08-18 02:50:32 +02:00
Andreas Fischer
5bb02647e6 Merge remote-tracking branch 'cyberalien/ticket/11779' into develop
* cyberalien/ticket/11779:
  [ticket/11779] Fix unapproved messages class name
2013-08-18 02:37:07 +02:00
Andreas Fischer
a808c4f9c9 Merge remote-tracking branch 'cyberalien/ticket/11800' into develop
* cyberalien/ticket/11800:
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
2013-08-18 02:02:44 +02:00
Andreas Fischer
55d911a2fd Merge remote-tracking branch 'cyberalien/ticket/11754' into develop
* cyberalien/ticket/11754:
  [ticket/11754] Remove styleswitcher leftovers
2013-08-18 01:55:56 +02:00
Vjacheslav Trushkin
487822d12f [ticket/11800] Fix JavaScript in simple_footer.html
Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts

PHPBB3-11800
2013-08-17 19:18:25 +03:00
Vjacheslav Trushkin
0ed7bd8a5b [ticket/11800] Remove forum_fn from memberlist_search.html
PHPBB3-11800
2013-08-17 19:17:17 +03:00
Vjacheslav Trushkin
87dd739a84 [ticket/11796] Replace pagination with pagination.html
PHPBB3-11796
2013-08-16 18:52:07 +03:00
Joseph Warner
0ea3103a44 [feature/oauth] Don't allow external login methods on admin auth
PHPBB3-11673
2013-08-14 23:01:03 -04:00
Joseph Warner
d13a1788f0 [feature/oauth] Update language constants for ucp_auth_link
PHPBB3-11673
2013-08-14 17:08:08 -04:00
Joseph Warner
67b1ec5bb8 [feature/oauth] Start implementing link/unlink actions
PHPBB3-11673
2013-08-14 15:19:40 -04:00
Joseph Warner
836d3ba22e [feature/oauth] Handle hidden fields
PHPBB3-11673
2013-08-12 15:29:22 -04:00
Joseph Warner
4003e077c1 [feature/oauth] Get the OAuth template in place for ucp_auth_link
PHPBB3-11673
2013-08-12 14:43:35 -04:00
Joseph Warner
a479f919ff [feature/oauth] Error handling on page
PHPBB3-11673
2013-08-12 12:53:22 -04:00
Vjacheslav Trushkin
9a5363462b [ticket/11782] Change p.rules to p.post-notice in templates
PHPBB3-11782
2013-08-11 19:57:34 +03:00
Vjacheslav Trushkin
0aea5e48d8 [ticket/11779] Fix unapproved messages class name
PHPBB3-11779
2013-08-11 10:37:29 +03:00
Joseph Warner
69cb2e4c60 [feature/oauth] More template work
PHPBB3-11673
2013-08-09 05:26:44 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template
PHPBB3-11673
2013-08-09 05:12:57 -04:00
Joseph Warner
786da260c0 [feature/oauth] Fix ucp_auth_link headers/footers
PHPBB3-11673
2013-08-09 04:37:08 -04:00
Vjacheslav Trushkin
3713ff71ea [ticket/11770] Fix class name for pm list
PHPBB3-11770
2013-08-06 21:47:35 +03:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page
PHPBB3-11673
2013-08-05 15:38:03 -04:00
Joseph Warner
1ae2283b34 [feature/oauth] Finish updating interface and related code
PHPBB3-11673
2013-08-02 14:21:25 -04: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
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
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