1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

448 Commits

Author SHA1 Message Date
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -06:00
90b458d87e Merge PR #722 branch 'Senky/ticket/9918' into develop
* Senky/ticket/9918:
  [ticket/9918] default values in request_var changed to one string
  [ticket/9918] $redirect variable used from now
2012-11-06 21:10:20 -05:00
196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
2012-11-06 16:23:33 -05:00
94d682f774 [ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables.

PHPBB3-11103
2012-10-20 20:58:53 -05:00
ae670cc87d [ticket/11103] Remove unnecessary comments
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
2012-10-18 18:32:13 -05:00
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
PHPBB3-11023
2012-10-17 23:34:37 +02:00
3d79ce2803 [ticket/11103] Ability to query data before running create_insert_array()
Mark post/topic in queue notifications read when visiting mcp
Change post/topic in queue notification url to use MCP.

Fix the bug:
Approving a topic marks the topic as read, but before the notification
is created for the user approving the topic (if they would get a
notification that the topic has been made). This causes it to be
stuck "unread".

PHPBB3-11103
2012-10-12 16:54:42 -05:00
1b56a1d6be [ticket/11103] Finishing up report post/pm and adding report closed
PHPBB3-11103
2012-10-11 22:36:48 -05:00
6d53bd4675 [ticket/11103] Finishing up PM Report notifications
PHPBB3-11103
2012-10-09 22:28:41 -05:00
9d955507b6 Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103 2012-10-09 22:03:18 -05:00
b33e527394 [ticket/11103] Working on report notifications (post/pm)
PHPBB3-11103
2012-10-09 22:02:49 -05:00
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
b9bc65eed8 [ticket/11103] Make $phpbb_notifications a global and use it everywhere
Do not use phpbb_container everywhere (makes testing difficult)

PHPBB3-11103
2012-10-04 14:47:13 -05:00
7454d5c2d5 [ticket/11103] Topic/Post in queue notification
Also, bug fixes and cleanup

PHPBB3-11103
2012-09-15 14:33:15 -05:00
05b573ebf7 [ticket/11103] Topic and post dis/approval notifications
Remove the formatted title function, plaintext is not needed since
email templates are used

Fix a number of bugs.

PHPBB3-11103
2012-09-15 13:51:02 -05:00
9c54465a13 [ticket/11103] Starting approve_post type notification
PHPBB3-11103
2012-09-15 12:00:03 -05:00
8e977544fb [ticket/11103] Normalization of $phpbb_notifications variable name
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.

PHPBB3-11103
2012-09-14 17:01:08 -05:00
ed1ec8e720 [ticket/11103] Add/Update/Mark Read functions accept an array for the type
This saves a lot of code in some areas (where the same data is sent, just
for different types)

Notifications for bookmarks

PHPBB3-11103
2012-09-14 16:54:20 -05:00
5502f3c4aa [ticket/11103] Restyle the notification list
Very rough (lots of inline CSS, very ugly)

PHPBB3-11103
2012-09-09 17:20:39 -05:00
74e2a8f893 [ticket/11103] Post notifications
PHPBB3-11103
2012-09-09 13:29:47 -05:00
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
7c406e1e81 [ticket/11052] update search backend constructor everywhere
PHPBB3-11052
2012-08-15 22:05:26 +05:30
a9d4ed0cfc [feature/php-events] Fix naming and doc of core.mcp_view_forum_modify_topicrow
PHPBB3-9550
2012-08-04 17:35:51 +02:00
758fb67a7d [feature/php-events] Add missing global $phpbb_dispatcher
PHPBB3-9550
2012-08-01 10:18:51 +02:00
3d4946f5f0 [feature/events] Fixing events issues
PHPBB3-9550
2012-08-01 10:18:46 +02:00
643081d56c [feature/events] Adding core.mcp_forum_topicrow ledge
PHPBB3-9550
2012-08-01 10:18:43 +02:00
577dbf8951 [ticket/10990] Changes for develop
PHPBB3-10990
2012-07-22 14:48:39 -05:00
584d49459d [feature/pagination-as-list] New parameter for name of start var
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.

PHPBB3-10968
2012-07-18 14:32:42 +01:00
27d8aef528 [feature/pagination-as-list] Updates for nils comments
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.

PHPBB3-10968
2012-07-18 14:32:18 +01:00
cf4d6e926d [feature/pagination-as-list] Rename and deprecate functions
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.

PHPBB3-10968
2012-07-18 14:31:50 +01:00
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
fce0c5d436 [ticket/10871] Delete the unwanted implode
Deleted the implode that had no reason to be there

PHPBB3-10871
2012-05-04 20:08:42 +01:00
593ef78859 [ticket/10845] Remove censor from text
In order to remove the censor, I added a new parameter to
generate_text_for_display(), that new parameter is used to tell if the text
should be censored or not. Defaults to true.

PHPBB3-10845
2012-05-02 17:13:39 +01:00
06f4ef8852 [ticket/10845] Now it shows the preview post parsed
With this addition, the preview post in the report details now shows with the
BBCode parsed.

Note: Tested with all BBCodes I have including one personalised to write the <s>
BBCode.

PHPBB3-10845
2012-05-01 12:44:34 +01:00
6ae68a3eb5 Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
2012-04-20 01:08:21 +02:00
249d8ede12 [ticket/10797] user rank is displayed in mcp_warn.php
When warning a user in MCP, the user's rank title and image are displayed.
language key user rank also added.

PHPBB3-10797
2012-04-16 01:24:10 +05:30
807eccc976 [ticket/9918] default values in request_var changed to one string
As per marc1706's note, all request_var functions now have only one string in default value

PHPBB3-9918
2012-04-15 19:13:08 +02:00
e6a1d37634 [ticket/9918] $redirect variable used from now
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.

PHPBB3-9918
2012-04-09 16:23:42 +02:00
9236dd4c47 [feature/class-prefix] Rename auth => phpbb_auth
PHPBB3-10609
2012-03-31 18:14:11 +02:00
d8e21952fa [ticket/10273] Fixed accepting / denying posts AJAX.
PHPBB3-10273
2012-03-31 02:10:16 +02:00
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
18373035c3 [feature/save-post-on-report] Changed the name of the column
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
2012-03-19 08:27:32 -04:00
95b5109c62 [feature/save-post-on-report] The complete changes for this feature
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
2012-03-19 08:27:31 -04:00
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
92303d2dac [ticket/10637] Leftovers from implementation of extensions in mcp_post
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:17:33 +02:00
1d72a47ea6 [ticket/10637] Leftovers from implementation of extensions in mcp_main
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:13:13 +02:00
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00