Commit graph

8873 commits

Author SHA1 Message Date
Tristan Darricau
300d5c32db [ticket/12509] Add an option to set the path of custom file for extensions
https://tracker.phpbb.com/browse/PHPBB3-12509

PHPBB3-12509
2014-05-13 23:22:54 +02:00
Tristan Darricau
237619792d [ticket/11942] Always display delete reason
PHPBB3-11942
2014-05-11 19:28:26 +02:00
Joas Schilling
192bb74e3c [ticket/12527] Use a proper language string on confirm screen
PHPBB3-12527
2014-05-11 13:30:13 +02:00
Joas Schilling
ada9fc81a3 [ticket/12527] Check whether the language exists
PHPBB3-12527
2014-05-11 13:29:56 +02:00
Joas Schilling
63e195d7f0 [ticket/12527] Restore missing files and variables check
PHPBB3-12527
2014-05-11 13:29:49 +02:00
Joas Schilling
61bca8ed8a [ticket/12527] Remove language file editor form ACP
PHPBB3-12527
2014-05-11 13:29:17 +02:00
Cesar G
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
PHPBB3-12526
2014-05-11 02:36:48 -07:00
Joas Schilling
f2fc18b4b7 Merge pull request #2412 from prototech/ticket/12501
[ticket/12501] Fix improper display of inline attachments in post report page

* prototech/ticket/12501:
  [ticket/12501] Only select attachments uploaded before the post was reported.
  [ticket/12501] Parse the reported post message before its attachments.
2014-05-11 11:00:27 +02:00
Joas Schilling
6cd7abe255 Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.

