1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-28 11:32:57 +01:00

25272 Commits

Author SHA1 Message Date
Marc Alexander
f0dbfc56d5
Merge pull request #4812 from rxu/ticket/15200-3.1.x
[ticket/15200] Allow extensions using custom templates for help/faq controllers
2017-06-05 11:18:27 +02:00
Marc Alexander
fd5a013f06
Merge pull request #4811 from rxu/ticket/15200
[ticket/15200] Allow extensions using custom templates for help/faq controllers
2017-06-05 11:16:32 +02:00
Marc Alexander
be76d582dc
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:13:39 +02:00
Marc Alexander
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
Marc Alexander
346c784bf3
Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
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
Marc Alexander
a282eb1328
Merge branch '3.1.x' into 3.2.x 2017-06-05 10:54:41 +02:00
Marc Alexander
fb29d79bc1
Merge pull request #4782 from nomind60s/ticket/14498
[ticket/14498] Don't display 'Who is online' members when permission is No
2017-06-05 10:54:31 +02:00
Marc Alexander
e10d563fc9
Merge branch '3.1.x' into 3.2.x 2017-06-03 11:43:09 +02:00
Marc Alexander
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
Marc Alexander
4d4dbd52f7
Merge branch '3.1.x' into 3.2.x 2017-06-03 11:37:06 +02:00
Marc Alexander
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
Marc Alexander
77d73678a1
Merge branch 'ticket/15219' into ticket/15219-rhea 2017-06-03 11:13:03 +02:00
Marc Alexander
170613848a
[ticket/15219] Add console command for updating hashes to bcrypt
PHPBB3-15219
2017-06-03 11:07:34 +02:00
Marc Alexander
e2c0356f34
[ticket/15179] Replace spaces with a tab
PHPBB3-15179
2017-06-03 10:01:28 +02:00
Erwan Nader
0914123391 [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-05-31 21:21:04 +02:00
Erwan Nader
e754a51acc [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-05-31 21:04:22 +02:00
Marc Alexander
a079c5fed0
Merge branch 'ticket/15178' into ticket/15179 2017-05-31 20:20:43 +02:00
Marc Alexander
e3ec1440ef
[ticket/15178] Run update again
PHPBB3-15178
2017-05-31 20:06:33 +02:00
Marc Alexander
f63f9693d8
Merge branch '3.1.x' into 3.2.x 2017-05-30 19:09:21 +02:00
Marc Alexander
635f73bc06
Merge pull request #4690 from javiexin/ticket/15081
[ticket/15081] Add acp_ext_details_notice template event
2017-05-30 19:05:44 +02:00
Marc Alexander
7dc288cb89 Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x 2017-05-29 12:13:41 +02:00
David Colón
9029a925aa [ticket/14992] Add temp index migration for removing duplicates 2017-05-25 14:42:45 -04:00
Marc Alexander
deb9240546
Merge pull request #4701 from DavidIQ/ticket/14992
[ticket/14992] Improve user_notifications table performance
2017-05-25 19:36:26 +02:00
David Colón
a6317dc52d [ticket/14992] Reduce notification table col sizes 2017-05-25 09:40:58 -04:00
Marc Alexander
de4b2eb620
Merge branch '3.1.x' into 3.2.x 2017-05-25 08:52:45 +02:00
Marc Alexander
3f58b5f9ab
Merge pull request #4717 from rmcgirr83/ticket/15107
[ticket/15107] Add message_parser to event
2017-05-25 08:52:41 +02:00
David Colón
4c67f65d5d [ticket/14992] 'method' is needed for the unique index 2017-05-24 16:56:24 -04:00
RMcGirr83
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
David Colón
c2711fb6c4 [ticket/14992] Remove temp index migration 2017-05-23 14:01:30 -04:00
Marc Alexander
f3c782b358
[ticket/14992] Make unit tests run more verbose
PHPBB3-14992
2017-05-21 22:19:44 +02:00
javiexin
bee363f072 [ticket/15227] Remove function deregister_globals, not needed
PHPBB3-15227
2017-05-21 16:57:01 +02:00
Marc Alexander
37e30ad83e
Merge pull request #4822 from Louis7777/ticket/15212
[ticket/15212] Fix code box double horizontal scrollbars
2017-05-21 16:38:21 +02:00
Marc Alexander
6a69c6a006
Merge pull request #4834 from senky/ticket/15056
[ticket/15056] Update subforum icons with Mark forums read
2017-05-21 16:33:02 +02:00
Marc Alexander
bcc85ab679
[ticket/14992] Correctly remove table name and prefix from keys
PHPBB3-14992
2017-05-21 16:01:27 +02:00
Marc Alexander
15e80cebe8
Merge branch '3.1.x' into 3.2.x 2017-05-21 14:20:08 +02:00
Marc Alexander
11f968e774
[ticket/14992] Shorten index name for user_id and item_id
PHPBB3-14992
2017-05-21 14:18:10 +02:00
Daniel Mota
1a1def5339
[ticket/15020] Add Event for mcp_topic_postrow_post_subject
Add 2 events:
mcp_topic_postrow_post_subject_before
mcp_topic_postrow_post_subject_after

PHPBB3-15020
2017-05-21 13:04:47 +02:00
javiexin
1d5f5ccffc [ticket/15227] Remove STRIP, as always false
PHPBB3-15227
2017-05-21 12:58:05 +02:00
Marc Alexander
ff3f52db6d
Merge branch '3.1.x' into 3.2.x 2017-05-21 12:49:19 +02:00
Daniel Mota
b63b83a920
[ticket/14996] Add Event for search_results_topic_title_after
PHPBB3-14996
2017-05-21 12:15:43 +02:00
Jakub Senko
06a9629497
[ticket/15056] Update subforum icons with Mark forums read
PHPBB3-15056
2017-05-16 17:55:28 +02:00
javiexin
c2c5c20c31 [ticket/15227] Check PHP version and remove old unused code
PHPBB3-15227
2017-05-12 23:04:54 +02:00
Tristan Darricau
60d1e49e43
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15226] Add index for latest topics to topics table
2017-05-12 17:27:01 +02:00
Marc Alexander
18b29ca074
[ticket/15226] Add index for latest topics to topics table
PHPBB3-15226
2017-05-11 18:30:51 +02:00
Tristan Darricau
3fd197f37a
Merge pull request #4828 from hubaishan/ticket/15221
[ticket/15221] add missing commas

* github.com:phpbb/phpbb:
  [ticket/15221] add missing commas
2017-05-08 14:56:01 +02:00
hubaishan
2d8985e4a4 [ticket/15221] add missing commas
in language/en/install.php

PHPBB3-15221
2017-05-07 16:28:00 +03:00
Marc Alexander
8fd78e607d
Merge branch 'ticket/15219' into ticket/15219-rhea 2017-05-05 21:26:07 -04:00
Marc Alexander
7034986427
[ticket/15219] Add missing space
PHPBB3-15219
2017-05-05 21:25:29 -04:00
Marc Alexander
710a943b00
Merge branch 'ticket/15219' into ticket/15219-rhea 2017-05-05 21:08:13 -04:00