1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 14:18:24 +01:00

12641 Commits

Author SHA1 Message Date
Igor Wiedler
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
Igor Wiedler
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
Igor Wiedler
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
Igor Wiedler
a24ba9dc2d Merge pull request #576 from cyberalien/ticket/10652
[ticket/10652] Fixing typo in template class
2012-02-17 04:26:38 -08:00
Oleg Pudeyev
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
Vjacheslav Trushkin
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
Igor Wiedler
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
Vjacheslav Trushkin
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
Igor Wiedler
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Andreas Fischer
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Patrick Webster
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
Oleg Pudeyev
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
Oleg Pudeyev
ed6bd50ab8 Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympus
* cyberalien/ticket/10569:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:36 -05:00
Oleg Pudeyev
d6bc77375a Merge remote-tracking branch 'bantu/ticket/10076' into develop
* bantu/ticket/10076:
  [ticket/10076] STARTTLS support for SMTP via smtp_class.
  [ticket/10076] Move EHLO/HELO code into its own method.
2012-02-10 20:52:36 -05:00
Oleg Pudeyev
95ac995be8 Merge remote-tracking branch 'bantu/ticket/10636' into develop
* bantu/ticket/10636:
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
2012-02-10 13:25:46 -05:00
Oleg Pudeyev
56ef5d5025 Merge remote-tracking branch 'cyberalien/ticket/10637' into develop
* cyberalien/ticket/10637:
  [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
2012-02-10 13:06:58 -05:00
Oleg Pudeyev
9d81f97175 Merge remote-tracking branch 'bantu/ticket/10495' into develop
* bantu/ticket/10495:
  [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
2012-02-10 01:40:05 -05:00
Oleg Pudeyev
082132648b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10512] Call startup.php from tests/bootstrap.php
2012-02-10 01:30:41 -05:00
Oleg Pudeyev
9c2d73c3f9 Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympus
* bantu/ticket/10512:
  [ticket/10512] Call startup.php from tests/bootstrap.php
2012-02-10 01:29:23 -05:00
Vjacheslav Trushkin
caeadf85d0 [ticket/10637] Leftovers from implementation of extensions in convertor
Replacing code in convertor that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:24:46 +02:00
Vjacheslav Trushkin
a1a1b61ae8 [ticket/10637] Leftovers from implementation of extensions in develop tools
Replacing code in development tools that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:22:32 +02:00
Vjacheslav Trushkin
92303d2dac [ticket/10637] Leftovers from implementation of extensions in mcp_post
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:17:33 +02:00
Vjacheslav Trushkin
1d72a47ea6 [ticket/10637] Leftovers from implementation of extensions in mcp_main
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:13:13 +02:00
Vjacheslav Trushkin
11606c8607 [ticket/10637] Leftovers from implementation of extensions
Replacing code in includes/functions_admin.php that was missed in ticket 10323

PHPBB3-10637
2012-02-09 21:58:39 +02:00
rxu
345e8e084f [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
PHPBB3-9084
2012-02-10 00:31:13 +08:00
Andreas Fischer
a962e78854 [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
2012-02-09 15:34:04 +01:00
James King
35d5d527db [ticket/10606] Fix incorrect hidden fields array name in page_header().
Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649.

PHPBB3-10606
2012-02-09 15:32:35 +01:00
Andreas Fischer
f894da0d25 [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
While filenames are chosen at random and there is no correlation between the
original filename and the new filesystem filename, there is a correlation
between filesystem filename and filesytem filename of thumbnails.

Adjust error message to no longer include the physical filename and make it
consistent with the error message that is shown when there is no attachment at
all.

This information was mostly useless for regular users (i.e. non-admins) anyway.

PHPBB3-10633
2012-02-09 15:17:42 +01:00
Andreas Fischer
6858485964 [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
Regression from 4c77903129749008cd08c346006d2a57cf6ff544.

PHPBB3-10636
2012-02-09 14:18:17 +01:00
Igor Wiedler
78de29b7ce [ticket/10614] Check if cache exists before destroying it
PHPBB3-10614
2012-02-09 01:39:45 +01:00
Igor Wiedler
68e4c667fa [ticket/10614] Remove ext manager exceptions for now
PHPBB3-10614
2012-02-09 01:37:53 +01:00
Igor Wiedler
36728d3414 [ticket/10614] Refactor list command to use manager API
PHPBB3-10614
2012-02-09 01:36:06 +01:00
Igor Wiedler
fb83a5f6c0 [ticket/10614] Add purge command
PHPBB3-10614
2012-02-09 01:04:54 +01:00
Igor Wiedler
5ccd6b0c7a [ticket/10614] Tweak list output, show state, purge cache, handle missing exts
PHPBB3-10614
2012-02-09 01:04:47 +01:00
Igor Wiedler
b222030ca7 [ticket/10614] Make script accessible from anywhere
PHPBB3-10614
2012-02-09 01:02:00 +01:00
Igor Wiedler
6582a84379 Merge remote-tracking branch 'cyberalien/ticket/10634' into develop
* cyberalien/ticket/10634:
  [ticket/10634] Specify module type when viewing profile
  [ticket/10634] Changing p_master::is_full_class
2012-02-09 00:42:28 +01:00
Vjacheslav Trushkin
ad8ab09930 [ticket/10634] Specify module type when viewing profile
Specify module type when checking for enabled modules when viewing user's profile

PHPBB3-10634
2012-02-09 01:34:50 +02:00
Vjacheslav Trushkin
6cf7f20590 [ticket/10634] Changing p_master::is_full_class
Changing p_master::is_full_class to check allow all module types, not only current type

PHPBB3-10634
2012-02-09 01:34:37 +02:00
Vjacheslav Trushkin
62288b3c05 [ticket/10569] Invalid string comparison in prosilver
Fixing invalid string comparison in ucp_main_front.html in prosilver

PHPBB3-10569
2012-02-07 22:03:24 +02:00
Igor Wiedler
d4e00b6c0d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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-07 16:57:09 +01:00
Igor Wiedler
3feeb382c5 Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympus
* cyberalien/ticket/10616:
  [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-07 16:53:47 +01:00
Igor Wiedler
9e15d83022 [ticket/10614] Better usage output
PHPBB3-10614
2012-02-06 16:49:50 +01:00
rxu
f832f5a4ee [ticket/9831] Fix saving unchecked checkbox field value
PHPBB3-9831
2012-02-05 22:03:02 +08:00
Vjacheslav Trushkin
246be1cb08 [feature/prosilver-cleanup/css-reset-v2] CSS reset
Adding proper CSS reset to prosilver

PHPBB3-10617
2012-02-05 14:09:28 +02:00