1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:17:58 +02:00
Commit Graph

702 Commits

Author SHA1 Message Date
ce44e3908e [feature/avatars] Remove unnecessary abbreviations
PHPBB3-10018
2012-11-25 00:54:34 +01:00
5ff343f1e6 [feature/avatars] Remove duplicate form enctype
PHPBB3-10018
2012-11-22 11:58:45 +01:00
7521c077a9 [feature/avatars] Miscellaenous template fixes
PHPBB3-10018
2012-11-18 23:16:37 +01:00
c2ba24558f [feature/avatars] Fix local and upload avatar in the ACP
PHPBB3-10018
2012-11-18 23:11:40 +01:00
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
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
4c4b82416b [feature/avatars] Replace colon usage with {L_COLON}
PHPBB3-10018
2012-11-12 15:08:46 +01:00
4c9820d1ca [feature/avatars] add missing html closing tags and fix tabbing
PHPBB3-10018
2012-11-12 15:08:36 +01:00
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
b4f7f97a2c [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
PHPBB3-10780
2012-11-10 00:23:03 +01:00
d124cd2d59 [ticket/10780] Replace colon usage in adm template output with {L_COLON}
Same as 46a7940a97, but for ACP templates

PHPBB3-10780
2012-11-10 00:23:03 +01:00
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
99dd73aac7 [ticket/11018] Fix several paginations in ACP
PHPBB3-11018
2012-10-17 23:34:37 +02:00
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
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
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
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
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
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
323bbf9b52 [ticket/10631] Adjust prefixes to be easier to understand
PHPBB3-10631
2012-09-01 15:05:57 +01:00
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
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
36465c9a20 [ticket/10631] Functional acp_extensions test, cleanup
PHPBB3-10631
2012-09-01 15:05:49 +01:00
89f4cf6a8c [ticket/10631] Use exceptions for errors. Build action list dynamically.
PHPBB3-10631
2012-09-01 15:05:34 +01:00
106c105113 [ticket/10631] Fix some issues as noted in github comments, significantly simplified validation
PHPBB3-10631
2012-09-01 15:05:32 +01:00
2273ae2b34 [ticket/10631] Remove references to delete extension
PHPBB3-10631
2012-09-01 15:05:30 +01:00
9c0cd2693f [ticket/10631] Make the enable/disable/purge notices more visable.
PHPBB3-10631
2012-09-01 15:05:28 +01:00
8bbab088dd [ticket/10631] Validation for extensions
PHPBB3-10631
2012-09-01 15:05:23 +01:00
28ca2d6a5f [ticket/10631] Stagger the enable/disable/purge for extensions
PHPBB3-10631
2012-09-01 15:05:18 +01:00
bf6e91b5f3 [ticket/10631] Fixing some more issues
PHPBB3-10631
2012-09-01 15:05:16 +01:00
3ba59c6362 [ticket/10631] Various tidbits and cleanup on the acp extensions manager
PHPBB3-10631
2012-09-01 15:05:12 +01:00
18cd1262b2 [ticket/10631] Fixing up the template
PHPBB3-10631
2012-09-01 15:05:08 +01:00
4cbfa61753 [ticket/10631] A few more extension admin changes
PHPBB3-10631
2012-09-01 15:04:55 +01:00
7a954d352e [ticket/10631] Fixing some items mentioned in PR
PHPBB3-10631
2012-09-01 15:04:53 +01:00
913b3fb0c1 [ticket/10631] Changing Ext Admin List to conform to standards
PHPBB3-10631
2012-09-01 15:04:45 +01:00
8824ccb392 [ticket/10631] Add an extension details page
PHPBB3-10631
2012-09-01 15:04:35 +01:00
5e6b4c7192 [ticket/10631] Adding an extensions admin
PHPBB3-10631
2012-09-01 15:04:33 +01:00
9480a5e512 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
0e2a30a27b Merge branch 'develop' into feature/avatars
* develop: (201 commits)
  [feature/new-tz-handling] Don't use global user but make it a parameter
  [feature/new-tz-handling] Fix size of suggestion button in chrome
  [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
  [feature/new-tz-handling] Add previous selected value to validation if valid
  [feature/new-tz-handling] Display suggestion when a different value is selected
  [ticket/10998] Add border-radius to forum rules block - prosilver
  [feature/new-tz-handling] Remove additional marking of selected items
  [feature/new-tz-handling] Move update helper function to new class
  [feature/new-tz-handling] Fix unit test
  [feature/new-tz-handling] Delete old variable which is not used anymore
  [feature/new-tz-handling] Rename $user->tz back to $user->timezone
  [feature/pagination-as-list] New parameter for name of start var
  [feature/pagination-as-list] Updates for nils comments
  [feature/pagination-as-list] Rename and deprecate functions
  [feature/pagination-as-list] Various fixes and improvements
  [ticket/10968] Render pagination within the template
  [feature/new-tz-handling] Remove "timezone might be numeric"
  [feature/new-tz-handling] Add function to update the timezone
  [feature/new-tz-handling] Correctly update user and board timezones on update
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
  ...
2012-07-21 00:37:48 +02:00
ca43a8947a [ticket/11008] Remove eval() calls to get document[id]
PHPBB3-11008
2012-07-21 00:12:37 +02:00
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
dc71c0629e [feature/pagination-as-list] Various fixes and improvements
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.

PHPBB3-10968
2012-07-18 14:31:21 +01:00
922147f05a [ticket/10968] Render pagination within the template
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.

Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.

PHPBB3-10968
2012-07-18 14:30:20 +01:00
f4136eacdc Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling 2012-07-18 11:07:32 +02:00
4aabe0cd4d [ticket/10982] Remove overlay on first up/down move of forums in ACP
PHPBB3-10982
2012-07-11 14:54:31 +02:00
d998ad4b15 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:20:04 +02:00
625333ea2e [ticket/10773] ACP logo with registered trademark symbol
PHPBB3-10773
2012-06-30 12:21:37 -05:00
13f4bfabbe [feature/avatars] Fixup avatars.js rewrite
PHPBB3-10018
2012-06-27 21:00:00 +02:00
2f3581fe3e [feature/avatars] Add self-invoking closure around avatars.js
PHPBB3-10018
2012-06-27 18:37:23 +02:00