mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
15,202 Commits 17 Branches 190 Tags
Commit Graph

706 Commits

Author SHA1 Message Date
Marc Alexander
b5cc1ed683 [ticket/10949] Converted missing code to new JS coding guidelines 
A few missing semi-colons were also added where needed.

PHPBB3-10949
 2013-01-04 22:46:12 +01:00
Oleg Pudeyev
4dcc8cabae Merge PR #1130 branch 'EXreaction/ticket/11259' into develop 
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
 2012-12-29 13:45:40 -05:00
David King
a686e66c85 [feature/events] Remove extraneous space 
PHPBB3-9550
 2012-12-17 18:16:39 -05:00
David King
11035eb4c4 [feature/events] Append "_append" to acp_simple_header_head 
PHPBB3-9550
 2012-12-17 11:37:44 -05:00
David King
4e8ee1e6b9 [feature/events] acp_simple_footer_end -> acp_simple_footer_after 
PHPBB3-9550
 2012-12-17 11:37:43 -05:00
David King
79ea26409b [feature/events] Append "_append" to acp_overall_header_head 
PHPBB3-9550
 2012-12-17 11:37:42 -05:00
David King
c0652a7236 [feature/events] Change _end suffix to _after in acp_overall_footer_end 
PHPBB3-9550
 2012-12-17 11:37:41 -05:00
David King
cdfac59944 [feature/events] Append "_append" to acp_users_overview_options 
PHPBB3-9550
 2012-12-17 11:37:39 -05:00
David King
530be9106c [feature/events] Fix names of events in adm/style/acp_main.html 
PHPBB3-9550
 2012-12-17 11:37:38 -05:00
David King
ae93bd4e80 [feature/events] Append "_append" to acp_forums_normal_settings 
PHPBB3-9550
 2012-12-17 11:37:37 -05:00
Joas Schilling
b20e91b877 [feature/events] Rename event_main_actions to acp_main_actions 
PHPBB3-9550
 2012-12-17 11:37:35 -05:00
Michael Cullum
3c8fb03785 [feature/events] Adding acp prefix to acp event names 
PHPBB3-9550
 2012-12-17 11:37:28 -05:00
Michael Cullum
d913a508a2 [feature/events] Adding forums_normal_settings acp template ledge 
PHPBB3-9550
 2012-12-17 11:37:22 -05:00
Michael Cullum
1f9b662964 [feature/events] Adding simple_footer_end acp template event 
PHPBB3-9550
 2012-12-17 11:37:21 -05:00
Michael Cullum
6a29de3f1b [feature/events] Adding simple_header_head acp template event 
PHPBB3-9550
 2012-12-17 11:37:20 -05:00
Michael Cullum
c7b2665160 [feature/events] Add users_overview_options acp template event 
PHPBB3-9550
 2012-12-17 11:37:19 -05:00
Michael Cullum
9ba18a21f0 [feature/events] Add overall_footer_end acp template event 
PHPBB3-9550
 2012-12-17 11:37:18 -05:00
Michael Cullum
44afff6b74 [feature/events] Adding overall_header_head acp template event 
PHPBB3-9550
 2012-12-17 11:37:16 -05:00
Michael Cullum
e6d1b07e2b [feature/events] Add main_actions acp template event 
PHPBB3-9550
 2012-12-17 11:37:15 -05:00
Michael Cullum
bc99e69f77 [feature/events] Add main_notice ACP template event 
PHPBB3-9550
 2012-12-17 11:37:14 -05:00
Nathan Guse
6dee253941 [ticket/11259] Make phpbb_admin_path available everywhere 
PHPBB3-11259
 2012-12-09 17:01:08 -06:00
Joas Schilling
c7f701c1e7 [ticket/11209] Clone disable moving images to allow multiple per page 
The disable images need to be clone rather then moved, in order to allow
multiple disable images per page. We do not have such a case at the moment
but it will be required for the new teampage/legend ACP section.

PHPBB3-11209
 2012-11-16 11:41:39 +01:00
