Commit graph

19557 commits

Author SHA1 Message Date
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
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 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
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
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
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
Joas Schilling
d5fd1ecfc8 Merge pull request #2675 from lucifer4o/ticket/12786
[ticket/12786] Extend profilefield_base_migration.php class

* lucifer4o/ticket/12786:
  [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:43 +02:00
Marc Alexander
e68094679e [ticket/12120] Remove imkingdavid from active authors
PHPBB3-12120
2014-07-08 21:20:51 +02:00
Stanislav Atanasov
c468a5d8d4 [ticket/12786] Correcting some tabs
Some tabs needed corection

PHPBB3-12786
2014-07-08 22:01:49 +03:00
Marc Alexander
3bd5214b5d Merge branch 'develop-ascraeus' into develop 2014-07-08 18:49:03 +02:00
Marc Alexander
b132939471 Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeus 2014-07-08 18:48:32 +02:00
Joas Schilling
167c465dd2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12787] Updates phpbb_mock_controller_helper
  [ticket/12787] Add controller_helper::get_current_url()
  [ticket/12787] Remove one app.php when it's both in $path and $web_root_path
  [ticket/12787] Fix the absolute board url
  [ticket/12787] Use a parameter (_referer) instead of the Referer header
  [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
  [ticket/12099] Remove config again
  [ticket/12099] Correctly fix the path when performing AJAX requests
  [ticket/12099] Add request argument to path_helper service
2014-07-08 18:10:01 +02:00
Joas Schilling
91f5d59f69 Merge pull request #2676 from Nicofuma/ticket/12787
[ticket/12787] Allow the route to say that the referer has to be used.

* Nicofuma/ticket/12787:
  [ticket/12787] Updates phpbb_mock_controller_helper
  [ticket/12787] Add controller_helper::get_current_url()
  [ticket/12787] Remove one app.php when it's both in $path and $web_root_path
  [ticket/12787] Fix the absolute board url
  [ticket/12787] Use a parameter (_referer) instead of the Referer header
  [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer()
  [ticket/12099] Remove config again
  [ticket/12099] Correctly fix the path when performing AJAX requests
  [ticket/12099] Add request argument to path_helper service
2014-07-08 18:09:41 +02:00
Joas Schilling
e3e236da72 [ticket/12834] Correctly match directories in session page
Also clean path before working with it

PHPBB3-12834
2014-07-08 17:53:32 +02:00
Marc Alexander
b3d2898d01 Merge branch 'develop-ascraeus' into develop 2014-07-08 15:59:54 +02:00
Marc Alexander
dca8afcd6f Merge remote-tracking branch 'paybas/ticket/12804' into develop-ascraeus 2014-07-08 15:59:23 +02:00
n-aleha
f2745d1e57 [ticket/12768] More fixes in language files
More spaces converted to tabs for identation in language files.

PHPBB3-12768
2014-07-08 02:09:10 +03:00
Tristan Darricau
f8fe437f49 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12812] Remove unused global $db from tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:55:05 +02:00
Tristan Darricau
b170c6a8db Merge pull request #2695 from VSEphpbb/ticket/12812
[ticket/12812] Add a migrator tool for config_text database changes

* VSEphpbb/ticket/12812:
  [ticket/12812] Remove unused global $db from tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Improve migrator config_text tool tests
  [ticket/12812] Add a migrator tool for config_text database changes
2014-07-08 00:52:51 +02:00
PayBas
bdfca39e07 [ticket/12804] Disable jabber from memberlist sort options
PHPBB3-12804
2014-07-08 00:42:01 +02:00
n-aleha
4679fa543b [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
'NOTIFICATION_REPORT_CLOSED' has 3 spaces before the first tab indentation
in language/en/common.php.

PHPBB3-12768
2014-07-08 01:13:59 +03:00
Tristan Darricau
9374d14e27 [ticket/12787] Add controller_helper::get_current_url()
PHPBB3-12787
2014-07-08 00:04:11 +02:00
n-aleha
b08497f66c [ticket/12829] Remove check for pgsql 8.3/8.2
Remove check for pgsql 8.3/8.2 and set multi_insert to true.

PHPBB3-12829
2014-07-07 23:10:18 +03:00
Tristan Darricau
d5f693c9fd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 22:10:04 +02:00
Tristan Darricau
42fde81b21 Merge pull request #2690 from Noxwizard/ticket/12802
[ticket/12802] Properly handle connection failures in SQLite3

* Noxwizard/ticket/12802:
  [ticket/12802] Properly handle connection failures in SQLite3
2014-07-07 21:56:35 +02:00
Joas Schilling
5a503f0cb6 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12824] Move MCP/ACP links after navigation_append event
2014-07-07 20:46:58 +02:00
Joas Schilling
4c1a9d1e5d Merge pull request #2705 from PayBas/ticket/12824
[ticket/12824] Move MCP/ACP links after navigation_append event

* PayBas/ticket/12824:
  [ticket/12824] Move MCP/ACP links after navigation_append event
2014-07-07 20:46:35 +02:00
Joas Schilling
c4f5b46f4a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12827] Reorder quick-links
2014-07-07 20:38:58 +02:00
Joas Schilling
e8e9ad1bdf Merge pull request #2708 from PayBas/ticket/12827
[ticket/12827] Reorder quick-links

* PayBas/ticket/12827:
  [ticket/12827] Reorder quick-links
2014-07-07 20:38:54 +02:00
Joas Schilling
212606a0bb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12830] Remove double .postlink in colours.css
2014-07-07 20:33:45 +02:00
Joas Schilling
f340e54e0c Merge pull request #2710 from Crizz0/ticket/12830
[ticket/12830] Removes double .postlink in colours.css

* Crizz0/ticket/12830:
  [ticket/12830] Remove double .postlink in colours.css
2014-07-07 20:33:35 +02:00
Joas Schilling
56a89fe0a2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12782] Add doc block
  [ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:19 +02:00
Joas Schilling
29a07404d3 Merge pull request #2672 from Nicofuma/ticket/12782
[ticket/12782] Use an interface for the phpbb event_dispatcher

* Nicofuma/ticket/12782:
  [ticket/12782] Add doc block
  [ticket/12782] Use an interface for the phpbb event_dispatcher
2014-07-07 20:23:10 +02:00
Tristan Darricau
7118f84d29 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12197] Fix several misleading FAQ entries
2014-07-07 19:13:13 +02:00
Tristan Darricau
b9750bb590 Merge pull request #2656 from nickvergessen/ticket/12197
[ticket/12197] Fix several misleading FAQ entries

* nickvergessen/ticket/12197:
  [ticket/12197] Fix several misleading FAQ entries
2014-07-07 19:00:33 +02:00