1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 23:21:33 +02:00
Commit Graph

2197 Commits

Author SHA1 Message Date
Marc Alexander
200271d872 Merge branch '3.3.x' 2019-09-23 17:37:22 +02:00
Marc Alexander
f4935ef500 Merge branch '3.2.x' into 3.3.x 2019-09-23 17:37:17 +02:00
Marc Alexander
9217b85c68 Merge pull request #5678 from rxu/ticket/16148
[ticket/16148] Add template events to acp_groups.html
2019-09-23 17:37:13 +02:00
Marc Alexander
17fe7baa38 Merge branch '3.3.x' 2019-09-20 22:23:18 +02:00
Marc Alexander
a7c02304a5 Merge branch '3.2.x' into 3.3.x 2019-09-20 22:23:06 +02:00
Marc Alexander
ae00da85ec [prep-release-3.2.8] Update changelog for 3.2.8 2019-09-08 21:50:46 +02:00
Marc Alexander
6757450a0f [prep-release-3.2.8] Update CREDITS.txt 2019-09-08 21:42:02 +02:00
rxu
32accc18e7 [ticket/16148] Add template events to acp_groups.html
PHPBB3-16148
2019-09-05 19:42:40 +07:00
Marc Alexander
50eb426837 Merge branch '3.3.x' 2019-08-17 21:48:35 +02:00
Marc Alexander
0b843505e8 Merge branch '3.2.x' into 3.3.x 2019-08-17 21:48:12 +02:00
Marc Alexander
0f1643374e [prep-release-3.2.8] Update changelog for 3.2.8-RC1 2019-08-17 11:24:20 +02:00
Marc Alexander
4845254ee7 Merge branch '3.3.x' 2019-08-11 17:24:20 +02:00
Marc Alexander
0cbf06780e Merge branch '3.2.x' into 3.3.x 2019-08-11 17:24:16 +02:00
Marc Alexander
fe052fccd4 Merge pull request #5642 from dark-1/ticket/16114
[ticket/16114] mcp_topic_post_author_full_{append/prepend}
2019-08-11 17:24:11 +02:00
Dark❶
2975eef976 [ticket/16114] mcp_topic_post_author_full_{append/prepend}
PHPBB3-16114
2019-08-07 21:05:07 +05:30
Dark❶
159c1d16d8 [ticket/16114] mcp_topic_post_author_full_{append/prepend}
PHPBB3-16114
2019-08-07 20:58:22 +05:30
Marc Alexander
1d942d4b17 Merge branch '3.3.x' 2019-07-29 21:45:22 +02:00
Marc Alexander
90722a3c66 Merge branch '3.2.x' into 3.3.x 2019-07-29 21:45:18 +02:00
Marc Alexander
a02524e7fc Merge pull request #5633 from kasimi/ticket/16108
[ticket/16108] Add topiclist_row_topic_by_author_before|after
2019-07-29 21:45:13 +02:00
Marc Alexander
e9dbba649a Merge branch '3.3.x' 2019-07-29 21:43:42 +02:00
Marc Alexander
2e634e9f96 Merge branch '3.2.x' into 3.3.x 2019-07-29 21:43:37 +02:00
Marc Alexander
207b678896 Merge pull request #5632 from kasimi/ticket/16107
[ticket/16107] Add mcp_move_destination_forum_before|after
2019-07-29 21:43:32 +02:00
Dark❶
b30822ea80 [ticket/16114] mcp_topic_postrow_post_details_author_username_{append/prepend}
PHPBB3-16114
2019-07-29 02:57:24 +05:30
kasimi
7a54701612 [ticket/16108] Add topiclist_row_topic_by_author_before|after
PHPBB3-16108
2019-07-23 21:21:54 +02:00
kasimi
2bb08f853e [ticket/16107] Add mcp_move_destination_forum_before|after
PHPBB3-16107
2019-07-23 21:19:05 +02:00
Marc Alexander
72dbba8592 Merge branch '3.3.x' 2019-07-21 21:38:31 +02:00
Marc Alexander
348979c13d Merge branch '3.2.x' into 3.3.x 2019-07-21 21:38:27 +02:00
Marc Alexander
091e195717 Merge pull request #5571 from dark-1/ticket/16021
[ticket/16021] Recognize number of Template Event instances in events.md file
2019-07-21 21:38:23 +02:00
Marc Alexander
9d877917fa Merge branch '3.3.x' 2019-06-07 23:46:56 +02:00
Marc Alexander
bd646cff52 Merge branch '3.2.x' into 3.3.x 2019-06-07 23:46:47 +02:00
Marc Alexander
7ca740bec8 Merge pull request #5574 from dark-1/ticket/16025
[ticket/16025] Add 2 template events *_author_username_{append/prepend}
2019-06-07 23:46:41 +02:00
Marc Alexander
1035cd9ac3 Merge branch '3.3.x' 2019-05-12 18:06:03 +02:00
Marc Alexander
89ae1c3221 [ticket/16052] Update version numbers to 3.3
PHPBB3-16052
2019-05-11 23:36:44 +02:00
Marc Alexander
3f33d89572 [ticket/16052] Fix issues caused by merges
PHPBB3-16052
2019-05-11 23:36:20 +02:00
Marc Alexander
e76c673e2e [ticket/14948] Update requirements and travis build matrix
PHPBB3-14948
2019-05-09 21:49:57 +02:00
luzpaz
a9a28859d4 [ticket/15424] Multiple typo fixes in docs & comments
Fixed typos in some docs, guidelines, some non-user-facing files.

PHPBB3-15424
2019-05-08 22:20:56 +02:00
Dark❶
fd0d9e9967 [ticket/16025] Add 2 template events *_author_username_{append/prepend}
PHPBB3-16025
2019-05-07 20:56:30 +05:30
Marc Alexander
004477f6a6 Merge branch '3.2.x' 2019-05-03 23:15:56 +02:00
Marc Alexander
0d3b393ca6 [prep-release-3.2.7] Add changelog for 3.2.7-RC1 2019-05-02 22:57:33 +02:00
Marc Alexander
c5a995ec8d Merge branch '3.2.x' 2019-04-29 09:40:19 +02:00
Marc Alexander
2575b499a3 [prep-release-3.2.6] Update Changelog and add missing preg_match 2019-04-28 18:15:44 +02:00
Marc Alexander
d54c43ae8f [prep-release-3.2.6] Update changelog for 3.2.6 2019-04-28 09:27:54 +02:00
Marc Alexander
f6f6d79398 Merge branch '3.2.x' 2019-04-21 00:19:45 +02:00
Marc Alexander
2b0645b7b9 [prep-release-3.2.6] Update changelog for 3.2.6-RC1 2019-04-20 23:07:54 +02:00
Dark❶
00a260dc00 [ticket/16025] Add 2 template events *_author_username_{append/prepend}
PHPBB3-16025
2019-04-20 15:30:24 +05:30
Dark❶
22ca7474ea [ticket/16021] Recognize number of Template Event instances in events.md file
PHPBB3-16021
2019-04-19 19:06:40 +05:30
Marc Alexander
e8f08ef465 Merge branch '3.2.x' 2019-04-12 22:04:44 +02:00
Marc Alexander
f0ffb25a24 Merge pull request #5484 from rxu/ticket/15915
[ticket/15915] Add template events to posting_attach_body.html
2019-04-12 22:04:40 +02:00
Marc Alexander
d7b88c4299 Merge branch '3.2.x' 2019-04-12 21:56:18 +02:00
Marc Alexander
728b5d2b44 [ticket/16010] Fix typo in event descriptions
PHPBB3-16010
2019-04-11 22:04:15 +02:00