mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 22:10:14 +02:00
Code Issues Releases Wiki Activity
10,776 Commits 18 Branches 192 Tags
Commit Graph

4655 Commits

Author SHA1 Message Date
Oleg Pudeyev
d13ce7f560 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10461] Add a comment explaining the logic here.
  [ticket/10461] Correct $log_count check in view_log() so we show logs again.
 2011-11-23 20:39:11 -05:00
Oleg Pudeyev
a72ea2bc98 [ticket/10461] Add a comment explaining the logic here. 
PHPBB3-10461
 2011-11-23 18:15:45 -05:00
Andreas Fischer
6f40960071 [ticket/10461] Correct $log_count check in view_log() so we show logs again. 
We pass $log_count as false now when we do not need to know how many log
entries there are. However when $log_count is false, $log_count == 0 will be
true as well and thus we will return early with 0.

PHPBB3-9874
PHPBB3-10461
 2011-11-23 23:03:41 +01:00
Andreas Fischer
a9d7b1f9a1 [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. 2011-11-21 00:57:53 +01:00
Andreas Fischer
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 16:35:31 +01:00
Andreas Fischer
a7077c9149 [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 14:02:22 +01:00
Oleg Pudeyev
c68973a9e0 [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. 
PHPBB3-10446
 2011-11-20 04:17:42 -05:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition. 
PHPBB3-10446
 2011-11-20 04:15:44 -05:00
Oleg Pudeyev
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus 
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
 2011-11-20 00:15:48 -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
Chris Smith
810016ce94 [ticket/10239] Correct undefined variable error. 
PHPBB3-10239
 2011-11-18 21:29:02 +00:00
Nils Adermann
4be9c70827 Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-olympus 
* github-nickvergessen/ticket/9776:
  [ticket/9776] Delete poll if no poll options were submitted.
 2011-11-18 20:31:26 +01:00
Joas Schilling
4fae5eef68 [ticket/9776] Delete poll if no poll options were submitted. 
PHPBB3-9776
 2011-11-18 20:29:50 +01:00
Nils Adermann
6894477b60 Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus 
* github-nickvergessen/ticket/9956:
  [ticket/9956] Display error message if no disapprove reason given
 2011-11-18 19:41:10 +01:00
Nils Adermann
cfaf0e1e96 Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop-olympus 
* github-nickvergessen/ticket/10296:
  [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
  [ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
 2011-11-18 19:17:20 +01:00
Joas Schilling
a7d7083d75 Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympus 2011-11-18 15:22:01 +01: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
dmauri
3d893c8222 [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle 
PHPBB3-10296
 2011-11-15 22:19:45 +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
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
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
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
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
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
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
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
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
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
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
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
Callum Macrae
8795362879 [ticket/10402] Fixed a formatting issue with report details. 
Line returns were being removed and links weren't being made clickable.
This commit adds a line (contributed by AmigoJack) to retain the link
breaks and make links clickable.

PHPBB3-10402
 2011-10-22 23:03:49 +01: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
Andreas Fischer
cd184e4912 [ticket/10420] Update includes/startup.php for PHP 5.4. 
PHP 5.4 dropped support for register globals and magic quotes.

Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an
E_CORE_ERROR error.

PHPBB3-10420
 2011-10-18 21:16:42 +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
8f6cfc77d2 [ticket/10259] Do not send notifications to user accounts joining free groups. 
It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
 2011-10-17 19:10:41 +02: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
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus 
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:38 +02:00