Commit graph

20231 commits

Author SHA1 Message Date
Carlo
15136e4f8e [ticket/12685] Inject console.command_collection instead of the container
PHPBB3-12685
2014-07-15 11:36:51 +02:00
Carlo
a54f1275d0 [ticket/12685] Add a new line
PHPBB3-12685
2014-07-15 11:27:58 +02:00
Carlo
7e6215fb7f [ticket/12685] Container is dumped by default
PHPBB3-12685
2014-07-15 10:22:39 +02:00
Carlo
0f41a8fc31 [ticket/12685] Removed spaces
PHPBB3-12685
2014-07-15 10:21:23 +02:00
Carlo
2ec50c0ff1 [ticket/12685] Add --safe-mode
PHPBB3-12685
2014-07-15 00:38:07 +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
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
Tristan Darricau
519e64205a [ticket/12847] Allow the extensions to say if they can be enabled
PHPBB3-12847
2014-07-13 18:09:34 +02: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
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
Carlo
6082b5e3d3 [ticket/12685] We need extensions enabled
PHPBB3-12685
2014-07-12 17:48:53 +02:00
Carlo
1125fb3cab [ticket/12685] Add space after foreach
PHPBB3-12685
2014-07-12 17:20:33 +02:00
Carlo
b95ab44028 [ticket/12685] Add console collection and fixing CLI
Added a commands service collection and removed CLI container

PHPBB3-12685
2014-07-12 17:19:43 +02:00
Matt Friedman
14979e6399 [ticket/12841] Fix white space issues reported by sniffer
PHPBB3-12841
2014-07-11 13:40:45 -07:00
PayBas
20a55bc8dd [ticket/12838] Update events.md to RC3
PHPBB3-12838
2014-07-11 20:07:32 +02:00
Matt Friedman
95032c31af [ticket/12841] Allow extensions to position new config vars
PHPBB3-12841
2014-07-11 10:18:46 -07: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
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
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
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
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
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
PayBas
08264ec3af [ticket/12838] Allow for extra columns in cache obtain_ranks()
PHPBB3-12838
2014-07-10 17:54:08 +02:00
PayBas
c9803b7ba3 [ticket/12838] Add raw row-data to acp_ranks core event
PHPBB3-12838
2014-07-10 16:24:49 +02:00
PayBas
0bece6dada [ticket/12838] Simplify special rank template conditional
PHPBB3-12838
2014-07-10 16:24:17 +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
PayBas
9468d173bc [ticket/12838] Add core events to acp_ranks.php
PHPBB3-12838
2014-07-10 13:29:07 +02:00
PayBas
bfdaefa7f6 [ticket/12838] Update events.md
PHPBB3-12838
2014-07-10 12:16:50 +02:00
PayBas
1f61f3a416 [ticket/12838] Add _before versions
PHPBB3-12838
2014-07-10 12:10:06 +02:00
PayBas
dbb331284e [ticket/12838] Add template events to acp_ranks.html
PHPBB3-12838
2014-07-10 12:07:51 +02:00
Stanislav Atanasov
223c634bee [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
Changing the return to get_profile_value_raw

PHPBB3-12793
2014-07-10 11:46:11 +03:00
Stanislav Atanasov
57bbb4548b [ticket/12793] String '0' does not display for string profile fields
See https://github.com/phpbb/phpbb/pull/2647#discussion_r14503051

PHPBB3-12793
2014-07-10 11:46:00 +03:00
Stanislav Atanasov
27f15c0d5b [ticket/12791] Changed the if check
Removed unneeded variable

PHPBB3-12791
2014-07-10 11:43:52 +03:00
Stanislav Atanasov
690de21134 [ticket/12791] String profile fields do not use links ...
smilies and line breaks in memberlist

The value is overwritten with the contact value
Added aditional check if the field is a contact so we don't overwrite it.

PHPBB3-12791
2014-07-10 11:42:31 +03: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
PayBas
16a13fed1a [ticket/12832] Remove old .quick-links icon reference
PHPBB3-12832
2014-07-08 19:05:06 +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
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
dca8afcd6f Merge remote-tracking branch 'paybas/ticket/12804' into develop-ascraeus 2014-07-08 15:59:23 +02:00
PayBas
44e76495a9 [ticket/12832] Remove unnecessary attr and classes
PHPBB3-12832
2014-07-08 15:53:03 +02:00