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

21287 Commits

Author SHA1 Message Date
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 & 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
Cesar G
ed14d12d14 [ticket/12440] Use a more generic approach for replacing the URL.
PHPBB3-12440
2014-05-06 13:34:12 -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
Andreas Fischer
0d4a7d76f4 Merge pull request #2416 from Nicofuma/ticket/12507
[ticket/12507] Add console command to purge the cache

* Nicofuma/ticket/12507:
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
2014-05-06 18:33:40 +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
Dhruv Goel
571d6ae852 Merge pull request #2411 from nickvergessen/ticket/12503
[ticket/12503] Fix several errors in test suite
2014-05-06 17:49:23 +05:30
Tristan Darricau
e4beea0c1e [ticket/12325] Use \RecursiveDirectoryIterator
PHPBB3-12325
2014-05-06 14:04:06 +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
Tristan Darricau
cd5129f261 [ticket/12325] Doc blocks
PHPBB3-12325
2014-05-06 10:53:54 +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
7475e05f99 [ticket/12440] Set browser URL to point to specific post when using view=unread
PHPBB3-12440
2014-05-05 16:33:27 -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
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
Joas Schilling
d9de4fc72c [ticket/12504] Use local variables where possible
PHPBB3-12504
2014-05-05 18:31:01 +02:00
Joas Schilling
f27e4a44b8 [ticket/12504] Use defined variables
PHPBB3-12504
2014-05-05 18:27:00 +02:00
Joas Schilling
5d8d42d88a [ticket/12504] Remove unused request object from avatar manager test
PHPBB3-12504
2014-05-05 18:25:44 +02:00
Tristan Darricau
0061067715 [ticket/12025] Apply DeMorgan
PHPBB3-12025
2014-05-05 18:23:55 +02:00
Joas Schilling
fe99e60d82 [ticket/12486] Make assertion on the return to remove "Risky" from phpunit
PHPBB3-12486
2014-05-05 18:21:28 +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
e9dabb0903 [ticket/12486] Rename data provider to fix "Risky" from phpunit
PHPBB3-12486
2014-05-05 18:19:12 +02:00
Joas Schilling
baef26f7ed [ticket/12503] All tests should extend \phpbb_test_case
PHPBB3-12503
2014-05-05 18:16:50 +02:00
Tristan Darricau
21f06ac9e6 [ticket/12325] Change private function to protected
PHPBB3-12325
2014-05-05 18:16:42 +02:00
Tristan Darricau
f6a8485dae [ticket/12325] Add visibilities
PHPBB3-12325
2014-05-05 16:38:21 +02:00
Tristan Darricau
81ac5e7a00 [ticket/12325] Add files located in deleted dirs
PHPBB3-12325
2014-05-05 16:38:21 +02:00
Tristan Darricau
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
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
fad41a6874 [ticket/12500] Set a title attribute in user.img()
PHPBB3-12500
2014-05-04 14:30:51 -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
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
PayBas
d6c1ca7d94 Merge pull request #4 from prototech/ticket/12431
[ticket/12431] Add topic poll icon.
2014-05-04 21:42:15 +02:00
Cesar G
2e6413a522 [ticket/12431] Add topic poll icon.
PHPBB3-12431
2014-05-04 12:34:51 -07: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
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css
PHPBB3-12498
2014-05-04 18:58:27 +02:00