1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1104 Commits

Author SHA1 Message Date
Marc Alexander
b42ca792fd [feature/avatars] Minor variable naming fixes
PHPBB3-10018
2012-12-04 00:49:37 +01:00
Marc Alexander
ce44e3908e [feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
2012-11-25 00:54:34 +01:00
Marc Alexander
5ff343f1e6 [feature/avatars] Remove duplicate form enctype
PHPBB3-10018
2012-11-22 11:58:45 +01:00
Marc Alexander
7521c077a9 [feature/avatars] Miscellaenous template fixes
PHPBB3-10018
2012-11-18 23:16:37 +01:00
Marc Alexander
c2ba24558f [feature/avatars] Fix local and upload avatar in the ACP
PHPBB3-10018
2012-11-18 23:11:40 +01:00
Marc Alexander
959bc183bf [feature/avatars] Handle deletion of avatars
Previously this wasn't handled correctly if at all.

PHPBB3-10018
2012-11-18 23:09:09 +01:00
Oleg Pudeyev
44d6dc4c4c [feature/template-events] Convert a single style name to array of them.
This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
2012-11-17 16:42:40 -05:00
Marc Alexander
c70cbfac43 [feature/avatars] Fix acp front-end of user and group avatars
Due to the changes to the avatar manager etc. these had to be updated.

PHPBB3-10018
2012-11-17 00:50:23 +01: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
a05a73e047 [ticket/10411] Use new ajax callback name row_up/row_down
PHPBB3-10411
2012-11-15 21:53:55 +01:00
Joas Schilling
4db6ded8f0 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11190-develop] Functional tests purge cache before running.
  [ticket/11190] Functional tests purge cache before running.
2012-11-15 18:21:38 +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
Joas Schilling
a9ed479e14 [ticket/10411] Use AJAX to move items up/down and delete them
PHPBB3-10411
2012-11-14 15:55:51 +01:00
Joas Schilling
6a27a95f30 [ticket/10411] Use new teampage and legend class in ACP and memberlist
PHPBB3-10411
2012-11-14 02:01:15 +01:00
Joas Schilling
8ee908d32e [ticket/10411] Remove duplicated ids from the template
PHPBB3-10411
2012-11-13 12:14:39 +01:00
Marc Alexander
4c4b82416b [feature/avatars] Replace colon usage with {L_COLON}
PHPBB3-10018
2012-11-12 15:08:46 +01:00
Marc Alexander
4c9820d1ca [feature/avatars] add missing html closing tags and fix tabbing
PHPBB3-10018
2012-11-12 15:08:36 +01:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +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
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable
PHPBB3-11139
2012-10-15 14:32:49 -03:00
Vinny
5db30e66fd [ticket/11139] Fix fatal error on colour swatch window
PHPBB3-11139
2012-10-09 00:31:59 -03: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
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02: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
Michael Cullum
913b3fb0c1 [ticket/10631] Changing Ext Admin List to conform to standards
PHPBB3-10631
2012-09-01 15:04:45 +01:00