1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Commit Graph

10712 Commits

Author SHA1 Message Date
cfa56ed3b8 Merge branch '3.2.x' 2017-06-05 11:57:37 +02:00
34fb146ab5 Merge branch '3.1.x' into 3.2.x 2017-06-05 11:57:18 +02:00
05a8baffdb Merge pull request #4840 from rmcgirr83/ticket_15237
[ticket/15237] Fix unguarded includes to functions_user
2017-06-05 11:56:22 +02:00
c0abca3c1a Merge pull request #4836 from hanakin/ticket/15234
[ticket/15234] quickfix notification avatar sizes
2017-06-05 11:55:06 +02:00
92195ede52 Merge branch '3.2.x' 2017-06-05 11:53:07 +02:00
4177edf33a Merge pull request #4833 from javiexin/ticket/15227
[ticket/15227] Check PHP version and remove old unused code
2017-06-05 11:53:02 +02:00
a58d032bf9 Merge branch '3.2.x' 2017-06-05 11:13:43 +02:00
be76d582dc Merge branch '3.1.x' into 3.2.x 2017-06-05 11:13:39 +02:00
acf9cdba01 Merge pull request #4810 from rxu/ticket/15199
[ticket/15199] Add core event to the messenger send() function
2017-06-05 11:13:35 +02:00
509ea30aa2 Merge branch '3.2.x' 2017-06-05 11:02:49 +02:00
346c784bf3 Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
a6939fcb8e Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00
cfafc32694 Merge branch '3.2.x' 2017-06-03 11:43:13 +02:00
e10d563fc9 Merge branch '3.1.x' into 3.2.x 2017-06-03 11:43:09 +02:00
b357f78546 Merge pull request #4747 from ErnadoO/ticket/15132
[ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
2017-06-03 11:43:06 +02:00
2a8f3e0101 Merge branch '3.2.x' 2017-06-03 11:37:10 +02:00
4d4dbd52f7 Merge branch '3.1.x' into 3.2.x 2017-06-03 11:37:06 +02:00
58bd7a90a9 Merge pull request #4746 from ErnadoO/ticket/15131
[ticket/15131] Add variable to the 'core.mcp_main_modify_fork_sql' event
2017-06-03 11:37:02 +02:00
686a8e6d3a [ticket/15234] patch avatar sizes
PHPBB3-15234
2017-06-01 16:35:21 -04:00
0914123391 [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-05-31 21:21:04 +02:00
e754a51acc [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-05-31 21:04:22 +02:00
36763ab244 Merge branch '3.2.x' 2017-05-25 08:52:49 +02:00
de4b2eb620 Merge branch '3.1.x' into 3.2.x 2017-05-25 08:52:45 +02:00
3f58b5f9ab Merge pull request #4717 from rmcgirr83/ticket/15107
[ticket/15107] Add message_parser to event
2017-05-25 08:52:41 +02:00
7a3e55bdb3 [ticket/15237] Fix unguarded includes to functions_user
https://tracker.phpbb.com/browse/PHPBB3-15237

PHPBB3-15237
2017-05-24 12:58:25 -04:00
bee363f072 [ticket/15227] Remove function deregister_globals, not needed
PHPBB3-15227
2017-05-21 16:57:01 +02:00
1d5f5ccffc [ticket/15227] Remove STRIP, as always false
PHPBB3-15227
2017-05-21 12:58:05 +02:00
c2c5c20c31 [ticket/15227] Check PHP version and remove old unused code
PHPBB3-15227
2017-05-12 23:04:54 +02:00
rxu
2485db81a3 [ticket/15220] Fix undefined variable $phpbb_root_path in acp_extensions.php
PHPBB3-15220
2017-05-07 10:03:19 +07:00
cf603f7025 Merge branch '3.2.x' 2017-05-02 13:16:39 -04:00
877760ef98 Merge branch '3.1.x' into 3.2.x 2017-05-02 13:16:36 -04:00
5808c9fae1 [ticket/15187] Use $this->template property 2017-04-29 13:45:20 +02:00
bc404a3701 [ticket/15187] Add ACP style after enabling an extension 2017-04-29 11:01:55 +02:00
7254980753 Merge pull request #4657 from marc1706/ticket/7336
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
2017-04-28 11:30:14 +02:00
rxu
f5d49b61bb [ticket/15199] Add core event to the messenger send() function
PHPBB3-15199
2017-04-27 15:06:34 +07:00
183ec7c05f Merge branch '3.2.x' 2017-04-26 19:58:51 -04:00
8179e56b02 Merge branch '3.1.x' into 3.2.x 2017-04-26 19:58:29 -04:00
e53343857a Merge pull request #4674 from senky/ticket/13730
[ticket/13730] Add core.delete_post_end event
2017-04-26 19:57:35 -04:00
630320d9d2 Merge branch '3.2.x' 2017-04-26 19:30:53 -04:00
5cafff36b2 Merge branch '3.1.x' into 3.2.x 2017-04-26 19:30:50 -04:00
4c58dfc19a Merge pull request #4671 from senky/ticket/13605
[ticket/13605] Add core.ucp_pm_compose_predefined_message event
2017-04-26 19:30:47 -04:00
1f9a269d78 [ticket/11150] Makes the customisation db lync dynamic
PHPBB3-11150
2017-04-23 21:09:59 +02:00
5376f676bf [ticket/11150] Handle composer context transparently
PHPBB3-11150
2017-04-23 21:01:16 +02:00
69571f9cef [ticket/11150] Fix comments
PHPBB3-11150
2017-04-23 21:01:15 +02:00
31953496ee [ticket/11150] More CSS fixes
PHPBB3-11150
2017-04-23 21:01:15 +02:00
9314e533c8 [ticket/11150] Fix rebase conflicts
PHPBB3-11150
2017-04-23 21:01:15 +02:00
ab162b2fa6 [ticket/11150] Do not generate actions links in templates
PHPBB3-11150
2017-04-23 21:01:15 +02:00
d59b26dcec [ticket/11150] Add comments + ignore invaid repositories URLs
PHPBB3-11150
2017-04-23 21:01:15 +02:00
fbf11d61aa [ticket/11150] Updates deps + fix various issues
PHPBB3-11150
2017-04-23 21:01:14 +02:00
60bf9af27a [ticket/11150] Fix illegal uage if $_SERVER when viewing the catalog
PHPBB3-11150
2017-04-23 21:01:14 +02:00