Marc Alexander
145a3a2c75
Merge branch '3.2.x'
2017-05-29 12:14:10 +02:00
Marc Alexander
7dc288cb89
Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x
2017-05-29 12:13:41 +02:00
Marc Alexander
0a3d290551
Merge branch '3.2.x'
2017-05-25 21:50:23 +02:00
Marc Alexander
8fcdf1747c
Merge pull request #4841 from DavidIQ/ticket/14992
...
[ticket/14992] Add temp index migration for removing duplicates
2017-05-25 21:50:13 +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
cb3ce2b19a
Merge branch '3.2.x'
2017-05-25 19:38:02 +02: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
36763ab244
Merge branch '3.2.x'
2017-05-25 08:52:49 +02: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
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
37c48a59c3
Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ticket/15068
2017-05-21 18:25:57 +02:00
javiexin
60d6667eb4
[ticket/15068] Add template vars retrieval from the template object
...
Added tests.
PHPBB3-15068
2017-05-21 18:18:59 +02:00
Marc Alexander
ee95103ced
Merge branch '3.2.x'
2017-05-21 16:42:17 +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
0d1c6d46af
Merge branch '3.2.x'
2017-05-21 16:33:08 +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
3c9843dc42
Merge branch '3.2.x'
2017-05-21 14:20:12 +02:00
Marc Alexander
15e80cebe8
Merge branch '3.1.x' into 3.2.x
2017-05-21 14:20:08 +02:00
Marc Alexander
03c30d4bc6
Merge pull request #4838 from marc1706/ticket/15020
...
[ticket/15020] Add Event for mcp_topic_postrow_post_subject
2017-05-21 14:20:03 +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
Marc Alexander
f9ceb05f2c
Merge branch '3.2.x'
2017-05-21 12:49:23 +02:00
Marc Alexander
ff3f52db6d
Merge branch '3.1.x' into 3.2.x
2017-05-21 12:49:19 +02:00
Marc Alexander
fbc8a4a275
Merge pull request #4837 from marc1706/ticket/14996
...
[ticket/14996] Add Event for search_results_topic_title_after
2017-05-21 12:49:15 +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
Tristan Darricau
52dd4895c8
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15226] Add index for latest topics to topics table
2017-05-12 17:27:06 +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
Tristan Darricau
0984dbb3f8
Merge pull request #4832 from marc1706/ticket/15226
...
[ticket/15226] Add index for latest topics to topics table
* github.com:phpbb/phpbb:
[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
Máté Bartus
e87e2a76b1
Merge pull request #4827 from rxu/ticket/15220
...
[ticket/15220] Fix undefined variable $phpbb_root_path in acp_extensions.php
2017-05-09 08:58:18 +02:00
Máté Bartus
f6ac6701ff
Merge pull request #4820 from marc1706/ticket/15213
...
[ticket/15213] Fix stylelint failures
2017-05-09 08:41:48 +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
Tristan Darricau
985d822706
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15221] add missing commas
2017-05-08 14:56:01 +02:00
Tristan Darricau
0af7fc6e08
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15222] Fix a typo in generate_text_for_display_test.php
2017-05-08 14:52:00 +02:00
Tristan Darricau
07d3ae7dac
Merge pull request #4829 from rxu/ticket/15222
...
[ticket/15222] Fix a typo in generate_text_for_display_test.php
* github.com:phpbb/phpbb:
[ticket/15222] Fix a typo in generate_text_for_display_test.php
2017-05-08 14:51:47 +02:00
rxu
9a5714071e
[ticket/15222] Fix a typo in generate_text_for_display_test.php
...
PHPBB3-15222
2017-05-08 17:29:24 +07:00
hubaishan
2d8985e4a4
[ticket/15221] add missing commas
...
in language/en/install.php
PHPBB3-15221
2017-05-07 16:28:00 +03: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
Louis7777
0c79cdcb31
[ticket/15212] Fix code box double horizontal scrollbars
...
The code box has two overflow properties set,
one on the code element and one on the parent div container,
causing double horizontal scrollbars.
PHPBB3-15212
2017-05-04 20:04:11 +03:00
Louis7777
cc40d64e24
[ticket/15212] Fix code box double horizontal scrollbars
...
The code box has two overflow properties set,
one on the code element and one on the parent div container,
causing double horizontal scrollbars.
PHPBB3-15212
2017-05-03 04:04:27 +03:00
Louis7777
3e971bd1f8
[ticket/15212] Fix code box double horizontal scrollbars
...
The code box has two overflow properties set,
one on the code element and one on the parent div container,
causing double horizontal scrollbars.
PHPBB3-15212
2017-05-03 04:00:33 +03:00
Louis7777
234a6f1256
Update content.css
2017-05-03 03:30:16 +03:00
Louis7777
fd423d5a7a
[ticket/15212] Fix code box double horizontal scrollbars
...
The code box has two overflow properties set,
one on the code element and one on the parent div container,
causing double horizontal scrollbars.
PHPBB3-15212
2017-05-03 02:58:05 +03:00
Marc Alexander
5f09e0ec0a
[ticket/15213] Fix stylelint failures
...
PHPBB3-15213
2017-05-02 13:55:36 -04:00
