1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-27 11:02:51 +01:00

141 Commits

Author SHA1 Message Date
Marc Alexander
4cef4634fc
Merge pull request #5367 from JimMH/3.2.x
[ticket/15788] Fix return button for Privacy Policy
2018-10-13 15:44:24 -07:00
Jim Mossing Holsteyn
35d49f5150
[ticket/15788] Fix return button for Privacy Policy
Change the text from "Return to Login Page" to "Return to Previous page" as
the privacy policy can now be accessed through the footer so we could return
to any random previous page instead of just the login page.

PHPBB3-15788
2018-10-10 22:42:41 +02:00
Oliver Schramm
204b18dd59 [ticket/15607] Skip ban and disabled checks when deleting cookies
PHPBB3-15607
2018-09-14 11:21:55 +02:00
Tristan Darricau
109aaff534
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13608] Add core.ucp_restore_permissions event
2017-04-19 23:08:15 +02:00
Tristan Darricau
ff22d54eae
Merge pull request #4670 from senky/ticket/13608
[ticket/13608] Add core.ucp_restore_permissions event

* github.com:phpbb/phpbb:
  [ticket/13608] Add core.ucp_restore_permissions event
2017-04-19 23:08:15 +02:00
Tristan Darricau
40e4a6ea87
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13609] Add core.ucp_switch_permissions event
2017-04-19 23:04:11 +02:00
Jakub Senko
15f6d66a61
[ticket/13608] Add core.ucp_restore_permissions event
PHPBB3-13608
2017-01-23 14:54:49 +01:00
Jakub Senko
927c211d41
[ticket/13609] Add core.ucp_switch_permissions event
PHPBB3-13609
2017-01-23 14:04:02 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
MasterShredder
655d95002c [ticket/13422] Renamed event
PHPBB3-13422
2014-12-28 13:20:04 +04:00
MasterShredder
0a1f8388d0 [ticket/13422] Changed some spaces to tabs
PHPBB3-13422
2014-12-28 03:44:07 +04:00
MasterShredder
50ed202aac [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event core.ucp_save_custom_cookies
PHPBB3-13422
2014-12-27 17:43:30 +04:00
MasterShredder
4700b44125 [ticket/13422] Add new event core.ucp_save_custom_cookies
PHPBB3-13422
2014-12-07 05:52:24 +04:00
Joas Schilling
de103f60e3 [ticket/12612] Move function from ucp.php to functions_user.php
PHPBB3-12612
2014-06-18 16:57:13 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Joas Schilling
b32895308d [ticket/12273] Update since version to 3.1.0-a* style
PHPBB3-12273
2014-04-25 12:15:44 +02:00
Oliver Schramm
1a56400a45 [ticket/12360] Fix duplicated creation of session when logging out the user
In 7d8b578 this line was introduced to fix a bug with style.php.

Later since 1d42d1b a new session is always created after
killing the old one.

This causes a duplicated creation of the session everytime
the user logs itself out.

PHPBB3-12360
2014-04-06 23:49:20 +02:00
geetakshi
76f7ef5c83 [ticket/11360] Updating default value of $display_online_list
PHPBB3-11360
2014-03-24 00:12:40 +05:30
geetakshi
18bed2ea47 [ticket/11360] Change second parameter in page_header function
PHPBB3-11360
2014-03-19 19:55:55 +05:30
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits)
  [ticket/11735] Display disabled checkbox in subsilver for read notifications
  [ticket/11735] Display disabled checkbox when notification is already read
  [ticket/11844] update acp/authentication language var
  [ticket/11795] Remove PM popup
  [ticket/11795] Remove outdated comment from forum_fn.js
  [ticket/11795] Move find user JS to forum_fn
  [ticket/11795] Replace TWIG with phpBB syntax in ACP
  [ticket/11795] Move MSN scripts to forum_fn.js
  [ticket/11795] Use phpBB template syntax instead of TWIG
  [ticket/11795] Move PM popup JS to forum_fn.js
  [ticket/11795] Get rid of pagination JS variables
  [ticket/11795] Get rid of onload_functions
  [ticket/11795] Use data-reset-on-edit attr to reset elements
  [ticket/11795] Redo form elements auto-focus
  [ticket/11811] Remove outline on :focus
  [ticket/11836] Fix subsilver fatal error
  [ticket/11837] Replace escaped single quote with utf-8 single quote
  [ticket/11836] Fix fatal error on unsupported provider for auth link
  [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
  [ticket/11809] Ensure code.js is first script included after jQuery
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/develop/create_schema_files.php
	phpBB/develop/mysql_upgrader.php
	phpBB/download/file.php
	phpBB/includes/bbcode.php
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/phpbb/controller/helper.php
	phpBB/phpbb/controller/resolver.php
	phpBB/phpbb/request/request_interface.php
	phpBB/phpbb/session.php
	phpBB/phpbb/style/extension_path_provider.php
	phpBB/phpbb/style/path_provider.php
	phpBB/phpbb/style/path_provider_interface.php
	phpBB/phpbb/style/resource_locator.php
	phpBB/phpbb/style/style.php
	phpBB/phpbb/template/locator.php
	phpBB/phpbb/template/template.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/node/includecss.php
	phpBB/phpbb/template/twig/node/includejs.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/di/create_container_test.php
	tests/extension/style_path_provider_test.php
	tests/notification/notification_test.php
	tests/session/continue_test.php
	tests/session/creation_test.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-16 01:24:05 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Joseph Warner
4683c37682 [feature/oauth] Forgot to have login_link be "in login" in ucp
PHPBB3-11673
2013-08-05 17:35:44 -04:00
Joseph Warner
317a71a838 [feature/oauth] Template for ucp_login_link started
PHPBB3-11673
2013-07-25 12:49:54 -04:00
Joseph Warner
fcac58e065 [feature/oauth] Have login_link loaded in ucp.php
PHPBB3-11673
2013-07-25 11:41:19 -04:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page
PHPBB3-11685
2013-07-13 12:27:00 -04:00
Andreas Fischer
c9ad0c6f25 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php
2012-10-29 15:16:59 -04:00
Oleg Pudeyev
88bd7292f1 [ticket/11158] Revert old fix in PHPBB3-10186.
Revert "[ticket/10186] UCP signature panel displays when not authed
for signatures"

This reverts commit f6fa52540c0fb20d79b4d59cb08c49484d9f3116.

PHPBB3-10186
PHPBB3-11158
2012-10-29 14:58:19 -04:00
Joas Schilling
b153637cb8 [feature/php-events] Fix naming and doc of core.ucp_display_module_before
PHPBB3-9550
2012-08-03 23:41:00 +02:00
Michael Cullum
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Joas Schilling
34a8563942 [feature/events] Adding ledge ucp_modules
Used by phpBB Gallery

PHPBB3-9550
2012-08-01 10:17:07 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +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
Alan
f7c1341402 [ticket/8616] Direct links in pm notification emails
Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
2011-10-13 19:17:56 +02:00
Andreas Fischer
1f4b4aee9d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10186] UCP signature panel displays when not authed for signatures
2011-05-13 01:29:57 +02:00
RMcGirr83
f6fa52540c [ticket/10186] UCP signature panel displays when not authed for signatures
The signature panel link was displayed even when a user did not have the
auths to create/edit their signature. Clicking on the link gave a
trigger_error of "Not authorised to have a signature". Hide the link
when user does not have permissions to edit their signature.

