Commit graph

22865 commits

Author SHA1 Message Date
Joas Schilling
6aa3aa3a17 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:29:01 +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
3a39a99ed6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12493] Add functional test
  [ticket/12493] Fix sql query for selection of users that have disabled PM
2014-05-08 12:23:10 +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
7935388306 [ticket/12174] Update topic_attachment flag when a post is soft-deleted
https://tracker.phpbb.com/browse/PHPBB3-12174

PHPBB3-12174
2014-05-08 01:43:56 +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
83a905de4b [ticket/12493] Add functional test
Added a functional test.

PHPBB3-12493
2014-05-07 23:00:50 +03: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
5ce5d107c2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:18 +02: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
3a0bb88866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12357] Support routes in generate_smilies() function.
2014-05-07 21:14:31 +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
be05c6ab30 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12185] Fix and increase width
  [ticket/12185] Fixing the width of topic header for translation.
2014-05-06 13:56:30 -07: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
35cd0d8cc6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12421] Rebase and enable tests
  [ticket/12421] Don't parse [attachment] tags if user can't view them
2014-05-06 21:50:54 +02: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
801cac50bd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12507] Move the 'require' statement
  [ticket/12507] Add console command to purge the cache
2014-05-06 18:38:26 +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
Dhruv
a9fe4ad1a4 Merge branch 'develop-ascraeus' into develop
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12504] Use local variables where possible
  [ticket/12504] Use defined variables
  [ticket/12504] Remove unused request object from avatar manager test
  [ticket/12486] Make assertion on the return to remove "Risky" from phpunit
  [ticket/12486] Rename data provider to fix "Risky" from phpunit
  [ticket/12503] All tests should extend \phpbb_test_case
2014-05-06 17:51:09 +05:30
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
Joas Schilling
2772af18eb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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 14:09:04 +02:00
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
d5b39a45c8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:56:24 +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
e5d18ac827 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [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:50 -07: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
63632d0713 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
2014-05-05 16:46:07 -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