Commit graph

20231 commits

Author SHA1 Message Date
Gaëtan Muller
eccdc74478 [ticket/12415] Use private message instead of "pm" accronym
https://tracker.phpbb.com/browse/PHPBB3-12415

PHPBB3-12415
2014-05-04 17:35:06 +02:00
Joas Schilling
eca1e582d0 [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 2014-05-04 17:34:02 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
5b6bce89c9 Merge pull request #2405 from Nicofuma/ticket/12494
[ticket/12494] Undefined index: user_type on viewtopic.php

* Nicofuma/ticket/12494:
  [ticket/12494] Undefined index: user_type on viewtopic.php
2014-05-04 16:43:47 +02:00
Joas Schilling
541de3281a Merge pull request #2394 from VSEphpbb/ticket/12484
[ticket/12484] Add template event ucp_agreement_terms_before/after

* VSEphpbb/ticket/12484:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
2014-05-04 16:41:19 +02:00
Joas Schilling
40e28ac56b Merge pull request #2315 from PayBas/ticket/12411
[ticket/12411] Expand vars of event: core.search_modify_tpl_ary

* PayBas/ticket/12411:
  [ticket/12411] Improved change documentation
  [ticket/12411] Missed on bool var
  [ticket/12411] Corrected event vars description
  [ticket/12411] Expand vars of event: core.search_modify_tpl_ary
2014-05-04 16:35:03 +02:00
Joas Schilling
1e66500d2c Merge pull request #2294 from PayBas/ticket/12392
[ticket/12392] Include $profile_fields in core.memberlist_view_profile

* PayBas/ticket/12392:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
2014-05-04 16:31:46 +02:00
Joas Schilling
b5ce72d8d9 Merge pull request #2257 from PayBas/ticket/12366
[ticket/12366] Add Event core.search_get_posts_data

* PayBas/ticket/12366:
  [ticket/12366] Fixed missing comma
  [ticket/12366] Conform to new event coding guidelines
  [ticket/12366] Expanded event vars
  [ticket/12366] Include ORDER BY into the query builder
  [ticket/12366] Changed to sql_build_query
  [ticket/12366] Add Event core.search_get_posts_data
2014-05-04 16:28:43 +02:00
Joas Schilling
b1d30dad5c Merge pull request #2203 from PayBas/ticket/12323
[ticket/12323] Template Event search_results_postprofile_before/after

* PayBas/ticket/12323:
  [ticket/12323] Template Event search_results_postprofile_before

Conflicts:
	phpBB/docs/events.md
2014-05-04 16:23:14 +02:00
Tristan Darricau
20022f0dc8 [ticket/12494] Undefined index: user_type on viewtopic.php
PHPBB3-12494
2014-05-04 16:15:50 +02:00
Joas Schilling
3674f95e52 Merge pull request #2346 from PayBas/ticket/12438
[ticket/12438] Add Template event memberlist_view_content_prepend

* PayBas/ticket/12438:
  [ticket/12438] Add Template event memberlist_view_content_prepend
2014-05-04 16:14:20 +02:00
Joas Schilling
eb52028334 Merge pull request #2314 from PayBas/ticket/12410
[ticket/12410] Add Template events search_results_post_ b/a

* PayBas/ticket/12410:
  [ticket/12410] Add Template events search_results_post_ b/a
2014-05-04 16:11:56 +02:00
Joas Schilling
f615d46261 Merge pull request #2297 from PayBas/ticket/12396
[ticket/12396] Add Template events viewforum_forum_name_append/prepend

* PayBas/ticket/12396:
  [ticket/12396] Added missing viewtopic_topic_title_append
  [ticket/12396] Add Template events viewforum_forum_name
2014-05-04 16:09:18 +02:00
Joas Schilling
28f2c1eb08 Merge pull request #2273 from PayBas/ticket/12376
[ticket/12376] Add template events viewtopic_body_polls

* PayBas/ticket/12376:
  [ticket/12376] Changed to viewtopic_body_poll_option_before and after
  [ticket/12376] Added viewtopic_body_poll_question_append
  [ticket/12376] Add template events viewtopic_body_polls
2014-05-04 15:58:33 +02:00
Joas Schilling
587a9445cd Merge pull request #2270 from PayBas/ticket/12374
[ticket/12374] Add Template events index_body_block_(name)_append

* PayBas/ticket/12374:
  [ticket/12374] Fixed alphabetical sorting
  [ticket/12374] Added prepend-versions of events
  [ticket/12374] Updated code layout
  [ticket/12374] Add Template events index_body_block_(name)_append
2014-05-04 15:55:44 +02:00
Joas Schilling
96394bb044 Merge pull request #2233 from PayBas/ticket/12346
[ticket/12346] Add Template Event overall_header_navlink_append/prepend

* PayBas/ticket/12346:
  [ticket/12346] Change tabs to spaces
  [ticket/12346] Add Template Event overall_header_navlink_app/pre
2014-05-04 15:52:26 +02:00
Joas Schilling
329c2d9292 Merge pull request #2219 from PayBas/ticket/12335
[ticket/12335] Add Events to phpbb\profilefields\manager

* PayBas/ticket/12335:
  [ticket/12335] Remove $ from desc
  [ticket/12335] Added generate_profile_fields _ before
  [ticket/12335] Documentation fix and added use_contact_fields
  [ticket/12335] Fix phpBB version number
  [ticket/12335] Add Events to phpbb\profilefields\manager
2014-05-04 15:48:05 +02:00
Tristan Darricau
3bf61d4df0 [ticket/12459] Fix: Differentiating unapproved and deleted posts
Unapproved and deleted posts should not be displayed with the same message
(POST_UNAPPROVED)

PHPBB3-12459
2014-05-04 15:44:13 +02:00
Tristan Darricau
9dc4e5a61f [ticket/12459] Fix: Soft deleted topics should appear in feeds
As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.

PHPBB3-12459
2014-05-04 15:44:12 +02:00
Tristan Darricau
68293450f9 [ticket/12459] Fix: the posts were always marked as unapproved
the database return a string, so the strict comparison always returned false

PHPBB3-12459
2014-05-04 15:44:10 +02:00
Joas Schilling
a1561fffba Merge pull request #2402 from MGaetan89/ticket/12378
[ticket/12378] Prosilver common.css duplicate entry

* MGaetan89/ticket/12378:
  [ticket/12378] Prosilver common.css duplicate entry
2014-05-04 15:44:00 +02:00
Nicofuma
cc1a304da6 [ticket/11942] Edits messages
PHPBB3-11942
2014-05-04 15:43:13 +02:00
Nicofuma
fee4e61933 [ticket/11942] Change the formulation
PHPBB3-11942
2014-05-04 15:43:11 +02:00
Nicofuma
1c336c3559 [ticket/11942] Adding the reason to hard deleted topic/post
PHPBB3-11942
2014-05-04 15:43:08 +02:00
Nicofuma
dccc9ceeb5 [ticket/11942] Delete post/topic reason should be added to logs
https://tracker.phpbb.com/browse/PHPBB3-11942

PHPBB3-11942
2014-05-04 15:43:06 +02:00
Gaëtan Muller
05491b0050 [ticket/12378] Prosilver common.css duplicate entry
https://tracker.phpbb.com/browse/PHPBB3-12378

PHPBB3-12378
2014-05-04 15:40:35 +02:00
n-aleha
e6b312221c [ticket/12455] Remove unused language strings from common.php and app.php
Removed the following unused language strings from common.php:
EXTENSION_CONTROLLER_MISSING
EXTENSION_CLASS_WRONG_TYPE

Removed the following unused language strings from app.php:
CONTROLLER_NOT_FOUND
CONTROLLER_SERVICE_NOT_GIVEN
CONTROLLER_RETURN_TYPE_INVALID

PHPBB3-12455
2014-05-04 13:38:06 +03:00
PayBas
2c5a2a1390 [ticket/12488] Add user warning indication to viewtopic posts
PHPBB3-12488
2014-05-03 23:07:30 +02:00
PayBas
78834e49e4 [ticket/12346] Change tabs to spaces
PHPBB3-12346
2014-05-03 21:45:48 +02:00
marcosbc
deba1329c8 [ticket/12270] Fixed rebase conflicts
PHPBB3-12270
2014-05-03 21:05:29 +02:00
marcosbc
46c658bdbf [ticket/12270] Correct confirm approval message for topics
When clicking on approving a topic's first post in the MCP to
approve the topic itself, the confirm box dialog asks whether
to approve the post or not, instead of asking to approve the
topic.
To achieve this fix, we just need to count the topics to be
approved and check if it's greater than zero.

PHPBB3-12270
2014-05-03 20:31:32 +02:00
marcosbc
1fec5e6967 [ticket/12270] Correcting to follow phpBB coding standards
I forgot to put the brackets (so it follows the phpBB coding
standards) and changed "count($topic_id_list) > 0"
to "!empty($topic_id_list)", making the syntax more
comprehensible.

PHPBB3-12270
2014-05-03 20:31:32 +02:00
marcosbc
f9edc85f82 [ticket/12270] Better structured code and no debug error message
A variable (that's not essential) has been removed, two if's
has been merged to an if-else control structure. A variable
named topic_ids_list has been renamed to topic_id_list to follow
the naming standard in that file's code.
Also, the debug error has been fixed by changing the topic data
key 'username' to 'post_username' in the array_merge function
in approve_topics().

PHPBB3-12270
2014-05-03 20:31:22 +02:00
marcosbc
158705cf41 [ticket/12270] Correct notifications for posts/topics now working
This patch should finally work correctly: Add the correct
notification for post/topic approval without touching templates.

This has been done by calling the function approve_topics()
inside the approve_posts() function. It's the simplest way for
this to work correctly. There may be a call to the DB but other
ways (if any), without touching templates,  would have been too
messy for a function like this.

PHPBB3-12270
2014-05-03 20:30:51 +02:00
marcosbc
b8477ad3a2 [ticket/12270] Reverted templates
Some lines in the templates  were not reverted correctly,
so it's done now.

PHPBB3-12270
2014-05-03 20:29:28 +02:00
marcosbc
55757ddc65 [ticket/12270] Correct post&topic approval msg, no template changes
Following the previous commits, this patch removes the changes
done to templates to depend only on code, as suggested by
@nickvergessen.
All previous modifications have been removed, with another one
which checks, in the approve_posts() function, if it is sending a
notification for post approval and it is the first one in the
topic, send notification indicating that the topic has been
approved (and not the post). If not the first post in the topic,
do just as before (send a notification about a newly approved
post).

PHPBB3-12270
2014-05-03 20:29:28 +02:00
marcosbc
7446361ad4 [ticket/12270] Corrent post and topic approval notification message
When you submit a post with needed approval (say user A), and then
it gets approved by another user (user B), a subscribed user (user C)
to that forum would receive a notification indicating:
-A has replied to topic 'New Topic' in the forum 'xyz'.
The expected result would be:
-A has posted a new topic 'New topic' in the forum 'xyz'.
This has fixed by adding a TOPIC_ID template variable to
mcp_post.html and, in there, depending if the first post is the topic's
first post or not, add a input's with name topic_id_list[] or
post_id_list[] and then the respective value (TOPIC_ID or POST_ID).

PHPBB3-12270
2014-05-03 20:29:28 +02:00
PayBas
1a39f5f6b9 [ticket/12346] Add Template Event overall_header_navlink_app/pre
Rebased

PHPBB3-12346
2014-05-03 18:21:15 +02:00
PayBas
1c84cea394 [ticket/12323] Template Event search_results_postprofile_before
PHPBB3-12323
2014-05-03 17:56:13 +02:00
PayBas
5b5b61c6c9 [ticket/12335] Remove $ from desc
Come on travis, play nice this time

PHPBB3-12335
2014-05-03 17:54:38 +02:00
PayBas
42dfd1aa3c [ticket/12335] Added generate_profile_fields _ before
PHPBB3-12335
2014-05-03 17:54:38 +02:00
PayBas
2343d9f8d4 [ticket/12335] Documentation fix and added use_contact_fields
PHPBB3-12335
2014-05-03 17:54:37 +02:00
PayBas
1fd1803a3b [ticket/12335] Fix phpBB version number
PHPBB3-12335
2014-05-03 17:54:37 +02:00
PayBas
b3b0e5ccf2 [ticket/12335] Add Events to phpbb\profilefields\manager
PHPBB3-12335
2014-05-03 17:54:36 +02:00
PayBas
aa5adbf1f7 [ticket/12374] Fixed alphabetical sorting
PHPBB3-12374
2014-05-03 17:50:31 +02:00
PayBas
8186e282f1 [ticket/12374] Added prepend-versions of events
PHPBB3-12374
2014-05-03 17:50:31 +02:00
PayBas
bb7941a52b [ticket/12374] Updated code layout
PHPBB3-12374
2014-05-03 17:50:30 +02:00
PayBas
a14930466b [ticket/12374] Add Template events index_body_block_(name)_append
Hopefully to the correct branch this time

PHPBB3-12374
2014-05-03 17:50:30 +02:00
PayBas
36aa8ecad8 [ticket/12376] Changed to viewtopic_body_poll_option_before and after
PHPBB3-12376
2014-05-03 17:48:31 +02:00
PayBas
21c11c7b24 [ticket/12376] Added viewtopic_body_poll_question_append
PHPBB3-12376
2014-05-03 17:43:06 +02:00