1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

21377 Commits

Author SHA1 Message Date
Joas Schilling
3021a6e12a Merge pull request #2505 from bantu/ticket/12582-ascraeus
[ticket/12582] Strip away copyrighted ICC profile from images

* bantu/ticket/12582-ascraeus:
  [ticket/12582] Use the correct script name.
  [ticket/12582] Fix coding style.
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.
2014-05-28 21:50:19 +02:00
Joas Schilling
e2308df14d Merge pull request #2426 from Nicofuma/ticket/12174
[ticket/12174] Update topic_attachment flag when a post is soft-deleted

* Nicofuma/ticket/12174:
  [ticket/12174] Add tests
  [ticket/12174] Coding style
  [ticket/12174] Remove $update_topic_attachments_flag
  [ticket/12174] Don't update the flag for a post without attachment
  [ticket/12174] Update the conditions
  [ticket/12174] Remove inline assignment
  [ticket/12174] Update sql query
  [ticket/12174] Revert the changes on $topic_update_array
  [ticket/12174] Corrections
  [ticket/12174] Update topic_attachment flag when a post is soft-deleted
2014-05-28 21:45:39 +02:00
Andreas Fischer
c8e7b2c5d4 Merge pull request #2507 from Marshalrusty/ticket/12594
File headers, credit lines, etc. should reflect updated legal info

