Joas Schilling
b0bfe724fb
[ticket/11014] Fix old pagination assignment
...
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
99dd73aac7
[ticket/11018] Fix several paginations in ACP
...
PHPBB3-11018
2012-10-17 23:34:37 +02:00
Joas Schilling
7ce43d49d8
[ticket/11014] Fix IF statements for new template pagination
...
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622
[ticket/11014] Fix text for previous/next links in Subsilver2
...
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
ceb5a40eec
[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
...
PHPBB3-11023
2012-10-17 23:34:37 +02:00
Joas Schilling
ada2d4c91b
[ticket/11018] Always display previous/next links if we can display one
...
PHPBB3-11018
2012-10-17 23:33:19 +02:00
Joas Schilling
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
Joas Schilling
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
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
Joas Schilling
a51aa9b47c
[ticket/11018] Fix minor issues with CSS in prosilver
...
PHPBB3-11018
2012-10-17 23:30:56 +02:00
Drae
e76fd6a395
[ticket/11018] Attempt to fix li.pagination alignment issue
...
This is somewhat kludgy fix for the vertical alignment issue
for pagination contained within a linklist parented li element.
Tested and doesn't seem to impact anything else negatively. May
need further browser testing.
PHPBB3-11018
2012-10-17 23:30:56 +02:00
Oleg Pudeyev
bb09cd9c8e
[ticket/10848] Add phpbb_ prefix.
...
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1
[ticket/10848] Redirect from adm to installer correctly.
...
PHPBB3-10848
2012-10-17 15:08:09 -04: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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
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
Andreas Fischer
0348950ff1
Merge branch 'ticket/russellwwest/11093' into develop-olympus
...
* ticket/russellwwest/11093:
[ticket/11093] acp_users_overview.html has a wrongly placed </dd>
2012-10-16 14:40:10 +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
Senky
d434672dde
[ticket/10967] adding $root_path to posting_get_topic_icons
...
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Oleg Pudeyev
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
Oleg Pudeyev
59281f1b0a
Merge PR #973 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93
Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
...
* bantu/ticket/11069:
[ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -04:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
74e41e79d1
Merge PR #1008 branch 'EXreaction/ticket/11140' into develop
...
* EXreaction/ticket/11140:
[ticket/11140] Fix an error from an incorrect variable name
2012-10-09 23:46:58 -04:00
Nathan Guse
cf810fb775
[ticket/11140] Fix an error from an incorrect variable name
...
PHPBB3-11140
2012-10-09 22:00:28 -05:00
Oleg Pudeyev
3fa0ab7073
Merge PR #1004 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 19:41:25 -04:00
Oleg Pudeyev
a7893ab299
Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus
...
* bantu/ticket/11131:
[ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 17:42:23 -04:00
Vinny
5db30e66fd
[ticket/11139] Fix fatal error on colour swatch window
...
PHPBB3-11139
2012-10-09 00:31:59 -03:00
Dhruv
305abfde96
[ticket/11051] fix spaces
...
PHPBB3-11051
2012-10-08 10:58:04 +05:30
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
Andreas Fischer
281afb8bd6
Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus
...
* mvinny/ticket/11135:
[ticket/11135] Full replacement of credit link to https
2012-10-06 06:12:45 +02:00
Vinny
95d02d74ac
[ticket/11135] Full replacement of credit link to https
...
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Dhruv
be884b7e29
[ticket/11051] add common_words variable
...
PHPBB3-11051
2012-10-04 23:32:50 +05:30
Dhruv
67939192ae
[ticket/11051] remove unnecessary comment
...
PHPBB3-11051
2012-10-04 23:17:18 +05:30
Dhruv
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
Andreas Fischer
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
Andreas Fischer
8428b53087
Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus
...
* Senky/ticket/11112:
[ticket/11112] updating links to phpbb.com to use SSL
2012-10-02 17:01:21 +02:00
Andreas Fischer
dbeace22c8
[ticket/11131] Correctly use indefinite article for "warning".
...
PHPBB3-11131
2012-10-02 14:58:20 +02:00
Senky
1f89fc9cb6
[ticket/11112] updating links to phpbb.com to use SSL
...
PHPBB3-11112
2012-10-01 15:38:16 +02:00
Nathan Guse
51862f151d
[ticket/8796] Prevent setting post_time greater than time() in markread
...
PHPBB3-8796
2012-09-30 10:29:43 -05:00
Andreas Fischer
0daab4e0ef
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
2012-09-29 00:26:43 +02:00
Andreas Fischer
27bef015d6
Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympus
...
* nickvergessen/ticket/11122:
[ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
2012-09-29 00:25:00 +02:00
Joas Schilling
f7a6169184
[ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
...
PHPBB3-11122
2012-09-27 13:22:43 +02:00
Andreas Fischer
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