1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00

2561 Commits

Author SHA1 Message Date
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates
PHPBB3-12456
2014-04-29 15:43:55 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation
PHPBB3-12445
2014-04-28 18:44:56 +02:00
Nicofuma
5ec9f40b78 [ticket/12445] Disapproved post: the name of the poster should be in logs
https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
2014-04-26 01:18:34 +02:00
Cesar G
b305ec5611 Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus
* PayBas/ticket/12389:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:33:22 -07:00
Joas Schilling
37751b51f9 [ticket/12371] Do not add unlimited users as responders
We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
2014-04-25 11:52:20 +02:00
PayBas
65c8280fb6 [ticket/12389] Change "PM" to "Message"
PHPBB3-12389
2014-04-24 22:09:15 +02:00
Cesar G
f2e74354a3 [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
PHPBB3-10737
2014-04-23 09:11:41 -07:00
Cesar G
607698c884 [ticket/10737] Add config setting to disable live searches.
PHPBB3-10737
2014-04-23 09:11:40 -07:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 19:58:15 +02:00
PayBas
4e1a86d848 [ticket/12389] Moved PM tools to UCP template
PHPBB3-12389
2014-04-20 20:33:34 +02:00
Oliver Schramm
59cdc26fb4 [ticket/8558] Use only one variable and improve explain string
PHPBB3-8558
2014-04-17 23:12:32 +02:00
Markus Stenudd
40c685e6fc [ticket/8558] Add display name in emails from board
PHPBB3-8558
2014-04-17 13:30:48 +02:00
Marc Alexander
0679a403d5 Merge branch 'ticket/8960-olympus' into ticket/8960
Conflicts:
	phpBB/includes/acp/acp_board.php
2014-04-16 10:11:09 +02:00
n-aleha
1f44b4da18 [ticket/12345] Improve search flood interval message for ascraeus
Show to guests and users the remaining seconds until their next allowed
search, if a search flood limit is enabled for them.

PHPBB3-12345
2014-04-16 02:14:36 +03:00
Cesar G
b73e22ae71 [ticket/12201] Add link to resync file stats after error.
PHPBB3-12201
2014-04-15 14:19:47 -07:00
Cesar G
52251acefa [ticket/12201] Fix typos in language pack.
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
38775fc063 [ticket/12201] Display error and sorting options when there are no attachments
PHPBB3-12201
2014-04-15 13:57:45 -07:00
Cesar G
eae37267a5 [ticket/12265] Simplify contact icon design and move to dropdown.
PHPBB3-12265
2014-04-15 08:56:34 -07:00
Marc Alexander
c6fd2f01eb [ticket/8960] Allow changing avatar path if it's not writable
This change will allow users to change the avatar path even if it's not
writable. However, this will get rid of the error message that the path is
not writable. Due to this, a minor addition to the explain message in the ACP
settings has been made.

PHPBB3-8960
2014-04-14 22:44:37 +02:00
PayBas
9c8ea7bdba [ticket/12389] Change language of email friend
PHPBB3-12389
2014-04-11 19:48:18 +02:00
Cesar G
251b2ba28f Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10687] Improve error message if unable to get image dimensions
2014-04-10 17:42:59 -07:00
Nils Adermann
497d81af68 Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:36 -07:00
Cesar G
55a674adcf Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeus
* nickvergessen/ticket/8700:
  [ticket/8700] Use L_COLON instead of adding ":" manually
  [ticket/8700] Remove unused language strings
2014-04-09 17:22:00 -07:00
Marc Alexander
5c34b9c371 [ticket/10687] Improve error message if unable to get image dimensions
The error message that is presented if getimagesize() was unable to determine
an image's dimensions now additionally states that this might be caused by an
incorrect URL.

PHPBB3-10687
2014-04-09 14:55:49 +02:00
Maël Soucaze
02f739e0e7 [ticket/12361] Replace the Google logo.
Currently, a link to Google and its logo are displayed in the
language/en/help_bbcode.php file to explain how to correctly format tags
and to add an image to a post. However, the Google logo is outdated and
Google does not allow the use of its logo on third-party websites. Plus,
that overload their servers. I used the blue phpBB logo to replace it
because the grey one with transparent background is hardly visible.

