mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
22,556 Commits 17 Branches 190 Tags
Commit Graph

22556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tristan Darricau
8de8cbab5e [ticket/12818] Use assertGreaterThanOrEqual in the tests 
PHPBB3-12818
 2014-07-09 00:12:57 +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
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
Joas Schilling
633a517791 [ticket/12834] Fix tests to match what we want to have 
PHPBB3-12834
 2014-07-08 17:53:06 +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
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
Tristan Darricau
b4d7192b62 [ticket/12787] Updates phpbb_mock_controller_helper 
PHPBB3-12787
 2014-07-08 00:20:33 +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
Tristan Darricau
de1da3170c [ticket/12818] Don't use the id for i= 
PHPBB3-12818
 2014-07-07 22:13:42 +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
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
Matt Friedman
5ef7510fb3 [ticket/12812] Remove unused global $db from tests 
PHPBB3-12812
 2014-07-07 12:50:18 -07:00
Tristan Darricau
14e9c7695d [ticket/12818] Add tests 
PHPBB3-12818
 2014-07-07 21:49:48 +02:00
Joas Schilling
80f8c550f9 Merge pull request #2706 from Nicofuma/ticket/12825 
[ticket/12825] Better sniff for the extensions and skip the vendor/ directory

* Nicofuma/ticket/12825:
  [ticket/12825] Better sniff for the extensions and skip the vendor/ directory
 2014-07-07 21:05:23 +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
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
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
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
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
Crizzo
22448a9c6d [ticket/12830] Remove double .postlink in colours.css 
PHPBB3-12830
 2014-07-07 18:25:04 +02:00
PayBas
6759004642 [ticket/12827] Reorder quick-links 
PHPBB3-12827
 2014-07-07 12:05:46 +02:00
PayBas
0a286e044b [ticket/12804] Dont use ternary form 
PHPBB3-12804
 2014-07-07 11:28:06 +02:00
PayBas
fbc07d3b14 [ticket/12804] Hide jabber for subSilver2 as well 
PHPBB3-12804
 2014-07-07 11:21:48 +02:00
Cesar G
3a317edc92 Merge remote-tracking branch 'VSEphpbb/ticket/12811' into develop-ascraeus 
* VSEphpbb/ticket/12811:
  [ticket/12811] Responsive adjustments to margin changes
  [ticket/12811] Fix padding/margin bug affecting bottom layout
 2014-07-07 01:33:34 -07:00
Cesar G
0b91c5488a Merge remote-tracking branch 'PayBas/ticket/12813' into develop-ascraeus 
* PayBas/ticket/12813:
  [ticket/12813] Move inline-CSS to css file
  [ticket/12813] Use -moz-only fix instead of generic padding
  [ticket/12813] Reorder .row pagination so it aligns better
  [ticket/12813] Fix page-jump title lang and use input type=number
 2014-07-07 01:32:18 -07:00
PayBas
c5b4d0afb7 [ticket/12804] Hide Jabber from UCP & member search when disabled 
PHPBB3-12804
 2014-07-07 09:05:57 +02:00
Tristan Darricau
58a52fe5b9 [ticket/12775] Set dbal.conn.driver as synthetic during installation 
PHPBB3-12775
 2014-07-07 01:10:24 +02:00
Tristan Darricau
e2cbaf4f1a [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml 
PHPBB3-12775
 2014-07-07 01:02:50 +02:00
Tristan Darricau
5b11ee8c97 [ticket/12775] Inject the connection when created in the container 
PHPBB3-12775
 2014-07-07 01:02:49 +02:00
Tristan Darricau
285656a6d4 [ticket/12775] Extract the vars later in install/install_update.php 
PHPBB3-12775
 2014-07-07 01:02:47 +02:00
Tristan Darricau
6c57fbecac [ticket/12775] Rename config_php_handler to config_php_file container_builder 
PHPBB3-12775
 2014-07-07 01:02:46 +02:00
Tristan Darricau
8c0d179e3e [ticket/12775] Set defined_vars as a property of config_php_file 
PHPBB3-12775
 2014-07-07 01:02:44 +02:00
Tristan Darricau
35c0b6d77a [ticket/12775] Fix doc blocks in the container builder 
PHPBB3-12775
 2014-07-07 01:02:43 +02:00
Tristan Darricau
d226a73111 [ticket/12775] Remove useless includes of config.php 
PHPBB3-12775
 2014-07-07 01:02:42 +02:00
Tristan Darricau
ed812a9dfb [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class 
PHPBB3-12775
 2014-07-07 01:02:40 +02:00
Tristan Darricau
98e8be966b [ticket/12775] Fix comments 
PHPBB3-12775
 2014-07-07 01:02:39 +02:00
Tristan Darricau
15c23e60b8 [ticket/12775] Update doc blocks 
PHPBB3-12775
 2014-07-07 01:02:37 +02:00
Tristan Darricau
f2e8e928c0 [ticket/12775] Fix container_builder 
PHPBB3-12775
 2014-07-07 01:02:36 +02:00
Tristan Darricau
2db160ff87 [ticket/12775] Rename config_php to config_php_file 
PHPBB3-12775
 2014-07-07 01:02:34 +02:00
Tristan Darricau
40937e21c5 [ticket/12775] Renamed to \phpbb\di\container_builder 
PHPBB3-12775
 2014-07-07 01:02:33 +02:00