* Marshalrusty/ticket/12594:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +02:00
Tristan Darricau
ad4a373557 [ticket/12174] Add tests
PHPBB3-12174
2014-05-28 14:55:55 +02:00
Yuriy Rusko
55e1f02151 [ticket/12594] Replace phpBB Group with phpBB Limited
PHPBB3-12594
2014-05-28 01:07:56 +02:00
Yuriy Rusko
2a42aee8ac Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 2014-05-28 01:02:39 +02:00
Joas Schilling
08c01b7cee Merge pull request #2455 from Nicofuma/ticket/12509
[ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions

* Nicofuma/ticket/12509:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
2014-05-28 00:23:37 +02:00
Joas Schilling
83fc8725da Merge pull request #2453 from Nicofuma/ticket/12536
[ticket/12536] Get Versions Should Not Require Both Stable and Unstable

* Nicofuma/ticket/12536:
  [ticket/12536] Restore missing @throws
  [ticket/12536] Add test cases with empty versions list
  [ticket/12536] Use stable values when unstable are unavailable
  [ticket/12536] Update doc block
  [ticket/12536] Return empty array if stability unavailable
  [ticket/12536] Get Versions Should Not Require Both Stable and Unstable
2014-05-28 00:07:33 +02:00
Andreas Fischer
97dc817158 [ticket/12582] Use the correct script name.
PHPBB3-12582
2014-05-27 23:50:52 +02:00
Dhruv Goel
e9f28c7be0 Merge pull request #2502 from tmbackoff/ticket/12596
[ticket/12596] Add template event acp_group_options_before/after
2014-05-28 01:29:27 +05:30
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
	phpBB/docs/hook_system.html
2014-05-27 21:55:40 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines
PHPBB3-12594
2014-05-27 21:39:30 +02:00
Andreas Fischer
f4d37749b6 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Fix coding style.
2014-05-27 20:56:47 +02:00
Andreas Fischer
de71837b71 [ticket/12582] Fix coding style.
PHPBB3-12582
2014-05-27 20:56:29 +02:00
Andreas Fischer
709e363349 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
2014-05-27 20:53:22 +02:00
Andreas Fischer
d7c143da24 [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
PHPBB3-12582
2014-05-27 20:51:48 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Andreas Fischer
a1e31f4389 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.

Conflicts:
	.travis.yml
2014-05-27 20:38:20 +02:00
Andreas Fischer
0acaa77229 Merge pull request #2469 from prototech/ticket/12155
[ticket/12155] Construct post buttons using CSS.

* prototech/ticket/12155: (21 commits)
  [ticket/12155] Remove use of !important and move reddish color back to .button
  [ticket/12155] Reposition the button icons to the left side while we're at it.
  [ticket/12155] Get rid of line-height value causing alignment issues in FF.
  [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
  [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
  [ticket/12155] Combine the post and topic/PM button icons into a single sprite
  [ticket/12155] Move icon class directly to <a> and use <span> consistently.
  [ticket/12155] Remove star hack from padding-right property of .button.
  [ticket/12155] Fix tabbing and put one selector per line if string is too long
  [ticket/12155] Make opacity transition faster and fix background image paths.
  [ticket/12155] Keep the selection method consistent with the one below it.
  [ticket/12155] Fade out the buttons when leaving the post.
  [ticket/12155] Display the buttons only when hovering the post.
  [ticket/12155] Make the buttons bigger on touch devices.
  [ticket/12155] Clean up icons.
  [ticket/12155] Remove unused font.
  [ticket/12155] Remove obsolete images.
  [ticket/12155] Use the new .button class as the basis for the post buttons.
  [ticket/12155] Move existing button style to a more generic class.
  [ticket/12155] Remove obsolete language images.
  ...
2014-05-27 18:41:31 +02:00
David Prévot
b485318ba9 [ticket/12582] Strip away copyrighted ICC profile
This images embed a non free ICC profile that doesn’t allow
modification:

http://web.archive.org/web/20020603153925/srgb.com/usingsrgb.html

Please use the proposed version stripping away this copyrighted binary
profile, probably embedded by an image software at one time:

	exiftool -icc_profile"-<=" phpBB/adm/images/phpbb_logo.png

I’ve checked the resulting image and trust it is identical to the
original.

Some more background on the issue:
https://lists.debian.org/debian-devel/2014/05/msg00339.html

PHPBB3-12582
2014-05-27 18:35:44 +02:00
Andreas Fischer
2a1925a783 Merge pull request #2503 from prototech/ticket/12603
[ticket/12603] Remove hook system documentation.

* prototech/ticket/12603:
  [ticket/12603] Remove hook system documentation.
2014-05-27 18:33:56 +02:00
Cesar G
4c4227589f [ticket/12603] Remove hook system documentation.
The code for hooks still exists in Ascraeus for compatibility reasons, however,
it is no longer recommended that they be used. The events system should be
used instead.

PHPBB3-12603
2014-05-27 09:28:23 -07:00
Andreas Fischer
edf81cd534 Merge pull request #2440 from nickvergessen/ticket/12527
[ticket/12527] Remove translation editor from ACP

* nickvergessen/ticket/12527:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
2014-05-27 17:34:50 +02:00
Andreas Fischer
c02fba3f1c [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
PHPBB3-12582
2014-05-27 17:23:54 +02:00
Andreas Fischer
4f9aa5e384 [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
PHPBB3-12582
2014-05-27 17:23:54 +02:00
Andreas Fischer
ac3bc45874 [ticket/12582] Overwrite inplace instead of creating _original files.
PHPBB3-12582
2014-05-27 17:23:54 +02:00
Andreas Fischer
31b5e749c1 Merge pull request #2500 from Nicofuma/ticket/12600
[ticket/12600] Add @log to the dependencies of extension:show

* Nicofuma/ticket/12600:
  [ticket/12600] Add @log to the dependencies of extension:show
2014-05-27 16:59:09 +02:00
Cesar G
7518648c21 [ticket/12155] Remove use of !important and move reddish color back to .button
PHPBB3-12155
2014-05-27 07:35:49 -07:00
Tabitha Backoff
6230ae66a3 [ticket/12596] Add template event acp_group_options_before/after
Add template events to the group settings page to allow extensions to
add
additional options for groups.

PHPBB3-12596
2014-05-27 10:31:03 -04:00
Cesar G
ee9b99cc31 [ticket/12155] Reposition the button icons to the left side while we're at it.
PHPBB3-12155
2014-05-27 07:17:48 -07:00
Cesar G
aad195aaa8 [ticket/12155] Get rid of line-height value causing alignment issues in FF.
PHPBB3-12155
2014-05-27 07:17:48 -07:00
Cesar G
4d60583412 [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
dff6741c7b [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
7c3af55918 [ticket/12155] Combine the post and topic/PM button icons into a single sprite
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
70f9d4a54a [ticket/12155] Move icon class directly to <a> and use <span> consistently.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
523c374e16 [ticket/12155] Remove star hack from padding-right property of .button.
This was in place for IE7 due to the use of :after for inserting the button
icon. IE7 does not support :after, so the hack removed the extra padding that
made room for the icon. We no longer use :after for the icon, so this is no
longer an issue... not to mention that IE7 is no longer supported.

PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
7f2c3866ed [ticket/12155] Fix tabbing and put one selector per line if string is too long
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
74afe4acea [ticket/12155] Make opacity transition faster and fix background image paths.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
c0c42dec24 [ticket/12155] Keep the selection method consistent with the one below it.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
c521fc2a4e [ticket/12155] Fade out the buttons when leaving the post.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
cba58fe4e9 [ticket/12155] Display the buttons only when hovering the post.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
3106306a4d [ticket/12155] Make the buttons bigger on touch devices.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
84fd965272 [ticket/12155] Clean up icons.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
f31f1dca4b [ticket/12155] Remove unused font.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
673087d5f0 [ticket/12155] Remove obsolete images.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
d3b9c87b42 [ticket/12155] Use the new .button class as the basis for the post buttons.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
00ff33c9b4 [ticket/12155] Move existing button style to a more generic class.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
03d3762d52 [ticket/12155] Remove obsolete language images.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
neufke
aeb7803017 [ticket/12155] CSS-ing of the mini post buttons
Created a css version of the mini post buttons with the use of language vars
and no fixed width of height.

PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
bca34bd3bb Merge remote-tracking branch 'hanakin/ticket/12580' into develop-ascraeus
* hanakin/ticket/12580:
  [ticket/12580] Remove :link pseudo from a tag
2014-05-27 07:13:46 -07:00