1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00

2494 Commits

Author SHA1 Message Date
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
Cesar G
b32a66ca78 [ticket/11959] List the last user with "and" instead of a comma.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
126ee37f66 [ticket/11959] Use the plurals system for the untrimmed language strings.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
7e4b7a1542 [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
6a278248e5 [ticket/11959] Use plurals for the language strings.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
netdeamon
a8274ae137 [ticket/12198] Language issue in en/common.php
Deleted lines as they are not needed anymore.

PHPBB3-12198
2014-03-18 22:13:10 +05:30
geetakshi
66ed9881df [ticket/8309] Removing key with similar function to avoid redundancy
PHPBB3-8309
2014-03-17 21:08:03 +05:30
netdeamon
85147eb987 [ticket/12269] Delete folder mods in language
Deleted mods folder in phpbb/language/en/.

PHPBB3-12269
2014-03-17 14:26:08 +05:30
Matt Friedman
3845a560b6 [ticket/11904] Update explanation for what Allow CDN does
PHPBB3-11904
2014-03-16 15:55:58 -07:00
geetakshi
6a1967514d [ticket/8309] Moving key to get keys in alphabetical order
PHPBB3-8309
2014-03-16 14:27:34 +05:30
geetakshi
8c4604a78e [ticket/8309] Renaming "Last visit" to "Last activity"
PHPBB3-8309
2014-03-16 03:32:08 +05:30
Joas Schilling
0aa23d203e Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
2014-03-14 14:04:30 +01:00
Crizzo
0c02eae1ad [ticket/11787] Changes <samp> to <strong> in en/acp/permissions.php
PHPBB3-11787
2014-03-13 20:58:05 +01:00
Joas Schilling
8a61e4b4c0 Merge remote-tracking branch 'crizz0/ticket/8785' into develop
* crizz0/ticket/8785:
  [ticket/8785] Deletes additional add and add_bcc buttons
  [ticket/8785] Fixed problem with add empty.png and travis will now pass
  [ticket/8785] and again a fresh line
  [ticket/8785] Just one blank line
  [ticket/8785] pm_layout.html back to more standard code
  [ticket/8785] <hr /> will only displayed when needed
  [ticket/8785] Adds blank lines at file end
  [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
  [ticket/8785] Adds two <hr /> to seperate recipients and BCC
  [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
  [ticket/8785] Little spaces mistake
  [ticket/8785] Rebuilding posting_editor pm head + new language vars
2014-03-13 11:28:21 +01:00
Andreas Fischer
4ecfc07e03 Merge pull request #2113 from nickvergessen/ticket/8041
[ticket/8041] Merge item name into "Return to" string for better translations

* nickvergessen/ticket/8041:
  [ticket/8041] Add space/tabs after => in array list
  [ticket/8041] Wrap forum name, topic title and pm folder name with quotes
  [ticket/8041] Merge item name into "Return to" string for better translations
2014-03-13 11:02:29 +01:00
Joas Schilling
dbebe30c9a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-03-13 10:27:19 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
2014-03-13 10:16:41 +01:00
Joas Schilling
c6a87e77d4 Merge remote-tracking branch 'vsephpbb/ticket/12244' into develop
* vsephpbb/ticket/12244:
  [ticket/12244] Rename extensions manager tab
  [ticket/12244] Rename link to Extensions Manager in the ACP
2014-03-12 20:18:29 +01:00