1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-13 21:26:28 +02:00
Commit Graph

6410 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
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
2012-10-18 16:26:54 +02:00
0a260f80af Merge PR #918 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:31:35 -04:00
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:10:49 -04: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
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:21:03 -04:00
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:31:03 -04:00
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:30:45 -04:00
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
f1a692a5f4 Merge PR #956 branch 'dhruvgoel92/ticket/11051' into develop
* dhruvgoel92/ticket/11051:
  [ticket/11051] fix spaces
  [ticket/11051] add common_words variable
  [ticket/11051] remove unnecessary comment
  [ticket/11051] add get_word_len() in sphinx search
  [ticket/11051] use get_word_length in search backend
  [ticket/11051] use get_common_words in search backend
  [ticket/11051] function instead of accessing property in search
  [ticket/11051] add public functions for public properties
2012-10-10 00:39:29 -04:00
39258c9452 Merge PR #990 branch 'bantu/ticket/11100' into develop
* bantu/ticket/11100:
  [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
2012-10-10 00:18:25 -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
cf810fb775 [ticket/11140] Fix an error from an incorrect variable name
PHPBB3-11140
2012-10-09 22:00:28 -05:00
305abfde96 [ticket/11051] fix spaces
PHPBB3-11051
2012-10-08 10:58:04 +05:30
52b25aaf20 [ticket/11051] add get_word_len() in sphinx search
get_word_len() for sphinx search backend returns false always and
triggers proper error.

PHPBB3-11051
2012-10-04 01:51:57 +05:30
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
238fab3bb9 [ticket/8713] Update untrimmed_variable() doc block.
PHPBB3-8713
2012-09-09 21:53:17 +02:00
73a75fc3d3 [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.
Currently only auth_db is supported there and the password needs to be trimmed
for compatibility because user_password stores

  phpbb_hash(htmlspecialchars(trim($password)))

Setting passwords for other auth modules is currently not supported.

Once setting/changing passwords is supported by auth plugins, the
untrimmed_variable() should be used here and the result should be passed
to the auth plugin.

PHPBB3-8713
2012-09-09 21:10:29 +02:00
8a91598b14 Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop 2012-09-08 15:58:25 -04:00
1e05fd4c62 [ticket/8713] Trim password in auth_db to keep compatibility.
PHPBB3-8713
2012-09-08 15:01:29 +02:00
cc0c378caf [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.
PHPBB3-8713
2012-09-08 14:42:38 +02:00
f2607fc9e8 [ticket/8713] Rename untrimed_variable() to untrimmed_variable().
PHPBB3-8713
2012-09-08 14:15:56 +02:00
b62c37c579 [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.
PHPBB3-8713
2012-09-08 14:09:12 +02:00
c3e0d1b6d1 [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.
PHPBB3-8713
2012-09-08 14:07:42 +02:00
798033075b [ticket/8713] Always trim array keys.
PHPBB3-8713
2012-09-08 14:07:06 +02:00
552233d8fd [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.
PHPBB3-11100
2012-09-08 01:12:34 +02:00
c93b3827dc [ticket/11092] phpbb_gen_download_links strict standards errors
Two strict standards errors in phpbb_gen_download_links

PHPBB3-11092
2012-09-07 11:29:47 -05: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
9cba0b5263 [ticket/8796] Mark read links updated to include time() in url
Submitting the current time() allows us to mark only the topics
and forums read up until a certain time (when the user loaded
the page). This means that any new posts or topics posted between
when the user opened the page and clicked the link are still
shown as unread.

PHPBB3-8796
2012-09-03 18:51:29 -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
81f7f28cc3 [ticket/10631] Removing un-needed TODOs that are no longer needed.
PHPBB3-10631
2012-09-01 21:30:35 +01:00
79da1ea592 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
2012-09-01 21:15:39 +01:00
43190ebeca Merge pull request #962 from imkingdavid/feature/add_events
Feature/add events
2012-09-01 12:44:23 -07:00