1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00

21270 Commits

Author SHA1 Message Date
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
Nicofuma
f90e6649f7 [ticket/12459] Enable related tests
PHPBB3-12459
2014-05-04 15:44:15 +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
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
Joas Schilling
59da8eb46a Merge pull request #2401 from n-aleha/ticket/12455
[ticket/12455] Remove unused language strings from common.php and app.php

* n-aleha/ticket/12455:
  [ticket/12455] Remove unused language strings from common.php and app.php
2014-05-04 15:38:02 +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
Tristan Darricau
78e1d119f5 [ticket/11497] Change the date in the package declaration
PHPBB3-11497
2014-05-03 19:16:40 +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
PayBas
4e79764aca [ticket/12376] Add template events viewtopic_body_polls
PHPBB3-12376
2014-05-03 17:42:13 +02:00
PayBas
59ba62f5d9 [ticket/12396] Added missing viewtopic_topic_title_append
rebased for travis... again

PHPBB3-12396
2014-05-03 17:37:49 +02:00
PayBas
a1b159aa82 [ticket/12396] Add Template events viewforum_forum_name
PHPBB3-12396
2014-05-03 17:29:54 +02:00
PayBas
530d09204c [ticket/12410] Add Template events search_results_post_ b/a
PHPBB3-12410
2014-05-03 17:25:36 +02:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Oliver Schramm
b7fde76852 [ticket/12451] Remove duplicated lang var
PHPBB3-12451
2014-05-03 16:16:17 +02:00
Oliver Schramm
1f76a95bf6 [ticket/12451] Use new line to concatenate strings
PHPBB3-12451
2014-05-03 16:16:16 +02:00
Oliver Schramm
d7c0d604b5 [ticket/12451] Split TOO_MANY_CHARS vars for plurals
PHPBB3-12451
2014-05-03 16:16:15 +02:00
Oliver Schramm
daa69ecfa9 [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
PHPBB3-12451
2014-05-03 16:16:14 +02:00
Oliver Schramm
3f0334c107 [ticket/12185] Fix and increase width
PHPBB3-12185
2014-05-03 16:07:07 +02:00
Andreas Fischer
4e529fda03 Merge pull request #2375 from nickvergessen/ticket/12470
Ticket/12470 Move commands from .travis.yml to separate files to allow reusing

* nickvergessen/ticket/12470:
  [ticket/12470] Correctly set up the php extensions
  [ticket/12470] Fix setup of phpbb
  [ticket/12470] Move setup of phpBB to new .sh
  [ticket/12470] Move setup of database to new .sh
  [ticket/12470] Move phing sniff into new .sh
2014-05-03 15:53:57 +02:00
Tristan Darricau
5cb68b6be9 [ticket/11497] Fix pagination tests
PHPBB3-11497
2014-05-03 14:07:49 +02:00
Tristan Darricau
8d9133a30e [ticket/11497] Use a mock object to define the root folder for the finder
PHPBB3-11497
2014-05-03 14:00:47 +02:00
Tristan Darricau
0d893d65eb [ticket/11497] Generate the list of the routes in controller_helper
PHPBB3-11497
2014-05-03 13:41:32 +02:00
Nicofuma
e920f146ca [ticket/11497] Fix the path for the finder in controller_provider
PHPBB3-11497
2014-05-03 12:24:07 +02:00
Nicofuma
01e19a00f8 [ticket/11497] Fix tests
PHPBB3-11497
2014-05-03 11:44:58 +02:00