Originally, I just refreshed the old Google logo with the new one
(https://www.google.com/images/srpr/logo5w.png) but Joas proposed to use
the phpBB logo, and I agree with him.

PHPBB3-12361
2014-04-07 22:09:33 +02:00
Joas Schilling
b6128dee3f [ticket/8700] Use L_COLON instead of adding ":" manually
PHPBB3-8700
2014-04-02 00:23:26 +02:00
Joas Schilling
bdc08a3fcd [ticket/8700] Remove unused language strings
Most of the strings were obsoleted by the removal of:
* Imagesets
* Themes
* Templates
* Editor
* Exporter

PHPBB3-8700
2014-04-02 00:17:39 +02:00
Joas Schilling
f471831916 [ticket/12113] Correctly use plurals when deleting user warnings
PHPBB3-12113
2014-04-01 22:43:30 +02:00
Marc Alexander
d83d819827 [ticket/12150] Use shorter column names for prune settings
All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.

PHPBB3-12150
2014-03-29 22:14:58 +01:00
Marc Alexander
02fdae4e88 [ticket/12150] Add file and caller for pruning shadow topics
PHPBB3-12150
2014-03-29 21:56:53 +01:00
Marc Alexander
3c7ff1c417 [ticket/12150] Add options to acp
PHPBB3-12150
2014-03-29 21:49:31 +01:00
Joas Schilling
f426fa0295 Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeus
* prototech/ticket/11959:
  [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
  [ticket/11959] Add unit tests.
  [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
  [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
  [ticket/11959] Simplify how the users are trimmed.
  [ticket/11959] Add function to create a string list.
  [ticket/11959] Add samples for the untrimmed strings.
  [ticket/11959] List the last user with "and" instead of a comma.
  [ticket/11959] Use the plurals system for the untrimmed language strings.
  [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
  [ticket/11959] Use plurals for the language strings.
2014-03-29 20:39:22 +01:00
Joas Schilling
c7d18eaadd Merge remote-tracking branch 'crizz0/ticket/11336' into develop-ascraeus
* crizz0/ticket/11336:
  [ticket/11336] Adds 301 info to redirect
  [ticket/11336] Adds redirect for old "leaders" mode
  [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
  [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
2014-03-28 23:32:05 +01:00
Crizzo
c5eccedfb6 [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
PHPBB3-11336
2014-03-28 19:36:09 +01:00
Matt Friedman
e2c2692e9c [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
PHPBB3-12315
2014-03-28 11:27:25 -07:00
Joas Schilling
0be6582d7f Merge branch 'ticket/suheb/11666' into develop-ascraeus
* ticket/suheb/11666:
  [ticket/11666] Rewording POST_DELETED and
  [ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:42:34 +01:00
Suhaib Khan
96291d9e6e [ticket/11666] Rewording POST_DELETED and
reverting removal of MESSAGE_DELETED.

PHPBB3-11666
2014-03-28 17:41:42 +01:00
Matt Friedman
368dd23d4b [ticket/12311] Use British-English spelling of licence in lang file
PHPBB3-12311
2014-03-28 09:08:11 -07:00
Matt Friedman
ba9bc9c7dc [ticket/12311] Use valid composer schema - license - for extensions
http://tracker.phpbb.com/browse/PHPBB3-12311

PHPBB3-12311
2014-03-27 23:27:30 -07:00
Joas Schilling
800c779403 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:43 +01:00
Daniel Schosser
a46ad06c19 [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself

PHPBB3-10174
2014-03-23 14:06:32 +01:00
Joas Schilling
4de099d969 Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeus
* vsephpbb/ticket/11904:
  [ticket/11904] Update explanation for what Allow CDN does
2014-03-22 15:01:11 +01:00
Dhruv Goel
7f5d8becad Merge pull request #2137 from geetakshi/ticket/8309
[ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
2014-03-20 03:44:39 +05:30
Joas Schilling
2d1e6975b4 Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into develop
* netdeamon/ticket/12198-Language-issue:
  [ticket/12198] Language issue in en/common.php
2014-03-19 21:07:15 +01:00
Cesar G
7c1ab5f79d [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
PHPBB3-11959
2014-03-19 03:08:34 -07:00
Cesar G
285ad0f6fa [ticket/11959] Simplify how the users are trimmed.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
7cc1a8d224 [ticket/11959] Add samples for the untrimmed strings.
PHPBB3-11959
2014-03-19 03:08:33 -07:00