1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 22:58:10 +01:00

123 Commits

Author SHA1 Message Date
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
Meik Sievertsen
a43ead8ee7 do not get too excited
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-26 15:51:11 +00:00
Henry Sudhof
3d9b5e52d9 one too many
git-svn-id: file:///svn/phpbb/trunk@7829 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-03 15:17:24 +00:00
Henry Sudhof
52f5c7d1ee #12955 hideonline/viewonline again (minor)
git-svn-id: file:///svn/phpbb/trunk@7828 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-03 15:14:20 +00:00
Meik Sievertsen
3a5d433666 :P
git-svn-id: file:///svn/phpbb/trunk@7593 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 17:38:57 +00:00
Henry Sudhof
ec4b04ae82 The message shouldn't be displayed at all(now), unless there's foul play invlolved.
#10968


git-svn-id: file:///svn/phpbb/trunk@7592 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 17:14:25 +00:00
Henry Sudhof
0b94cfb702 Making logout somewhat more secure.
Language variables, take them while they're hot. (just one, so be quick)


git-svn-id: file:///svn/phpbb/trunk@7590 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-15 16:02:00 +00:00
Meik Sievertsen
290187c6c7 more bugfixing. Important change: admins able to give ban reason for user quick tool ban - logging also syndicated, now always logged to ACP and MCP logs.
git-svn-id: file:///svn/phpbb/trunk@7426 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-29 12:30:22 +00:00
Meik Sievertsen
8ba8caec2d some tiny bugfixes and changed is_active() a bit...
git-svn-id: file:///svn/phpbb/trunk@7232 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-26 15:42:05 +00:00
David M
6bc4b1412b #5280
git-svn-id: file:///svn/phpbb/trunk@7229 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-24 18:00:21 +00:00
Meik Sievertsen
576bb754e9 fixing some bugs, most being submitted grammatical/spelling errors.
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-21 18:33:45 +00:00
David M
5d42587e56 #7156
git-svn-id: file:///svn/phpbb/trunk@6892 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-17 01:36:51 +00:00
Meik Sievertsen
3c352ba4ef - fix some convertor bugs.
- added support for the validated birthday mod and fixed the integration of nils' birthday mod


git-svn-id: file:///svn/phpbb/trunk@6851 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-07 14:08:47 +00:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +02:00
Igor Wiedler
15883dfac2 [feature/request-class] Add $request to style.php, minor change
Add $request instantiation to style.php to allow request_var to
work properly.

Also remove unneeded globalization of $request in ucp.php.

PHPBB3-9716
2010-09-20 18:52:08 +02:00
Igor Wiedler
204ee4714b [feature/request-class] Removal of direct access to some superglobals
PHPBB3-9716
2010-09-17 14:08:41 +02:00
Nils Adermann
17a27175fd - allow login with redirect parameter
- altered URL regular expression so it won't cause problem with long URLs - PCRE >:( [Bug #6720]
- moderator list on index should have coloured groups in bold as everywhere else too
- correctly handle password requirements in UCP [Bug #6692]
- added soft-hyphen to utf8_clean_string(), if you know any more evil characters (or whitespace characters that are not in ASCII range) then tell me about them (bug report) ;-)


git-svn-id: file:///svn/phpbb/trunk@6832 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-03 18:58:19 +00:00
Meik Sievertsen
7ad986c37e - a bunch of fixes
- added todos to the updater to make sure i do not forget. :)


git-svn-id: file:///svn/phpbb/trunk@6698 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-02 13:19:40 +00:00