1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 11:24:35 +02:00
Commit Graph

21571 Commits

Author SHA1 Message Date
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
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
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
d9de4fc72c [ticket/12504] Use local variables where possible
PHPBB3-12504
2014-05-05 18:31:01 +02:00
f27e4a44b8 [ticket/12504] Use defined variables
PHPBB3-12504
2014-05-05 18:27:00 +02:00
5d8d42d88a [ticket/12504] Remove unused request object from avatar manager test
PHPBB3-12504
2014-05-05 18:25:44 +02:00
0061067715 [ticket/12025] Apply DeMorgan
PHPBB3-12025
2014-05-05 18:23:55 +02:00
fe99e60d82 [ticket/12486] Make assertion on the return to remove "Risky" from phpunit
PHPBB3-12486
2014-05-05 18:21:28 +02:00
346c6f3998 [ticket/11497] Rename set_ext_finder in find_routing_files
PHPBB3-11497
2014-05-05 18:20:14 +02:00
e9dabb0903 [ticket/12486] Rename data provider to fix "Risky" from phpunit
PHPBB3-12486
2014-05-05 18:19:12 +02:00
baef26f7ed [ticket/12503] All tests should extend \phpbb_test_case
PHPBB3-12503
2014-05-05 18:16:50 +02:00
21f06ac9e6 [ticket/12325] Change private function to protected
PHPBB3-12325
2014-05-05 18:16:42 +02:00
f6a8485dae [ticket/12325] Add visibilities
PHPBB3-12325
2014-05-05 16:38:21 +02:00
81ac5e7a00 [ticket/12325] Add files located in deleted dirs
PHPBB3-12325
2014-05-05 16:38:21 +02:00
c5f5520013 [ticket/12325] Generate the list of the deleted files and folders
https://tracker.phpbb.com/browse/PHPBB3-12325

PHPBB3-12325
2014-05-05 16:38:21 +02:00
324daf72fe Merge pull request #2409 from prototech/ticket/12491
[ticket/12491] Fix clashing USERNAME_FULL template variable.

* prototech/ticket/12491:
  [ticket/12491] Fix clashing USERNAME_FULL template variable.
2014-05-05 12:36:50 +02:00
4d64e09e7a [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
Don't know what I was thinking with this

PHPBB3-12488
2014-05-05 09:38:00 +02:00
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
fad41a6874 [ticket/12500] Set a title attribute in user.img()
PHPBB3-12500
2014-05-04 14:30:51 -07:00
0cc5cf57b2 Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeus
* MGaetan89/ticket/12415:
  [ticket/12415] Use private message instead of "pm" accronym
2014-05-04 13:55:14 -07:00
0f4bff6101 Merge pull request #2407 from Nicofuma/ticket/12499
[ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate

* Nicofuma/ticket/12499:
  [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
2014-05-04 22:38:46 +02:00
66b7eaa1ca [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrate
https://tracker.phpbb.com/browse/PHPBB3-12499

PHPBB3-12499
2014-05-04 22:20:22 +02:00
172fa9e7aa [ticket/12488] Typo fix
PHPBB3-12488
2014-05-04 22:19:55 +02:00
cefeb7f752 [ticket/12488] Removed <em> and removed anonymous check
PHPBB3-12488
2014-05-04 22:07:03 +02:00
d6c1ca7d94 Merge pull request #4 from prototech/ticket/12431
[ticket/12431] Add topic poll icon.
2014-05-04 21:42:15 +02:00
2e6413a522 [ticket/12431] Add topic poll icon.
PHPBB3-12431
2014-05-04 12:34:51 -07:00
6cca7d0443 Merge branch 'prep-release-3.1.0-b3' into develop-ascraeus
* prep-release-3.1.0-b3:
  [prep-release-3.1.0-b3] Update phpBB Version for b4 development
  [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3
  [prep-release-3.1.0-b3] Prepare Changelog
  [prep-release-3.1.0-b3] Add migration for 3.1.0-b3
  [prep-release-3.1.0-b3] Update version to 3.1.0-b3
2014-05-04 20:25:11 +02:00
a469974c85 [prep-release-3.1.0-b3] Update phpBB Version for b4 development 2014-05-04 20:23:33 +02:00
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css
PHPBB3-12498
2014-05-04 18:58:27 +02:00
4f5ab1e5e7 [prep-release-3.1.0-b3] Add changelog for 3.1.0-b3 release-3.1.0-b3 2014-05-04 17:47:19 +02:00
324a30315c [prep-release-3.1.0-b3] Prepare Changelog 2014-05-04 17:36:59 +02:00
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
eca1e582d0 [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 2014-05-04 17:34:02 +02:00
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
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
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
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
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
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
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
20022f0dc8 [ticket/12494] Undefined index: user_type on viewtopic.php
PHPBB3-12494
2014-05-04 16:15:50 +02:00
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
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
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
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
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
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
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
f90e6649f7 [ticket/12459] Enable related tests
PHPBB3-12459
2014-05-04 15:44:15 +02:00
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