1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

22883 Commits

Author SHA1 Message Date
Joas Schilling
b0c307b772 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
2014-07-16 21:51:36 +02:00
Joas Schilling
9a369a9e14 Merge pull request #2743 from PayBas/ticket/12859
[ticket/12859] Add template events ucp_pm_viewmessage_post_buttons

* PayBas/ticket/12859:
  [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
2014-07-16 21:51:28 +02:00
PayBas
0ed971d129 [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
PHPBB3-12859
2014-07-16 18:04:54 +02:00
Joas Schilling
ab237e16d3 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12828] Add ucp_prefs.php common core event
2014-07-16 16:18:01 +02:00
Joas Schilling
cd5fbd52c2 Merge pull request #2709 from rxu/ticket/12828
[ticket/12828] Add ucp_prefs.php common core event

* rxu/ticket/12828:
  [ticket/12828] Add ucp_prefs.php common core event
2014-07-16 16:15:30 +02:00
Andreas Fischer
496b34cd96 Merge pull request #2736 from Elsensee/ticket/12854
[ticket/12854] Don't show contact page link if board emails are disabled

* Elsensee/ticket/12854:
  [ticket/12854] Don't show contact page link if board emails are disabled
2014-07-15 23:19:52 +02:00
Andreas Fischer
29cd7f8aec Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12854] Don't show contact page link if board emails are disabled
2014-07-15 23:19:52 +02:00
Andreas Fischer
06386990d1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
2014-07-15 23:10:54 +02:00
Andreas Fischer
389d8e844e Merge pull request #2737 from Elsensee/ticket/12855
[ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG

* Elsensee/ticket/12855:
  [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
2014-07-15 23:10:53 +02:00
Oliver Schramm
1ee7df57ae [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
PHPBB3-12855
2014-07-15 22:58:28 +02:00
Oliver Schramm
021adcc14f [ticket/12854] Don't show contact page link if board emails are disabled
PHPBB3-12854
2014-07-15 22:19:56 +02:00
Andreas Fischer
a6ce8ed7df Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12846] SQLite3 bug in profilefield_base_migration.php
2014-07-14 19:45:43 +02:00
Andreas Fischer
fcf426ad5c Merge pull request #2728 from lucifer4o/ticket/12846
[ticket/12846] SQLite3 bug in profilefield_base_migration.php

* lucifer4o/ticket/12846:
  [ticket/12846] SQLite3 bug in profilefield_base_migration.php
2014-07-14 19:45:43 +02:00
Andreas Fischer
bc6f92dc15 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12849] Fixed possible ReferenceError in core.js.
2014-07-14 19:27:28 +02:00
Andreas Fischer
f6039562ea Merge pull request #2731 from callumacrae/ticket/12849-2
[ticket/12849] Fixed possible ReferenceError in core.js.

* callumacrae/ticket/12849-2:
  [ticket/12849] Fixed possible ReferenceError in core.js.
2014-07-14 19:27:27 +02:00
Callum Macrae
581391c21e [ticket/12849] Fixed possible ReferenceError in core.js.
PHPBB3-12849
2014-07-13 23:18:21 +01:00
rxu
fe02caa8e0 [ticket/12828] Add ucp_prefs.php common core event
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.

PHPBB3-12828
2014-07-13 21:34:24 +08:00
Andreas Fischer
1331f66fa8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12844] Don't clear $dbpasswd early in connection manager
2014-07-13 01:17:56 +02:00
Andreas Fischer
aadcbb765a Merge pull request #2727 from Nicofuma/ticket/12844
[ticket/12844] Don't clear $dbpasswd early in connection manager

* Nicofuma/ticket/12844:
  [ticket/12844] Don't clear $dbpasswd early in connection manager
2014-07-13 01:17:55 +02:00
Stanislav Atanasov
1043d1a27c [ticket/12846] SQLite3 bug in profilefield_base_migration.php
Using profilefield_base_migration.php to create a custom profile
field with SQlite3 DBMS returns warning:

