1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-08 19:03:02 +02:00
Commit Graph

12564 Commits

Author SHA1 Message Date
d3091da5ea [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
2012-02-27 16:32:29 +01:00
23e845d066 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10453] Fixing spacing
2012-02-26 16:01:42 +01:00
b2d589634a Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympus
* cyberalien/ticket/10453:
  [ticket/10453] Fixing spacing
2012-02-26 16:01:33 +01:00
d3d8793c1f [ticket/10453] Fixing spacing
Fixing spacing

PHPBB3-10453
2012-02-26 16:54:31 +02:00
af23811c6d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches

Conflicts:
	phpBB/search.php
2012-02-26 15:47:16 +01:00
8910ec98d7 Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympus
* rxu/ticket/10532:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches
2012-02-26 15:44:58 +01:00
7a061cfc6e [ticket/10532] Remove unnecessary parentheses around calculations of addition.
PHPBB3-10532
2012-02-26 02:30:44 +01:00
6548a3094f [ticket/10532] Remove one unnecessary level of if block nesting.
PHPBB3-10532
2012-02-26 02:19:12 +01:00
459e8dc095 [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
PHPBB3-10532
2012-02-26 02:15:39 +01:00
8f3fba8858 [ticket/10532] Put $total_match_count assignment onto its own line.
PHPBB3-10532
2012-02-26 01:58:17 +01:00
2f91623392 Merge remote-tracking branch 'nickvergessen/ticket/10458' into develop
* nickvergessen/ticket/10458:
  [ticket/10458] Fix xHTML errors when print-viewing PMs
2012-02-25 20:34:23 +01:00
ad3bbcf466 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:29 +01:00
20d3d279ce Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympus
* nickvergessen/ticket/10456:
  [ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:19 +01:00
0c3fae0f18 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
2012-02-25 19:58:03 +01:00
825aef72e8 Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympus
* nickvergessen/ticket/10630:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
2012-02-25 19:46:17 +01:00
b9da8f3a33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:41 +02:00
8cb95b3b84 Merge branch 'ticket/raimon/10453' into develop-olympus
* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:26 +02:00
dd160e19a2 Merge remote-tracking branch 'naderman/ticket/10663' into develop
* naderman/ticket/10663:
  [ticket/10663] Extension finder should not find subdirs with directory filter
  [ticket/10663] Adding nested directory to finder test
2012-02-24 13:55:36 +01:00
30c08bfe5b [ticket/10458] Fix xHTML errors when print-viewing PMs
PHPBB3-10458
2012-02-23 16:25:47 +01:00
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
c9b36c5a2e Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into develop
* github-igorw/extensions-tests-mysq55:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode
2012-02-21 20:33:13 +01:00
a4090ba07c Merge remote-tracking branch 'github-cyberalien/ticket/10655' into develop
* github-cyberalien/ticket/10655:
  [ticket/10655] Error in template inheritance test
2012-02-21 20:20:01 +01:00
cbd20c1bbe [ticket/10667] Fix tests under MySQL 5.5 strict mode
PHPBB3-10667
2012-02-21 18:51:08 +01:00
41870c4095 [ticket/10663] Extension finder should not find subdirs with directory filter
The directory filter pattern now has a $ in the end, do avoid subdirectories
from being matched as well.

PHPBB3-10663
2012-02-21 18:32:08 +01:00
3762bf5e99 [ticket/10663] Adding nested directory to finder test
Adding nested directory to finder test, triggering finder bug

PHPBB3-10663
2012-02-21 18:19:14 +02:00
340a8f19d6 [ticket/10456] Add tabindex to subsilver2 captcha
Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
2012-02-21 11:25:22 +01:00
ef154b78a1 [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
PHPBB3-10630
2012-02-20 02:18:48 +01:00
afcf9cbc86 [ticket/10630] Perform array_unique on authors array before creating the query
This is needed to avoid an additional appearance for an author for every
post he made.

PHPBB3-10630
2012-02-20 02:17:13 +01:00
c3265c9138 [ticket/10639] Do not allow negative post count as rank's minimum posts
PHPBB3-10639
2012-02-20 01:52:33 +01:00
9f2a2a03a8 [ticket/10655] Error in template inheritance test
Fixing error in template inheritance test

PHPBB3-10655
2012-02-18 00:04:32 +02:00
625a1f2b20 Merge remote-tracking branch 'cyberalien/ticket/10378' into develop
* cyberalien/ticket/10378:
  [ticket/10378] Missing entries from imageset to css conversion
  [ticket/10378] Imageset to css convertor typo
2012-02-17 14:08:03 +01:00
5e0b4e63d0 Merge branch 'ticket/10380' into develop
* ticket/10380:
  [ticket/10380] BIDI support for imageset
2012-02-17 14:04:13 +01:00
10bc51614d Merge branch 'master' of github.com:phpbb/phpbb3 into develop
* 'master' of github.com:phpbb/phpbb3:
2012-02-17 14:04:07 +01:00
fa5f094197 Merge branch 'develop' into ticket/10380
* develop:
  [ticket/10652] Fixing typo in template class
  [ticket/10645] Missing CSS for checkboxes
  [ticket/10614] Change not installed heading to available.
  [ticket/10614] Unbreak all_available on extension manager.
  [ticket/10614] Check if cache exists before destroying it
  [ticket/10614] Remove ext manager exceptions for now
  [ticket/10614] Refactor list command to use manager API
  [ticket/10614] Add purge command
  [ticket/10614] Tweak list output, show state, purge cache, handle missing exts
  [ticket/10614] Make script accessible from anywhere
  [ticket/10614] Better usage output
  [ticket/10614] Add a script to enable, disable and view status of extensions.
  [ticket/10500] Use correct class name in @uses.
  [ticket/10500] Fix phpbb_template_compile instantiation.
2012-02-17 13:51:31 +01:00
d70c3f1eb8 Merge branch 'develop' into ticket/10380
* develop: (325 commits)
  [ticket/10641] Update MCP template with new plurality forms
  [ticket/10637] Leftovers from implementation of extensions in convertor
  [ticket/10637] Leftovers from implementation of extensions in develop tools
  [ticket/10637] Leftovers from implementation of extensions in mcp_post
  [ticket/10637] Leftovers from implementation of extensions in mcp_main
  [ticket/10637] Leftovers from implementation of extensions
  [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
  [ticket/10606] Fix incorrect hidden fields array name in page_header().
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
  [ticket/10634] Specify module type when viewing profile
  [ticket/10634] Changing p_master::is_full_class
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
  [ticket/10512] Call startup.php from tests/bootstrap.php
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/9914] Add backup warning to updater.
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
  ...
2012-02-17 13:48:48 +01:00
a24ba9dc2d Merge pull request #576 from cyberalien/ticket/10652
[ticket/10652] Fixing typo in template class
2012-02-17 04:26:38 -08:00
6471cce6de Merge remote-tracking branch 'cyberalien/ticket/10645' into develop
* cyberalien/ticket/10645:
  [ticket/10645] Missing CSS for checkboxes
2012-02-16 02:33:51 -05:00
5aad71b220 [ticket/10652] Fixing typo in template class
Fixing typo in template class that prevents template inheritance from working

PHPBB3-10652
2012-02-15 18:46:27 +02:00
dd495e7a14 Merge pull request #526 from p/ticket/10500
Ticket/10500 Miscellaneous issues in the new template engine
2012-02-14 15:41:15 -08:00
6d227894f5 [ticket/10645] Missing CSS for checkboxes
Missing CSS for checkboxes, invalid cursor for radio input

PHPBB3-10645
2012-02-13 12:28:01 +02:00
14b1c87714 Merge pull request #546 from p/ticket/10614
[ticket/10614] Add a script to enable, disable and view status of extens...
2012-02-11 14:54:22 -08:00
87914d2788 [ticket/10614] Change not installed heading to available.
"Not installed" implies that extensions listed there can be
installed, but the operation is called enable.

Reduce the confusion by using "available" for the heading,
this matches extension manager code.

PHPBB3-10614
2012-02-11 17:31:22 -05:00
2814021d3f [ticket/10614] Unbreak all_available on extension manager.
By default RecursiveIteratorIterator skips all directories.
This results in extension manager not finding any extensions.
Add RecursiveIteratorIterator::SELF_FIRST to correct this.

PHPBB3-10614
2012-02-11 15:08:05 -05:00
9611b5ff83 Merge remote-tracking branch 'Noxwizard/ticket/10641' into develop
* Noxwizard/ticket/10641:
  [ticket/10641] Update MCP template with new plurality forms
2012-02-11 13:19:22 +01:00
52c9ecd486 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested

Conflicts:
	phpBB/download/file.php
2012-02-11 05:58:29 -05:00
4b2690f792 Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympus
* bantu/ticket/10633:
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
2012-02-11 05:56:16 -05:00
289ac72485 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
  [ticket/10606] Fix incorrect hidden fields array name in page_header().
2012-02-11 05:48:03 -05:00
e047b286d8 Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympus
* bantu/ticket/10606:
  [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
  [ticket/10606] Fix incorrect hidden fields array name in page_header().
2012-02-11 05:47:52 -05:00
2a5e30db9e [ticket/10641] Update MCP template with new plurality forms
Updates the MCP template according to PHPBB3-10345

PHPBB3-10641
2012-02-11 01:40:01 -06:00
598e022d4c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:51 -05:00