4672 Commits

Author	SHA1	Message	Date
Igor Wiedler	7779dae2cc	[ticket/9681] Add password length to security settings ... PHPBB3-9681	2011-12-23 00:42:13 -05:00
Oleg Pudeyev	37fa5e56f3	Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus ... * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)	2011-12-22 15:45:48 -05:00
Andreas Fischer	8f690d3475	Merge branch 'prep-release-3.0.10' into develop-olympus ... * prep-release-3.0.10: [ticket/10531] Disallow deleting of the last style	2011-12-16 16:17:40 +01:00
Andreas Fischer	56c3a66c28	Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10 ... * nickvergessen/ticket/10531: [ticket/10531] Disallow deleting of the last style	2011-12-16 16:03:20 +01:00
Joas Schilling	0cfa843677	[ticket/10531] Disallow deleting of the last style ... Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d PHPBB3-9675 PHPBB3-10531	2011-12-15 23:17:16 +01:00
Nils Adermann	2c7495e1c7	Merge branch 'prep-release-3.0.10' into develop-olympus ... * prep-release-3.0.10: [ticket/10319] Missing hidden fields in search form	2011-12-09 01:32:21 +01:00
Vjacheslav Trushkin	dfb7cc625a	[ticket/10319] Missing hidden fields in search form ... Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319	2011-12-09 01:31:41 +01:00
Oleg Pudeyev	bf6d501ab1	Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus ... * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files	2011-12-03 22:07:34 -05:00
Andreas Fischer	69cbb4ac1d	[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.	2011-12-04 00:22:10 +01:00
Vjacheslav Trushkin	74ae7d0339	[ticket/10399] Correctly encoding template component urls (3.0) ... Correctly encoding template component urls PHPBB3-10399	2011-12-01 01:46:33 +02:00
Andreas Fischer	ede3963951	Merge branch 'prep-release-3.0.10' into develop-olympus ... * prep-release-3.0.10: [ticket/10497] Fix SQL error when guest visits forum with unread topic	2011-11-27 16:13:11 +01:00
Andreas Fischer	b89320ad39	Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10 ... * rxu/ticket/10497: [ticket/10497] Fix SQL error when guest visits forum with unread topic	2011-11-27 16:12:39 +01:00
rxu	77e00d14a1	[ticket/10497] Fix SQL error when guest visits forum with unread topic ... Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008	2011-11-27 23:11:22 +08:00
Andreas Fischer	007457f182	[prep-release-3.0.10] Bumping version number for 3.0.10-RC2.	2011-11-26 22:17:43 +01:00
RMcGirr83	3ce5b1d386	[ticket/10280] Change the display of user activation settings in the ACP. ... Use a select box to be consistent with other settings. PHPBB3-10280	2011-11-25 01:27:44 -05:00
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