Commit graph

2039 commits

Author SHA1 Message Date
Andreas Fischer
7ae12df3d2 Merge remote-tracking branch 'p/ticket/10511' into develop-olympus
* p/ticket/10511:
  [ticket/10511] Fix a grammar defect in permissions language.
2011-12-08 22:22:22 +01:00
Andreas Fischer
a8ee32a66b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9876] Distinctly name user and forum roles for newly registered users.
2011-12-08 22:22:06 +01:00
Oleg Pudeyev
5b9c835127 [ticket/9876] Distinctly name user and forum roles for newly registered users.
PHPBB3-9876
2011-12-03 17:44:58 -05:00
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language.
PHPBB3-10511
2011-12-03 17:42:10 -05:00
Oleg Pudeyev
6027541dc7 Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into develop
* nickvergessen/ticket/develop/10345: (21 commits)
  [ticket/10345] Check directly whether the key to use exists
  [ticket/10345] Return the language key when the key has an empty array
  [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form
  [ticket/10345] Remove doubled check for valid plural rule
  [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions
  [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
  [ticket/10345] Fix parsing error in language/en/viewtopic.php
  [ticket/10345] Move rule determination code into a new function
  [ticket/10345] Fix little type in unit test
  [ticket/10345] Remove more useless 0-cases
  [ticket/10345] Make the use of the 0-case optional
  [ticket/10345] Remove some unused 0 cases
  [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
  [ticket/10345] Add tests for array() as first parameter on call to $user->lang()
  [ticket/10345] Fix some documentation issues.
  [ticket/10345] Allow float as array key and add some tests
  [ticket/10345] Use the plural function in some more places.
  [ticket/10345] Make use of the plural function in some basic places
  [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
  [ticket/10345] Fix documentation on the new function and the switch
  ...
2011-12-03 15:39:06 -05:00
Andreas Fischer
af867de77c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10501] Fix description of table prefixes
2011-11-29 20:09:51 +01:00
Joas Schilling
cb4e72298b [ticket/10501] Fix description of table prefixes
They must start with a letter, not an alphanumeric character

PHPBB3-10501
2011-11-28 11:28:46 +01:00
Joas Schilling
6472a270e0 [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes
PHPBB3-10345
2011-11-27 21:43:07 +01:00
Joas Schilling
2fac1d4c23 [ticket/10345] Fix parsing error in language/en/viewtopic.php
PHPBB3-10345
2011-11-27 21:41:22 +01:00
Joas Schilling
3788326d71 [ticket/10345] Remove more useless 0-cases
PHPBB3-10345
2011-11-25 15:10:51 -05:00
Joas Schilling
7da6826a67 [ticket/10345] Remove some unused 0 cases
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()
PHPBB3-10345
2011-11-25 15:10:50 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places.
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
2011-11-25 15:10:49 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
Joas Schilling
0734dd3c42 [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules
This message was only viewed for 1 second anyway,
as floor($delta / 60) is only 60 for 3600 to 3660,
but the code was limited to $delta <= 3600

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
2011-11-25 15:04:30 -05:00
Oleg Pudeyev
4b8f00f649 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
2011-11-23 18:39:48 -05:00
Oleg Pudeyev
4cd88199c9 Merge remote-tracking branch 'nickvergessen/ticket/10479' into prep-release-3.0.10
* nickvergessen/ticket/10479:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
2011-11-23 18:37:11 -05:00
Joas Schilling
c4d3c5320e [ticket/10479] Remove PostgreSQL version numbers from driver's language string
The versions should be removed like for all other DBMS so we don't have to add
each new version.

PHPBB3-10479
2011-11-21 00:12:44 +01:00
Oleg Pudeyev
f33dcacabe Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
2011-11-19 21:54:20 -05:00
Oleg Pudeyev
fb43029935 Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus
* cs278/ticket/10239:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
2011-11-19 21:52:43 -05:00
Oleg Pudeyev
ff91c037c9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10157] Add notification to update cpfs when installing a language.
2011-11-17 12:46:00 -05:00
Oleg Pudeyev
aeb896399c Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympus
* nickvergessen/ticket/10157:
  [ticket/10157] Add notification to update cpfs when installing a language.
2011-11-17 12:44:04 -05:00
Joas Schilling
b2b057910e [ticket/10157] Add notification to update cpfs when installing a language.
We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.

PHPBB3-10157
2011-11-17 10:28:16 +01:00
Andreas Fischer
512aee5124 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10419] Reword the language strings
  [ticket/10419] Reword some language strings, minor code changes
  [ticket/10419] Add mbstring PHP ini parameters checks to ACP
2011-11-15 16:46:23 +01:00
Andreas Fischer
39f8592312 Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus
* rxu/ticket/10419:
  [ticket/10419] Reword the language strings
  [ticket/10419] Reword some language strings, minor code changes
  [ticket/10419] Add mbstring PHP ini parameters checks to ACP
2011-11-15 16:46:08 +01:00
rxu
f1a53659bd [ticket/10419] Reword the language strings
PHPBB3-10419
2011-11-15 23:43:52 +08:00
Andreas Fischer
2761a993ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:15 +01:00
Andreas Fischer
69f943c8d6 Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
* nickvergessen/ticket/9361:
  [ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:06 +01:00
Joas Schilling
14af18cb1b [ticket/9361] View correct error messages when editing account information
Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.

PHPBB3-9361
2011-11-14 18:54:12 +01:00
Andreas Fischer
34ed1352a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:58 +01:00
Andreas Fischer
f31da015fc Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus
* nickvergessen/ticket/9066:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:50 +01:00
Andreas Fischer
3dfb116942 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10087] Organize bans in acp_baninto optgroups
2011-11-13 21:14:21 +01:00
Andreas Fischer
9553b2239c Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus
* igorw/ticket/10087:
  [ticket/10087] Organize bans in acp_baninto optgroups
2011-11-13 21:13:22 +01:00
Andreas Fischer
1b003fd244 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
2011-11-13 20:34:53 +01:00
Andreas Fischer
0a5d2a84d1 Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympus
* igorw/ticket/8616:
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
  [ticket/8616] Direct links in pm notification emails
2011-11-13 20:34:39 +01:00
Joas Schilling
6370ef2705 [ticket/9066] Disallow some database prefix to prevent same errors and problems
With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
2011-11-13 15:40:18 +01:00
Igor Wiedler
edd5866a6e [ticket/10087] Organize bans in acp_baninto optgroups
PHPBB3-10087
2011-11-11 23:08:52 +01:00
rxu
2918fbc970 [ticket/10419] Reword some language strings, minor code changes
PHPBB3-10419
2011-11-05 01:02:40 +08:00
Andreas Fischer
589f7ac8e4 Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop
* nickvergessen/ticket/10410:
  [ticket/10410] Add option to display users in their first teampage group
2011-11-01 20:04:08 +01:00
Joas Schilling
1dfb52b805 Merge branch 'develop-olympus' into develop 2011-10-30 16:12:22 +01:00
Joas Schilling
a63490f744 Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus 2011-10-30 16:10:45 +01:00
Marc Alexander
75a44a6970 [ticket/9778] Replaced "Find a member" with "Enter username"
When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

PHPBB3-9778
2011-10-30 15:46:52 +01:00
Igor Wiedler
7c10058787 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
2011-10-29 11:41:01 +02:00
Andreas Fischer
2e9e0a7d78 [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
It does not make much sense to say "the username you received in a previous
e-mail" when the message itself contains the username.

PHPBB3-10166
2011-10-29 00:32:38 +02:00
Joas Schilling
65a34fd047 [ticket/10410] Add option to display users in their first teampage group
PHPBB3-10410
2011-10-28 22:55:26 +02:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
rxu
88b31c2ab3 [ticket/10419] Add mbstring PHP ini parameters checks to ACP
PHPBB3-10419
2011-10-18 02:09:08 +08:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:44:08 +02:00