[phpBB Debug] PHP Warning: in file [ROOT]/phpbb/db/driver/sqlite3.php
on line 218: SQLite3Result::fetchArray(): Unable to execute statement:
constraint failed

This is due passing filed_id and lang_id to the DB driver in
unspecified format. As they are always int we should cast them
in int to prevent the error message appearance.

PHPBB3-12846
2014-07-13 01:45:20 +03:00
Tristan Darricau
c4cd1c58c1 [ticket/12844] Don't clear $dbpasswd early in connection manager
PHPBB3-12844
2014-07-13 00:25:25 +02:00
Joas Schilling
0bc618ddc5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12842] Skip parameters without exlicit type
2014-07-12 17:30:50 +02:00
Joas Schilling
3e004d22cb Merge pull request #2725 from Nicofuma/ticket/12842
[ticket/12842] Out of memory issue in code sniffer call for extensions

* Nicofuma/ticket/12842:
  [ticket/12842] Skip parameters without exlicit type
2014-07-12 17:30:25 +02:00
Tristan Darricau
57f7fdf989 [ticket/12842] Skip parameters without exlicit type
PHPBB3-12842
2014-07-12 16:55:14 +02:00
Joas Schilling
9c1ca732db Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
  [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Prepare Changelog
  [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
2014-07-11 17:24:00 +02:00
Joas Schilling
0d6fe20372 Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeus
* prep-release-3.1.0-RC2:
  [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
  [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Prepare Changelog
  [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
2014-07-11 17:23:53 +02:00
Joas Schilling
b5492a07da [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development 2014-07-11 17:22:16 +02:00
Joas Schilling
4dc26274bf [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2 release-3.1.0-RC2 2014-07-11 16:07:09 +02:00
Joas Schilling
166c3988ff [prep-release-3.1.0-RC2] Prepare Changelog 2014-07-11 16:05:38 +02:00
Joas Schilling
4449793b07 [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 2014-07-11 16:04:27 +02:00
Joas Schilling
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
Tristan Darricau
b8c10dcdec Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12839] Include update related templates and assets in the package
2014-07-11 15:54:02 +02:00
Tristan Darricau
dd78b564e5 Merge pull request #2723 from nickvergessen/ticket/12839
[ticket/12839] Include update related templates and assets in the package

* nickvergessen/ticket/12839:
  [ticket/12839] Include update related templates and assets in the package
2014-07-11 15:53:37 +02:00
Andreas Fischer
62322698ae Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12768] More fixes in language files
  [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
2014-07-11 12:11:14 +02:00
Andreas Fischer
35588c20bd Merge pull request #2713 from n-aleha/ticket/12768
[ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation

* n-aleha/ticket/12768:
  [ticket/12768] More fixes in language files
  [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
2014-07-11 12:11:14 +02:00
Andreas Fischer
9cd327e127 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12120] Remove imkingdavid from active authors
2014-07-11 12:03:12 +02:00
Andreas Fischer
1a1fb4a915 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Remove imkingdavid from active authors

Conflicts:
	phpBB/docs/AUTHORS
2014-07-11 12:03:02 +02:00
Andreas Fischer
a58cc394bc Merge pull request #2716 from marc1706/ticket/12120
[ticket/12120] Remove imkingdavid from active authors

* marc1706/ticket/12120:
  [ticket/12120] Remove imkingdavid from active authors
2014-07-11 12:00:02 +02:00
Andreas Fischer
d5958875c5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
Andreas Fischer
248b11c4db Merge pull request #2701 from Nicofuma/ticket/12818
[ticket/12818] Deleting a log entry in MCP produces a General error

* Nicofuma/ticket/12818:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
Andreas Fischer
a616cf383e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (34 commits)
  [ticket/12775] Set dbal.conn.driver as synthetic during installation
  [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
  [ticket/12775] Inject the connection when created in the container
  [ticket/12775] Extract the vars later in install/install_update.php
  [ticket/12775] Rename config_php_handler to config_php_file container_builder
  [ticket/12775] Set defined_vars as a property of config_php_file
  [ticket/12775] Fix doc blocks in the container builder
  [ticket/12775] Remove useless includes of config.php
  [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
  [ticket/12775] Fix comments
  [ticket/12775] Update doc blocks
  [ticket/12775] Fix container_builder
  [ticket/12775] Rename config_php to config_php_file
  [ticket/12775] Renamed to \phpbb\di\container_builder
  [ticket/12775] Remove the last include of functions_container
  [ticket/12775] Fix unit tests
  [ticket/12775] Add tests for \phpbb\config_php
  [ticket/12775] Add tests for the container factory
  [ticket/12775] Use a field instead of a local var in load_config_var()
  [ticket/12775] Update container and config in install/
  ...
2014-07-11 11:49:51 +02:00
Andreas Fischer
b2a883d504 Merge pull request #2671 from Nicofuma/ticket/12775
[ticket/12775] Replace functions_container with a container_builder class.

* Nicofuma/ticket/12775: (34 commits)
  [ticket/12775] Set dbal.conn.driver as synthetic during installation
  [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
  [ticket/12775] Inject the connection when created in the container
  [ticket/12775] Extract the vars later in install/install_update.php
  [ticket/12775] Rename config_php_handler to config_php_file container_builder
  [ticket/12775] Set defined_vars as a property of config_php_file
  [ticket/12775] Fix doc blocks in the container builder
  [ticket/12775] Remove useless includes of config.php
  [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
  [ticket/12775] Fix comments
  [ticket/12775] Update doc blocks
  [ticket/12775] Fix container_builder
  [ticket/12775] Rename config_php to config_php_file
  [ticket/12775] Renamed to \phpbb\di\container_builder
  [ticket/12775] Remove the last include of functions_container
  [ticket/12775] Fix unit tests
  [ticket/12775] Add tests for \phpbb\config_php
  [ticket/12775] Add tests for the container factory
  [ticket/12775] Use a field instead of a local var in load_config_var()
  [ticket/12775] Update container and config in install/
  ...
2014-07-11 11:49:51 +02:00
Andreas Fischer
9149b3023d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12829] Remove check for pgsql 8.3/8.2
2014-07-11 10:17:03 +02:00
Andreas Fischer
147b942e5c Merge pull request #2711 from n-aleha/ticket/12829
[ticket/12829] Remove check for pgsql 8.3/8.2

* n-aleha/ticket/12829:
  [ticket/12829] Remove check for pgsql 8.3/8.2
2014-07-11 10:17:03 +02:00
Joas Schilling
9f76b3414c [ticket/12839] Include update related templates and assets in the package
PHPBB3-12839
2014-07-11 09:48:49 +02:00
Tristan Darricau
657fc069e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:28:07 +02:00
Tristan Darricau
cc0f931473 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:26:27 +02:00
Tristan Darricau
3a11fec5de Merge pull request #2722 from marc1706/ticket/12695
[ticket/12695] Add viewtopic language file for parse_attachments in mcp_...

* marc1706/ticket/12695:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:25:00 +02:00
Marc Alexander
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
PHPBB3-12695
2014-07-10 14:39:53 +02:00
Joas Schilling
b0d8f0edac Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12786] Correcting some tabs
  [ticket/12786] Array_merge instead copy array parts
  [ticket/12786] Some changes of the comments.
  [ticket/12786] Dixing a typo
  [ticket/12786] Some minor fixes of comments and function naming
  [ticket/12786] Add clean_cpf_db_entries
  [ticket/12786] White spaces found
  [ticket/12786] Add create_language_entries
  [ticket/12786] Add get_custom_field_id
  [ticket/12786] Extend profilefield_base_migration.php class
2014-07-09 17:00:50 +02:00