Joas Schilling
132163d4ec [ticket/11198] Remove additional asterix as /** is doc-block only 
PHPBB3-11198
 2012-11-15 16:26:36 +01:00
Joas Schilling
e39947e57e [ticket/11198] Store the swapping partners in vars and simplify the logic 
PHPBB3-11198
 2012-11-14 23:30:29 +01:00
Joas Schilling
857298e748 [ticket/11198] Correctly set links after an item is moved up/down with AJAX 
PHPBB3-11198
 2012-11-14 16:31:46 +01:00
Andreas Fischer
b4f7f97a2c [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. 
PHPBB3-10780
 2012-11-10 00:23:03 +01:00
Nathan Guse
d124cd2d59 [ticket/10780] Replace colon usage in adm template output with {L_COLON} 
Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates

PHPBB3-10780
 2012-11-10 00:23:03 +01:00
Oleg Pudeyev
87ea50948e Merge remote-tracking branch 'upstream/develop' into feature/prune-users 
* upstream/develop: (2171 commits)
  [ticket/11164] Update composer.phar
  [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
  [ticket/10933] Dependency inject template context.
  [ticket/10933] Expanded prose documentation for phpbb_extension_provider.
  [ticket/10933] Specify empty template path for absolute includephp test.
  [ticket/10933] Useful documentation for template locate function
  [ticket/10933] Typo fixes
  [ticket/10933] Initialize template context when template is constructed.
  [ticket/11099] Mark acp_ban::display_ban_options() as static.
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
  [ticket/11159] static public is the currently approved order.
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
  [ticket/10848] Move include up.
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  ...

Conflicts:
	phpBB/includes/functions_user.php
 2012-11-06 11:11:27 -05:00
Joas Schilling
99dd73aac7 [ticket/11018] Fix several paginations in ACP 
PHPBB3-11018
 2012-10-17 23:34:37 +02:00
Joas Schilling
43a713ea83 [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same 
PHPBB3-11067
PHPBB3-11018
 2012-10-17 23:30:57 +02:00
Oleg Pudeyev
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop 
* nickvergessen/ticket/10982:
  [ticket/10982] Correctly check, whether data-overlay is set
  [ticket/10982] Remove overlay on first up/down move of forums in ACP
  [ticket/10982] Allow setting dimming control overlay also as data-overlay
 2012-10-16 21:47:13 -04:00
Andreas Fischer
60acba81d1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:25 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd> 
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
 2012-10-16 14:39:32 +02:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
 2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https 
PHPBB3-11135
 2012-10-05 21:18:59 -03:00
Unknown Bliss
323bbf9b52 [ticket/10631] Adjust prefixes to be easier to understand 
PHPBB3-10631
 2012-09-01 15:05:57 +01:00
Nathan Guse
7b643fe8a5 [ticket/10631] Make failure to meet ext enable requirements clearer 
Turn the blocks red on the details page if requirement is not met.

Also changing a how the errors come up when trying to enable/disable
an extension when they cannot be.

PHPBB3-10631
 2012-09-01 15:05:56 +01:00
Nathan Guse
dce04b2d03 [ticket/10631] Various front-end fixes (extensions manager) 
Add Back button from details

Add cancel button from actions

Correct language strings

PHPBB3-10631
 2012-09-01 15:05:54 +01:00
Nathan Guse
36465c9a20 [ticket/10631] Functional acp_extensions test, cleanup 
PHPBB3-10631
 2012-09-01 15:05:49 +01:00
Nathan Guse
89f4cf6a8c [ticket/10631] Use exceptions for errors. Build action list dynamically. 
PHPBB3-10631
 2012-09-01 15:05:34 +01:00
Nathan Guse
106c105113 [ticket/10631] Fix some issues as noted in github comments, significantly simplified validation 
PHPBB3-10631
 2012-09-01 15:05:32 +01:00
Nathan Guse
2273ae2b34 [ticket/10631] Remove references to delete extension 
PHPBB3-10631
 2012-09-01 15:05:30 +01:00
Nathan Guse
9c0cd2693f [ticket/10631] Make the enable/disable/purge notices more visable. 
PHPBB3-10631
 2012-09-01 15:05:28 +01:00
Nathan Guse
8bbab088dd [ticket/10631] Validation for extensions 
PHPBB3-10631
 2012-09-01 15:05:23 +01:00
Nathan Guse
28ca2d6a5f [ticket/10631] Stagger the enable/disable/purge for extensions 
PHPBB3-10631
 2012-09-01 15:05:18 +01:00
Nathan Guse
bf6e91b5f3 [ticket/10631] Fixing some more issues 
PHPBB3-10631
 2012-09-01 15:05:16 +01:00
Nathan Guse
3ba59c6362 [ticket/10631] Various tidbits and cleanup on the acp extensions manager 
PHPBB3-10631
 2012-09-01 15:05:12 +01:00
Michael Cullum
18cd1262b2 [ticket/10631] Fixing up the template 
PHPBB3-10631
 2012-09-01 15:05:08 +01:00
Michael Cullum
4cbfa61753 [ticket/10631] A few more extension admin changes 
PHPBB3-10631
 2012-09-01 15:04:55 +01:00
Michael Cullum
7a954d352e [ticket/10631] Fixing some items mentioned in PR 
PHPBB3-10631
 2012-09-01 15:04:53 +01:00