1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00

18343 Commits

Author SHA1 Message Date
Joas Schilling
416c58a418 Merge pull request #2418 from Nicofuma/ticket/12402
[ticket/12402] CAPTCHA plugin migration fails to detect missing plugins

* Nicofuma/ticket/12402:
  [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
2014-05-08 13:13:15 +02:00
Joas Schilling
aade62b0a3 Merge pull request #2419 from prototech/ticket/12510
[ticket/12510] Convert & to & in build_url() when no params are stripped.

* prototech/ticket/12510:
  [ticket/12510] Convert & to & in build_url() when no params are stripped.
2014-05-08 13:02:01 +02:00
Joas Schilling
0c3c77c6bf Merge pull request #2422 from Nicofuma/ticket/12428
[ticket/12428] Incorrect from version in database update log entry

* Nicofuma/ticket/12428:
  [ticket/12428] Use the database to store the original version number
  [ticket/12428] Incorrect from version in database update log entry
2014-05-08 12:56:59 +02:00
Joas Schilling
ef99d6fcc5 Merge pull request #2423 from rxu/ticket/12511
[ticket/12511] Add missing titles for profile fields in members group view

* rxu/ticket/12511:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:32:04 +02:00
Joas Schilling
03f3f1141f Merge pull request #2424 from VSEphpbb/ticket/12513
[ticket/12513] Add simple_header head event with support for asset calls

* VSEphpbb/ticket/12513:
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
2014-05-08 12:28:53 +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
Tristan Darricau
32efd5de73 [ticket/12428] Use the database to store the original version number
PHPBB3-12428
2014-05-07 23:04:41 +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
077c7cf7aa Merge pull request #2400 from PayBas/ticket/12488
[ticket/12488] Add user warning indication to viewtopic posts

* PayBas/ticket/12488:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:04 +02: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
Matt Friedman
d2c5386394 [ticket/12513] Add asset include support to simple header/footer in ACP
PHPBB3-12513
2014-05-07 11:59:49 -07:00
Matt Friedman
8fda490050 [ticket/12513] Add simple_header head event with support for CSS assets calls
PHPBB3-12513
2014-05-07 11:53:25 -07:00
rxu
4b54d0b4af [ticket/12511] Add missing titles for profile fields in members group view
For memberlist group view in cases the group is presented with the group leader
and group members, for members profile fields titles are missing: Posts,
Joined, Last active and custom profile fields titles.

PHPBB3-12511
2014-05-07 23:31:09 +08:00
Tristan Darricau
e0dbbfb4af [ticket/12428] Incorrect from version in database update log entry
https://tracker.phpbb.com/browse/PHPBB3-12428

PHPBB3-12428
2014-05-07 02:07:30 +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
Tristan Darricau
290a1b04c4 [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
PHPBB3-12402
2014-05-06 23:36:37 +02:00
Cesar G
3c86a9bcca Merge remote-tracking branch 'Elsensee/ticket/suheb/12185' into develop-ascraeus
* Elsensee/ticket/suheb/12185:
  [ticket/12185] Fix and increase width
  [ticket/12185] Fixing the width of topic header for translation.
2014-05-06 13:56:09 -07:00
Joas Schilling
6d40d437eb Merge pull request #2330 from Nicofuma/ticket/12421
[ticket/12421] Don't parse [attachment] tags if user can't view them

* Nicofuma/ticket/12421:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
2014-05-06 21:50:42 +02:00
Tristan Darricau
09011288b6 [ticket/12507] Move the 'require' statement
PHPBB3-12507
2014-05-06 17:58:31 +02:00
Tristan Darricau
06ecb62abd [ticket/12507] Add console command to purge the cache
PHPBB3-12507
2014-05-06 16:50:18 +02:00
Tristan Darricau
62b4e7b9d2 [ticket/12421] Rebase and enable tests
PHPBB3-12421
2014-05-06 14:54:22 +02:00
Tristan Darricau
f4df3f0aaf [ticket/12421] Don't parse [attachment] tags if user can't view them
https://tracker.phpbb.com/browse/PHPBB3-12421

PHPBB3-12421
2014-05-06 14:19:55 +02:00
Joas Schilling
c7d29fbdb1 Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds

* Nicofuma/ticket/12459:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
2014-05-06 13:59:09 +02: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
698d8551cf Merge remote-tracking branch 'Crizz0/ticket/12498' into develop-ascraeus
* Crizz0/ticket/12498:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
2014-05-05 16:45:44 -07:00
Cesar G
74cb99f067 [ticket/12357] Support routes in generate_smilies() function.
PHPBB3-12357
2014-05-05 13:13:48 -07:00
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
Tristan Darricau
346c6f3998 [ticket/11497] Rename set_ext_finder in find_routing_files
PHPBB3-11497
2014-05-05 18:20:14 +02: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
PayBas
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
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
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
PayBas
172fa9e7aa [ticket/12488] Typo fix
PHPBB3-12488
2014-05-04 22:19:55 +02:00
PayBas
cefeb7f752 [ticket/12488] Removed <em> and removed anonymous check
PHPBB3-12488
2014-05-04 22:07:03 +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
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css
PHPBB3-12498
2014-05-04 18:58:27 +02:00
Joas Schilling
4f5ab1e5e7 [prep-release-3.1.0-b3] Add changelog for 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