makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 16:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
23481 commits 18 branches 192 tags 207 MiB
Commit graph

23481 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
902937ce70 [ticket/12793] Tests (added and changed) 
changed behavieur of 0 as in and added 0 as string test

PHPBB3-12793
 2014-07-10 11:53:10 +03: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
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
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
PayBas
16a13fed1a [ticket/12832] Remove old .quick-links icon reference 
PHPBB3-12832
 2014-07-08 19:05:06 +02: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
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
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
PayBas
44e76495a9 [ticket/12832] Remove unnecessary attr and classes 
PHPBB3-12832
 2014-07-08 15:53:03 +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
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
PayBas
3f290bad82 [ticket/12832] Add footer links to quick-links 
PHPBB3-12832
 2014-07-07 23:27:58 +02:00
PayBas
e4941ee875 [ticket/12832] Make .small-icon styling uniform 
PHPBB3-12832
 2014-07-07 23:23:15 +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
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
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
85d241218e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12825] Better sniff for the extensions and skip the vendor/ directory
 2014-07-07 21:05:27 +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
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