mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-26 21:21:32 +01:00
Code Issues Releases Wiki Activity
11,958 Commits 10 Branches 193 Tags
08d69de933e2ca9ef40a6bf4f9273bae88de0199
Commit Graph

1810 Commits

Author SHA1 Message Date
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific. 
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
 2012-04-04 02:51:28 +08:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus 
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:27:19 +02:00
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL 
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
 2012-03-31 12:46:44 -04:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. 
PHPBB3-10129
 2012-03-24 15:13:04 +00:00
Richard Foote
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments 
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
 2012-03-19 15:08:28 -04:00
Joas Schilling
9915ed5255 [ticket/8743] Include poster´s name in mail notifications 
PHPBB3-8743
 2012-03-15 16:07:14 +01:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus 
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
 2012-03-09 23:41:43 +01:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item". 
PHPBB3-7432
 2012-03-07 18:00:57 -05:00
Michael Cullum
225892f506 [ticket/9914] Add backup warning to updater. 
PHPBB3-9914
 2012-02-03 16:14:48 +00:00
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp 
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
 2012-01-02 21:07:40 +02:00
Oleg Pudeyev
b8ddd32922 [ticket/7432] Explain what users are inactive in more detail. 
PHPBB3-7432
 2011-12-23 01:45:41 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
rxu
88b31c2ab3 [ticket/10419] Add mbstring PHP ini parameters checks to ACP 
PHPBB3-10419
 2011-10-18 02:09:08 +08:00
Andreas Fischer
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus 
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
 2011-10-17 16:43:58 +02:00
Joas Schilling
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working. 
PHPBB3-9525
 2011-10-14 15:19:47 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus 
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:47:45 +02:00
Igor Wiedler
39f6d58315 [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE 
PHPBB3-8616
 2011-10-13 19:28:46 +02:00
Andreas Fischer
b957639abb Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus 
* igorw/ticket/8094:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:10 +02:00
Igor Wiedler
ee91656968 [ticket/10275] Remove incorrect password information from FAQ 
FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
 2011-10-13 17:09:34 +02:00
Igor Wiedler
6698a9cbd6 [ticket/8094] Remove ambiguity of "phpBB has no categories" 
PHPBB3-8094
 2011-10-13 16:25:41 +02:00
Chris Smith
a1febdd429 [ticket/10239] Add confirm box to backup restore. 
PHPBB3-10239
 2011-09-21 21:19:37 +01:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out. 
PHPBB3-10278
 2011-08-25 20:34:01 +02:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus 
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
 2011-07-30 19:33:41 -04:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript. 
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
 2011-07-30 08:57:17 +01:00
Nils Adermann
b3cdd1d169 Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into develop-olympus 
* github-nickvergessen/ticket/10237:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
 2011-07-16 21:43:17 -04:00
Tabitha Backoff
2bba22e9d3 [ticket/10208] Explain what happens when 'Warning duration' is set to 0. 
PHPBB3-10208
 2011-07-16 01:16:46 +02:00
Callum Macrae
e9319ee2aa [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED. 
Previously "errors are listing below", should have said "errors are
listed below".

PHPBB3-10216
 2011-07-14 18:48:37 +01:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way. 
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
 2011-07-11 19:24:40 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions 
PHPBB3-10237
 2011-07-07 12:40:35 +02:00