* prototech/ticket/9388:
  [ticket/9388] Use "togglable" instead of "toggable"
  [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
  [ticket/9388] Reopen <fieldset> after auth templates.
  [ticket/9388] Fix unit tests.
  [ticket/9388] Use the new toggle function for the avatar type <select>.
  [ticket/9388] Display only the settings for the selected search backend.
  [ticket/9388] Display only the settings for the auth method that's selected.
  [ticket/9388] Add support for making <select> options able to toggle settings.
2014-05-11 10:48:10 +02:00
Tristan Darricau
49bc10de4d [ticket/8610] Merging topics does not handle bookmarks correctly
https://tracker.phpbb.com/browse/PHPBB3-8610

PHPBB3-8610
2014-05-10 22:17:01 +02:00
Tristan Darricau
cee9b1d856 [ticket/11226] Use $user->lang()
PHPBB3-11226
2014-05-10 19:47:32 +02:00
Tristan Darricau
c6d7875b9b [ticket/10899] Refactoring in \phpbb\log\log_interface
PHPBB3-10899
2014-05-10 18:24:07 +02:00
Tristan Darricau
c5a4ad3d31 [ticket/10899] Using Delete All in log viewer with keyword search
https://tracker.phpbb.com/browse/PHPBB3-10899

PHPBB3-10899
2014-05-10 17:03:09 +02:00
marcosbc
984ae598be [ticket/12270] No quote notif and double poster notification fix
Since a call was added to self::approve_topic(), the poster would
get double-notified about it (even if it was later marked as read).
Also, when creating a new topic with a quote, it would not be
notified, this has also been fixed.

PHPBB3-12270
2014-05-10 16:36:11 +02:00
Tristan Darricau
eee2091201 [ticket/11226] filespec::move_file() should error correctly
PHPBB3-11226
2014-05-10 15:09:25 +02:00
Tristan Darricau
9519c4e8c4 [ticket/12109] Fix coding style
PHPBB3-12109
2014-05-10 02:35:51 +02:00
Tristan Darricau
9b9c048702 [ticket/12109] Bug when setting permissions with "Select all users"
https://tracker.phpbb.com/browse/PHPBB3-12109

PHPBB3-12109
2014-05-10 01:53:51 +02:00
Cesar G
e233f0af36 [ticket/9388] Use "togglable" instead of "toggable"
PHPBB3-9388
2014-05-09 13:49:41 -07:00
n-aleha
f2471878a6 [ticket/12476] Increase assets also from acp_styles and phpbbcli
Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli

PHPBB3-12476
2014-05-09 01:50:51 +03:00
n-aleha
cfc0c9bcf9 [ticket/12476] Increase asset version on cache purge
Increace the asset version when purging the cache from "ACP > General"

PHPBB3-12476
2014-05-09 01:49:41 +03:00
Tristan Darricau
3029f93000 [ticket/12074] Don't log errors
PHPBB3-12074
2014-05-09 00:26:07 +02:00
Tristan Darricau
a640a455f3 [ticket/12074] Managing extensions doesn't produce any log entry
PHPBB3-12074
2014-05-09 00:07:56 +02:00
Cesar G
e378037516 [ticket/9388] Display only the settings for the selected search backend.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
d95164e641 [ticket/9388] Display only the settings for the auth method that's selected.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Cesar G
2e025f1655 [ticket/9388] Add support for making <select> options able to toggle settings.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Joas Schilling
d4fc060bcd Merge pull request #2363 from Elsensee/ticket/12451
[ticket/12451] Split lang vars in posting.php for plurals

* Elsensee/ticket/12451:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
2014-05-08 15:10:34 +02:00
Joas Schilling
aade62b0a3 Merge pull request #2419 from prototech/ticket/12510
[ticket/12510] Convert & to &amp; in build_url() when no params are stripped.

* prototech/ticket/12510:
  [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
2014-05-08 13:02:01 +02:00
Joas Schilling
48a170549c Merge pull request #2421 from n-aleha/ticket/12493
[ticket/12493] Fix sql query for selection of users that have disabled PM

* n-aleha/ticket/12493:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:22:49 +02:00
n-aleha
0166493a89 [ticket/12493] Fix sql query for selection of users that have disabled PM
This fixes a bug where a user A could not send a PM to user B when both users
allowed other users to send them a PM. More precisely, it fixes the selection
of users that either are inactive or have disabled private messages.

PHPBB3-12493
2014-05-07 23:00:42 +03:00
Joas Schilling
7294bc9402 Merge pull request #2413 from prototech/ticket/12357
[ticket/12357] Support routes in generate_smilies() function.

* prototech/ticket/12357:
  [ticket/12357] Support routes in generate_smilies() function.
2014-05-07 21:08:10 +02:00
Cesar G
eddb420375 [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
PHPBB3-12510
2014-05-06 15:58:10 -07:00
Joas Schilling
1b3d54f5dd Merge pull request #2397 from Nicofuma/ticket/11497
[ticket/11497] Remove 'ext.finder' from services' list

* Nicofuma/ticket/11497:
  [ticket/11497] Rename set_ext_finder in find_routing_files
  [ticket/11497] Change the date in the package declaration
  [ticket/11497] Fix pagination tests
  [ticket/11497] Use a mock object to define the root folder for the finder
  [ticket/11497] Generate the list of the routes in controller_helper
  [ticket/11497] Fix the path for the finder in controller_provider
  [ticket/11497] Fix tests
  [ticket/11497] Update pagination test
  [ticket/11497] Remove 'ext.finder' from services' list
2014-05-06 13:51:29 +02:00
Cesar G
71379c3a0f Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
2014-05-05 16:51:29 -07:00
Cesar G
74cb99f067 [ticket/12357] Support routes in generate_smilies() function.
PHPBB3-12357
2014-05-05 13:13:48 -07:00
Cesar G
7b0e535f03 [ticket/12501] Only select attachments uploaded before the post was reported.
The post text displayed to the user is the same as when it was reported, even if
the post was edited afterwards, thus it follows that the attachments would be
the same. This also addresses an issue where the index in the attachment bbcode
no longer matches that of its corresponding attachment when new attachments
are uploaded after the post is reported.

PHPBB3-12501
2014-05-05 11:05:15 -07:00
Cesar G
9705e1883d [ticket/12501] Parse the reported post message before its attachments.
This ensures that the empty lines from attachment.html aren't converted into
<br />.

PHPBB3-12501
2014-05-05 11:05:15 -07:00
Tristan Darricau
346c6f3998 [ticket/11497] Rename set_ext_finder in find_routing_files
PHPBB3-11497
2014-05-05 18:20:14 +02:00
Cesar G
a4aeb91ec0 [ticket/12491] Fix clashing USERNAME_FULL template variable.
The user notes and user warn pages have a variable with the same name.

PHPBB3-12491
2014-05-04 15:31:19 -07:00
Joas Schilling
a469974c85 [prep-release-3.1.0-b3] Update phpBB Version for b4 development 2014-05-04 20:23:33 +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
Nicofuma
cc1a304da6 [ticket/11942] Edits messages
PHPBB3-11942
2014-05-04 15:43:13 +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
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