1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 01:51:21 +01:00

30244 Commits

Author SHA1 Message Date
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
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
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
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
Marc Alexander
cf603f7025
Merge branch '3.2.x' 2017-05-02 13:16:39 -04:00
Marc Alexander
877760ef98
Merge branch '3.1.x' into 3.2.x 2017-05-02 13:16:36 -04:00
Marc Alexander
ca9e3eb528
Merge pull request #4815 from kasimi/ticket/15187
[ticket/15187] Add paths of newly enabled extensions to template
2017-05-02 13:16:32 -04:00
Marc Alexander
d8e11c7983
Merge branch '3.2.x' 2017-04-30 20:36:15 -04:00
Marc Alexander
521760aeb7
Merge pull request #4816 from javiexin/ticket/15202
[ticket/15202] To disable, an extension must be enabled
2017-04-30 20:36:12 -04:00
kasimi
5808c9fae1
[ticket/15187] Use $this->template property 2017-04-29 13:45:20 +02:00
kasimi
bc404a3701
[ticket/15187] Add ACP style after enabling an extension 2017-04-29 11:01:55 +02:00
javiexin
1e8f467964 [ticket/15202] To disable, an extension must be enabled
PHPBB3-15202
2017-04-28 23:47:51 +02:00
kasimi
0082dd8039
[ticket/15187] Reverted commits e6b7def & 90a80b7
PHPBB3-15187
2017-04-28 22:20:24 +02:00
kasimi
90a80b7b31
[ticket/15187] Fail gracefully if template service is unavailable 2017-04-28 16:58:08 +02:00
kasimi
e6b7defd38
[ticket/15187] Add paths of newly enabled extensions to template
When enabling an extension its paths aren't added immediately to
the template which results in ACP events not being registered in
the compiled template files.

PHPBB3-15187
2017-04-28 16:32:11 +02:00
Tristan Darricau
d6f5231324
Merge branch '3.2.x'
* 3.2.x:
2017-04-28 11:30:36 +02:00
Tristan Darricau
64f33e7a94
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
2017-04-28 11:30:15 +02:00
Tristan Darricau
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
Marc Alexander
e60306d1e1
Merge pull request #4801 from hanakin/ticket/15156
[ticket/15156] Simplify user online notification
2017-04-27 17:04:18 -04:00