PHPBB3-10186
2011-05-12 19:25:20 -04:00
Andreas Fischer
889eace41c [ticket/9785] Allow users to request new passwords when board is disabled.
PHPBB3-9785
2010-08-22 20:26:18 +02:00
Meik Sievertsen
5b004f31b5 We only remove board cookies (this is what the feature is supposed to do). This also solves issues with headers having > 20 Set-Cookie calls (which in turn breaks varnish 2.0.4-rc1 too)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10090 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-03 09:25:16 +00:00
Henry Sudhof
d376811e7f require link hash for switchperm
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9915 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-03 13:32:52 +00:00
Chris Smith
ca627c2778 Remove redundant SQL query from ucp.php. #40305
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9778 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-18 10:12:17 +00:00
Meik Sievertsen
f9bbf10a80 - Fix XHTML for r9666
- Utilize $captcha->solved property
- Only validate captcha once to retain captcha mode over switching from/to agreement page


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9668 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-24 10:08:18 +00:00
Meik Sievertsen
1dc9f30a8b remove exit statement and make sure no "additional" code gets executed
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8915 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:30:52 +00:00
Meik Sievertsen
d22e2697e9 Fix some instances where we left db connections open (registration -> captcha for example)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8655 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-13 19:39:01 +00:00
Nils Adermann
fd57f020f7 removed executable props [Bug #6464]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8598 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-04 15:37:06 +00:00
Meik Sievertsen
e6c79242e6 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:30:11 +00:00
Meik Sievertsen
1d004b925f necessary changes...
git-svn-id: file:///svn/phpbb/trunk@8072 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-30 21:21:16 +00:00
Meik Sievertsen
48db93349e *** empty log message ***
git-svn-id: file:///svn/phpbb/trunk@7966 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-28 09:19:29 +00:00