1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 00:40:56 +02:00
Commit Graph

1094 Commits

Author SHA1 Message Date
6bf60ac5cb Merge PR #971 branch 'nickvergessen/ticket/11018' into develop
* nickvergessen/ticket/11018:
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  [ticket/11014] Fix text for previous/next links in Subsilver2
  [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
  [ticket/11018] Always display previous/next links if we can display one
  [ticket/11014] Restore template vars for next/previous links
  [ticket/11018] Swap prev/next links on pagination to the old order
  [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
  [ticket/11018] Fix minor issues with CSS in prosilver
  [ticket/11018] Attempt to fix li.pagination alignment issue
2012-10-22 17:44:34 -04:00
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
2012-10-18 16:43:46 +02:00
4f3f4a40d6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php
2012-10-18 16:34:59 +02:00
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
PHPBB3-11023
2012-10-17 23:34:37 +02:00
5ea662f649 [ticket/11014] Restore template vars for next/previous links
They were dropped while the function was refactored:

If the block_var_name is a nested block, we will use the last (most inner)
block as a prefix for the template variables. If the last block name is
pagination, the prefix is empty. If the rest of the block_var_name is not
empty, we will modify the last row of that block and add our pagination items.

PHPBB3-11014
2012-10-17 23:33:18 +02:00
fa5753de70 [ticket/11018] Swap prev/next links on pagination to the old order
In the old pagination Prev was left of the pagination and Next right of the
pagination. While moving these blocks, I also removed the whitespaces, which
were introduced.

PHPBB3-11023
PHPBB3-11018
2012-10-17 23:33:18 +02:00
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04:00
cc5923ea43 Merge PR #993 branch 'bantu/ticket/8713' into develop
* bantu/ticket/8713:
  [ticket/8713] Update untrimmed_variable() doc block.
  [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
  [ticket/8713] Trim password in auth_db to keep compatibility.
  [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
  [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
  [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
  [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
  [ticket/8713] Always trim array keys.
  [ticket/8713] Add simple (non-nested) test case for untrimmed set_var().
  [ticket/8713] Use \t in double quotes instead of tabs.
  [ticket/8713] Use correct parameter for nested data.
  [ticket/8713] Adjust test method name to other recursive_set_var() tests.
  [ticket/8713] Do not trim login inputs
2012-10-10 00:03:13 -04:00
fca0811943 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php
2012-10-02 17:03:06 +02:00
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
51862f151d [ticket/8796] Prevent setting post_time greater than time() in markread
PHPBB3-8796
2012-09-30 10:29:43 -05:00
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
480e3daede [ticket/11021] Remove unnecessary line spacing in functions.php
PHPBB3-11021
2012-09-15 10:46:03 -05:00
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
fccbf09e4a [ticket/8796] Fix a few issues with the previous commits
Fix an SQL error and the redirect url generated

PHPBB3-8796
2012-09-03 18:58:38 -05:00
b9308329cf [ticket/8796] Revert changes to $user->data['lastmark']
The earlier change might change the way some things work
(after looking at viewtopic) and I'd rather not risk introducing
new bugs, so I'm going to revert those changes to be safe.

PHPBB3-8796
2012-09-03 18:37:54 -05:00
815cc4a9a3 [ticket/8796] Make function markread obey the $post_time argument
Also do a little cleanup of the markread function

PHPBB3-8796
2012-09-03 18:23:36 -05:00
b3cd5a649b [ticket/8713] Do not trim login inputs
Create a function to request variables which are not trimmed.

All requests for passwords (except forum passwords) now use the
untrimmed request function.

PHPBB3-8713
2012-09-03 13:32:33 -05:00
43190ebeca Merge pull request #962 from imkingdavid/feature/add_events
Feature/add events
2012-09-01 12:44:23 -07:00
4fde4abe55 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
2012-09-01 17:06:59 +02:00
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
PHPBB3-10758
2012-09-01 10:37:44 -04:00
6c6b179dd4 [feature/add_events] Rename override to overwrite, made docs 79 chars/line
PHPBB3-9550
2012-08-21 11:25:52 -04:00
0ba755f1bd [feature/add_events] Rename core.append_sid_override to just core.append_sid
Also, I added the hook back in below the event for backwards compatibility.

PHPBB3-9550
2012-08-20 20:45:09 -04:00
808af65819 [feature/add_events] Globalize the event dispatcher object
PHPBB3-9550
2012-08-20 12:01:08 -04:00
abc0ee753d [feature/add_events] Return the correct variable
PHPBB3-9550
2012-08-20 11:57:43 -04:00
fbdc956a1c [feature/add_events] Replaced current append_sid() hook with new event
The new event, core.append_sid_override can either supplement or override
the append_sid() function.

PHPBB3-9550
2012-08-20 11:52:06 -04:00
93912a2649 [feature/php-events] Remove double space in comments
PHPBB3-9550
2012-08-05 23:11:36 +02:00
e926ec9934 [feature/php-events] Add docs for core.garbage_collection
PHPBB3-9550
2012-08-05 16:51:51 +02:00
997075a008 [feature/php-events] Add docs for core.page_footer
PHPBB3-9550
2012-08-05 16:46:57 +02:00
1f9b23e721 [feature/php-events] Add docs for core.page_header
PHPBB3-9550
2012-08-05 16:42:46 +02:00
3a9b7c9acf [feature/php-events] Remove duplicated event and name the events properly
PHPBB3-9550
2012-08-01 10:18:49 +02:00
c51e8716c5 [feature/events] Add blank line
Add an additional blank line as requested in #680

PHPBB3-9550
2012-08-01 10:18:48 +02:00
e21861b488 [feature/events] Adding core.garbage_collection event
See: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=42799
for reference.

PHPBB3-9550
2012-08-01 10:18:47 +02:00
3d4946f5f0 [feature/events] Fixing events issues
PHPBB3-9550
2012-08-01 10:18:46 +02:00
1a1ae60d8d [feature/events] Add core.page_footer_override
Add a ledge that will allow listeners to override the build in
`page_footer` function.
http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=42741&p=237037

PHPBB3-9550
2012-08-01 10:18:45 +02:00
6b1ca27a86 [feature/events] Add core.page_header_override
Add a ledge that will allow listeners to override the build in
`page_header` function.
http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=42741&p=237037

PHPBB3-9550
2012-08-01 10:18:45 +02:00
a247bfc2b6 [feature/events] Fixing issues with events
PHPBB3-9550
2012-08-01 10:18:45 +02:00
1aa7bc81f6 [feature/events] Remove unnecessary ledge common_template_vars
core.page_header is more powerful and includes all functionality of this one.

PHPBB3-9550
2012-08-01 10:18:43 +02:00
eda9bcc65d [feature/events] Add core.common_template_vars ledge
Needed by board3portal

PHPBB3-9550
2012-08-01 10:17:05 +02:00
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
737828f009 Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
2012-07-19 08:46:25 -07:00
7df1c84447 [feature/new-tz-handling] Don't use global user but make it a parameter
PHPBB3-9558
2012-07-19 17:41:27 +02:00
6de222065e [feature/new-tz-handling] Add previous selected value to validation if valid
We also add the selected timezone if we can create an object with it.
DateTimeZone::listIdentifiers seems to not add all identifiers to the list,
because some are only kept for backward compatible reasons. If the user has
a deprecated value, we add it here, so it can still be kept. Once the user
changed his value, there is no way back to deprecated values.

PHPBB3-9558
2012-07-19 14:36:20 +02:00
d099ef8cad [feature/new-tz-handling] Display suggestion when a different value is selected
PHPBB3-9558
2012-07-19 14:24:59 +02:00
81627e2888 [feature/new-tz-handling] Remove additional marking of selected items
PHPBB3-9558
2012-07-18 18:59:25 +02:00