mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-03 14:17:56 +02:00
Code Issues Releases Wiki Activity
22,355 Commits 18 Branches 192 Tags
Commit Graph

19331 Commits

Author SHA1 Message Date
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
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
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
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
Marc Alexander
dca8afcd6f Merge remote-tracking branch 'paybas/ticket/12804' into develop-ascraeus 2014-07-08 15:59:23 +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
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
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
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
Andreas Fischer
0bec9897d7 Merge pull request #2697 from n-aleha/ticket/12816 
[ticket/12816] Fix comment about logs in user_ban function

* n-aleha/ticket/12816:
  [ticket/12816] Fix comment about logs in user_ban function
 2014-07-07 00:20:27 +02:00
Andreas Fischer
bd0f692bf3 Merge pull request #2679 from dhruvgoel92/ticket/12788 
[ticket/12788] Update symfony components

* dhruvgoel92/ticket/12788:
  [ticket/12788] Force 2.3.* on symfony dependencies
  [ticket/12788] Update symfony components
 2014-07-07 00:02:11 +02:00
Andreas Fischer
730991e785 Merge pull request #2704 from hanakin/ticket/12823 
[ticket/12823] Remove all trailing whitespace

* hanakin/ticket/12823:
  [ticket/12823] Remove all trailing whitespace
 2014-07-06 23:46:24 +02:00
Joas Schilling
e3e0c79b7a [ticket/12515] Remove check for PostgreSQL 8.3+ 
PHPBB3-12515
 2014-07-06 19:31:46 +02:00
PayBas
39261907da [ticket/12824] Move MCP/ACP links after navigation_append event 
PHPBB3-12824
 2014-07-06 18:55:01 +02:00
Marc Alexander
18054332e4 [ticket/12810] Use correct template vars for shadow pruning settings 
PHPBB3-12810
 2014-07-06 18:03:09 +02:00
Marc Alexander
57567d5611 Merge remote-tracking branch 'Crizzo/ticket/12807' into develop-ascraeus 2014-07-06 17:59:05 +02:00
hanakin
5136be4225 [ticket/12823] Remove all trailing whitespace 
PHPBB3-12823
 2014-07-06 17:09:21 +02:00
Cesar G
b412339cad Merge remote-tracking branch 'PayBas/ticket/12808' into develop-ascraeus 
* PayBas/ticket/12808:
  [ticket/12808] Fix small gap between username and drop-down arrow
 2014-07-06 06:14:56 -07:00
PayBas
21320820ce [ticket/12815] Remove S_REGISTERED_USER for team link 
PHPBB3-12815
 2014-07-06 14:53:23 +02:00
PayBas
c190ee315e [ticket/12815] Show memberlist link for guests (if permitted) 
PHPBB3-12815
 2014-07-06 13:40:36 +02:00
PayBas
b323a01fd3 [ticket/12813] Move inline-CSS to css file 
PHPBB3-12813
 2014-07-06 13:02:26 +02:00
PayBas
8d6d21c7de [ticket/12813] Use -moz-only fix instead of generic padding 
PHPBB3-12813
 2014-07-06 13:01:57 +02:00
Crizzo
addcbb1585 [ticket/12807] New variables for _EXPLAIN 
PHPBB3-12807
 2014-07-06 00:28:25 +02:00
Crizzo
dbefb74abe [ticket/12807] Adds missing language variables language/en/acp/forums.php 
PHPBB3-12807
 2014-07-05 23:57:57 +02:00
Crizzo
b6816c4237 [ticket/12807] Changes PRUNE_FREQ to PRUNE_SHADOW_FREQ/_DAYS 
PHPBB3-12807
 2014-07-05 22:18:01 +02:00
n-aleha
182d22567d [ticket/12816] Fix comment about logs in user_ban function 
PHPBB3-12816
 2014-07-05 23:00:13 +03:00
Tristan Darricau
7399f29df8 [ticket/12787] Remove one app.php when it's both in $path and $web_root_path 
PHPBB3-12787
 2014-07-05 14:01:14 +02:00
PayBas
ba207cd3b5 [ticket/12813] Reorder .row pagination so it aligns better 
PHPBB3-12813
 2014-07-05 12:40:20 +02:00
PayBas
2d2525f382 [ticket/12813] Fix page-jump title lang and use input type=number 
PHPBB3-12813
 2014-07-05 11:08:15 +02:00
Matt Friedman
606d82f7dd [ticket/12812] Add a migrator tool for config_text database changes 
PHPBB3-12812
 2014-07-05 00:57:34 -07:00
Nils Adermann
53ff23671c Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus 
* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
 2014-07-04 21:08:20 +02:00
Matt Friedman
3c223c2978 [ticket/12811] Responsive adjustments to margin changes 
PHPBB3-12811
 2014-07-04 10:36:33 -07:00
Matt Friedman
8643ca6303 [ticket/12811] Fix padding/margin bug affecting bottom layout 
PHPBB3-12811
 2014-07-04 10:26:17 -07:00