mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
21,050 Commits 17 Branches 190 Tags
Commit Graph

21050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joas Schilling
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
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
Cesar G
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
Andreas Fischer
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
Tristan Darricau
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
Joas Schilling
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
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
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
Joas Schilling
324a30315c [prep-release-3.1.0-b3] Prepare Changelog 2014-05-04 17:36:59 +02:00
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
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
78834e49e4 [ticket/12346] Change tabs to spaces 
PHPBB3-12346
 2014-05-03 21:45:48 +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