mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
10,737 Commits 17 Branches 190 Tags
Commit Graph

10243 Commits

Author SHA1 Message Date
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
f7286e1abe Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympus 
* nickvergessen/ticket/10452:
  [ticket/10452] Fix xHTML errors when print-viewing PMs
 2011-11-14 21:57:00 +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
Joas Schilling
9830453487 [ticket/10452] Fix xHTML errors when print-viewing PMs 
Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.

PHPBB3-10452
 2011-11-14 18:41:19 +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
Joas Schilling
3302305cd4 [ticket/9066] Move regex into get_preg_expression function and add tests 
PHPBB3-9066
 2011-11-14 15:10:25 +01:00
Andreas Fischer
9d7b144c54 Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus 
* bantu/ticket/10254:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
 2011-11-14 13:44:38 +01:00
Andreas Fischer
e543effc64 [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css 
PHPBB3-10254
 2011-11-14 13:32:54 +01:00
maelsoucaze
cf044c363b [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:38 +01:00
maelsoucaze
4d760630c3 [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:28 +01:00
maelsoucaze
c79992d1cc [ticket/10254] Remove subsilver2 as default style on theme. 
PHPBB3-10254
 2011-11-14 13:29:18 +01:00
maelsoucaze
dee836315c [ticket/10254] Remove style names from themes and fix some informations on it. 
PHPBB3-10254
 2011-11-14 13:28:42 +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
David King
b371d62dd3 [ticket/7138] Allow simple header and footer for trigger_error() messages 
Adds a template condition using S_SIMPLE_MESSAGE that must be set to true
before calling trigger_error() which will automatically use the simple
header and footer files in the template directory instead of the overall
header and footer files.

PHPBB3-7138
 2011-11-13 16:30:11 +01:00
Igor Wiedler
00f792f16f Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus 
* bantu/ticket/10190:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
 2011-11-13 16:08:19 +01:00
Andreas Fischer
4c765bb206 Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympus 
* igorw/ticket/10365:
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10365] Require m_report permission to see reports in mcp_post
  [ticket/10365] Make sure moderators only get mcp_reports link when allowed
 2011-11-13 15:47:30 +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
52bd8c307f [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read 
PHPBB3-10365
 2011-11-13 15:37:26 +01:00
Andreas Fischer
f00f3ad8ea Merge remote-tracking branch 'nickvergessen/ticket/10437' into develop-olympus 
* nickvergessen/ticket/10437:
  [ticket/10437] Do not display announcements that are waiting for approval
 2011-11-13 15:35:18 +01:00
Joas Schilling
91155d1330 [ticket/10437] Do not display announcements that are waiting for approval 
PHPBB3-10437
 2011-11-13 15:33:47 +01:00
Andreas Fischer
2d989d4322 Merge remote-tracking branch 'nickvergessen/ticket/10435' into develop-olympus 
* nickvergessen/ticket/10435:
  [ticket/10435] Readd local announcements to total topic count in viewforum
 2011-11-13 14:13:42 +01:00
Igor Wiedler
edd5866a6e [ticket/10087] Organize bans in acp_baninto optgroups 
PHPBB3-10087
 2011-11-11 23:08:52 +01:00
Igor Wiedler
2b3effb13c [ticket/8616] Include old U_INBOX var for BC 
PHPBB3-8616
 2011-11-11 22:34:45 +01:00
Andreas Fischer
f3c9133a6c Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus 
* nickvergessen/ticket/10237:
  [ticket/10237] Display login-box for guests, when (un)subscribing
 2011-11-11 22:07:11 +01:00
Joas Schilling
0d3e9bf446 [ticket/10435] Readd local announcements to total topic count in viewforum 
We need to readd the local announcements to the forums total topic count,
otherwise the number is different from the one in the forum list.

PHPBB3-10435
 2011-11-11 14:06:02 +01:00
Joas Schilling
1a19388aa3 [ticket/10237] Display login-box for guests, when (un)subscribing 
Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
 2011-11-06 23:51:29 +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
945a63d204 Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus 
* nickvergessen/ticket/7932:
  [ticket/7932] Fix font size in select boxes
 2011-11-01 20:23:20 +01:00
Andreas Fischer
0b1199f7b2 Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus 
* nickvergessen/ticket/9036:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
 2011-11-01 20:08:17 +01:00
Igor Wiedler
18ca3a32bc [ticket/10365] Require m_report permission to see reports in mcp_post 
This was exposed to anyone with m_ perms in mcp_post_details.

PHPBB3-10365
 2011-10-30 19:10:58 +01:00
Igor Wiedler
d6c3e7785d [ticket/10365] Make sure moderators only get mcp_reports link when allowed 
The m_report permission is not not being checked when displaying the link to
mcp_reports.

PHPBB3-10365
 2011-10-30 19:10:57 +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
Joas Schilling
cf49b5f46f [ticket/7932] Fix font size in select boxes 
PHPBB3-7932
 2011-10-29 23:32:47 +02:00
Joas Schilling
da8cac280c [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist 
PHPBB3-9036
 2011-10-29 16:26:17 +02:00
Igor Wiedler
6d913d3646 Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus 
* cs278/ticket/9307:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.
 2011-10-29 13:01:03 +02:00
Igor Wiedler
319d12bedf Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus 
* bantu/ticket/10420:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
 2011-10-29 12:37:16 +02:00
Igor Wiedler
d0bbb3f7f0 Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympus 
* cyberalien/ticket/10422:
  [ticket/10422] Invalid "if" in viewtopic_body.html
 2011-10-29 12:35:30 +02:00
Igor Wiedler
020106eeb9 Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus 
* bantu/ticket/10421:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
 2011-10-29 12:32:25 +02:00
Igor Wiedler
17451e0842 Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-olympus 
* dellsystem/ticket/olympus/10430:
  [ticket/10430] Fix typos/etc in coding guidelines
 2011-10-29 12:22:02 +02:00
Igor Wiedler
5e3f73c498 Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympus 
* bantu/ticket/10259:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
 2011-10-29 11:43:28 +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
Andreas Fischer
fa23def774 [ticket/10190] Do not show hint about permissions when editing forum settings. 
PHPBB3-10190
 2011-10-29 00:16:30 +02:00
dellsystem
8b99f04943 [ticket/10430] Fix typos/etc in coding guidelines 
Mainly minor changes to correct errors and improve readability.

* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all

PHPBB3-10430
 2011-10-28 10:27:38 -04:00
Andreas Fischer
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php 
PHPBB3-10421
 2011-10-18 21:25:27 +02:00