Tristan Darricau
|
a713f5159a
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/10809] Reflect MSSQL removal in docs files
[ticket/10809] Remove MSSQL support
|
2016-09-25 17:19:18 +02:00 |
|
Tristan Darricau
|
de2c70127f
|
Merge pull request #4265 from Senky/ticket/10809
[ticket/10809] Remove MSSQL support
* Senky/ticket/10809:
[ticket/10809] Reflect MSSQL removal in docs files
[ticket/10809] Remove MSSQL support
|
2016-09-25 17:19:13 +02:00 |
|
Marc Alexander
|
e2431502d1
|
Merge branch '3.2.x'
|
2016-09-24 21:45:36 +02:00 |
|
Marc Alexander
|
164f0e031d
|
Merge branch '3.1.x' into 3.2.x
|
2016-09-24 21:45:17 +02:00 |
|
Marc Alexander
|
7d73d1ff83
|
[prep-release-3.1.10] Add changelog for 3.1.10-RC1
|
2016-09-24 14:57:23 +02:00 |
|
Marc Alexander
|
531d23935a
|
Merge branch '3.2.x'
|
2016-09-24 13:04:27 +02:00 |
|
Marc Alexander
|
187c6df18a
|
Merge branch '3.1.x' into 3.2.x
|
2016-09-24 13:04:24 +02:00 |
|
GerB
|
90e9d5c462
|
[ticket/14785] Add template event overall_header_headerbar_after/before
PHPBB3-14785
|
2016-09-24 11:04:23 +02:00 |
|
Marc Alexander
|
f79aabb866
|
Merge branch '3.2.x'
|
2016-09-24 09:36:08 +02:00 |
|
Marc Alexander
|
dcc7118c0d
|
Merge pull request #4460 from marc1706/ticket/14784
[ticket/14784] missing rewrite for lighttpd
|
2016-09-24 09:36:04 +02:00 |
|
Tobi Schäfer
|
537dca0892
|
[ticket/14784] missing rewrite for lighttpd
PHPBB3-14784
|
2016-09-24 08:21:27 +02:00 |
|
Tristan Darricau
|
b12ab19ecd
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/14788] Update CREDITS.txt
|
2016-09-18 13:28:42 +02:00 |
|
Tristan Darricau
|
47d2f34a1b
|
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14788] Update CREDITS.txt
|
2016-09-18 13:28:39 +02:00 |
|
Marc Alexander
|
0d3ca3883e
|
[ticket/14788] Update CREDITS.txt
PHPBB3-14788
|
2016-09-18 12:16:44 +02:00 |
|
Marc Alexander
|
53d96f66e5
|
Merge branch '3.2.x'
|
2016-09-14 20:51:42 +02:00 |
|
Marc Alexander
|
142f937354
|
Merge branch '3.1.x' into 3.2.x
|
2016-09-14 20:51:13 +02:00 |
|
Marc Alexander
|
70aa4407d3
|
Merge remote-tracking branch 'VSEphpbb/ticket/14783' into 3.1.x
|
2016-09-14 20:49:13 +02:00 |
|
Matt Friedman
|
5503c09cd5
|
[ticket/14783] Add template event before custom BBCodes in ACP
PHPBB3-14783
|
2016-09-14 10:37:27 -07:00 |
|
Marc Alexander
|
6f31d334e0
|
Merge branch '3.2.x'
|
2016-09-11 11:08:41 +02:00 |
|
Marc Alexander
|
316b69805b
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/posting_body.html
|
2016-09-11 11:08:24 +02:00 |
|
Marc Alexander
|
4b8e8df55c
|
Merge pull request #4371 from imkingdavid/ticket/14695
[ticket/14695] Add posting_editor_subject_prepend/append template events
|
2016-09-11 11:07:48 +02:00 |
|
Marc Alexander
|
a08b078440
|
Merge branch '3.2.x'
|
2016-08-28 15:54:33 +02:00 |
|
Marc Alexander
|
a2838ad0b1
|
Merge branch '3.1.x' into 3.2.x
|
2016-08-28 15:54:11 +02:00 |
|
Marc Alexander
|
a019a86bfc
|
Merge pull request #4338 from Senky/ticket/14469
Add viewforum_body_topicrow_before template event
|
2016-08-28 15:53:30 +02:00 |
|
Marc Alexander
|
a78a334a0d
|
Merge branch '3.2.x'
|
2016-08-28 15:45:10 +02:00 |
|
Marc Alexander
|
7c79e7844c
|
Merge branch '3.1.x' into 3.2.x
|
2016-08-28 15:44:49 +02:00 |
|
Marc Alexander
|
71a70500ea
|
Merge pull request #4389 from kasimi/ticket/14715-3.1.x
[ticket/14715] Add template events in posting_topic_review & mcp_topic
|
2016-08-28 15:41:59 +02:00 |
|
Jakub Senko
|
317f3e848f
|
[ticket/14469] Add viewforum_body_topicrow_before template event
PHPBB3-14469
|
2016-08-11 10:25:51 +02:00 |
|
David King
|
7e1e3e1a5e
|
[ticket/14695] Add posting_editor_subject_append/prepend subsilver2 to events.md
As per request in PR.
PHPBB3-14695
|
2016-08-09 21:18:59 -04:00 |
|
Marc Alexander
|
81f0d912b0
|
Merge branch '3.2.x'
|
2016-08-03 22:21:47 +02:00 |
|
Marc Alexander
|
6cc4d78ebf
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/memberlist_email.html
|
2016-08-03 22:21:25 +02:00 |
|
Marc Alexander
|
5330ea0f09
|
Merge pull request #4324 from Senky/ticket/14516
[ticket/14516] Add memberlist_email_before event
|
2016-08-03 22:20:48 +02:00 |
|
Jakub Senko
|
37880af03c
|
[ticket/10809] Reflect MSSQL removal in docs files
PHPBB3-10809
|
2016-08-02 12:07:10 +02:00 |
|
kasimi
|
33cd613406
|
[ticket/14715] Converted tabs to spaces
PHPBB3-14715
|
2016-07-22 12:17:15 +02:00 |
|
kasimi
|
20e08aa2a0
|
[ticket/14715] Fixed typos in events.md
PHPBB3-14715
|
2016-07-21 17:49:35 +02:00 |
|
kasimi
|
da7c41f167
|
[ticket/14715] Add template events in posting_topic_review & mcp_topic
The events will allow adding content before and after the post details
in topic review and topic moderation.
PHPBB3-14715
|
2016-07-21 17:48:42 +02:00 |
|
Jakub Senko
|
775df0eb8a
|
[ticket/14516] Add memberlist_email_before event
PHPBB3-14516
|
2016-07-17 20:43:40 +02:00 |
|
Marc Alexander
|
cff33d6c39
|
Merge branch '3.2.x'
|
2016-07-17 17:52:09 +02:00 |
|
Marc Alexander
|
4e480d46f5
|
Merge pull request #4311 from Crizz0/ticket/14620
[ticket/14620] Change docs/ and files to 3.2.x
|
2016-07-17 17:52:05 +02:00 |
|
Crizzo
|
95124db4c9
|
Merge branch '3.2.x'
|
2016-07-16 23:45:54 +02:00 |
|
Marc Alexander
|
6f1b635992
|
[ticket/14506] Remove subsilver2 from docs/events.md
PHPBB3-14506
|
2016-07-16 22:50:37 +02:00 |
|
Marc Alexander
|
1c20bc33a5
|
Merge branch '3.2.x'
|
2016-07-16 21:25:53 +02:00 |
|
Marc Alexander
|
019e85d064
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/mcp_move.html
|
2016-07-16 21:25:17 +02:00 |
|
Marc Alexander
|
b54aa81cdd
|
Merge pull request #4337 from Senky/ticket/14506
Add mcp_move_before template event
|
2016-07-16 21:24:33 +02:00 |
|
Crizzo
|
c9cfde7837
|
[ticket/14620] Adds link to Translations forum
PHPBB3-14620
|
2016-07-14 20:23:46 +02:00 |
|
Marc Alexander
|
113738fce9
|
Merge branch '3.2.x'
|
2016-07-07 19:20:42 +02:00 |
|
Marc Alexander
|
45ba2e9770
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php
|
2016-07-07 19:19:40 +02:00 |
|
Marc Alexander
|
55b854906d
|
Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
|
2016-07-07 19:15:33 +02:00 |
|
Tristan Darricau
|
f9d251943b
|
Merge branch '3.2.x'
* 3.2.x:
[prep-release-3.2.0-RC1] Update changelog
[prep-release-3.2.0-RC1] Add migration
[prep-release-3.2.0-RC1] Update schema.json
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
|
2016-06-27 21:56:21 +02:00 |
|
Tristan Darricau
|
dbf02b4514
|
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x
* upstream/prep-release-3.2.0-RC1:
[prep-release-3.2.0-RC1] Update changelog
[prep-release-3.2.0-RC1] Add migration
[prep-release-3.2.0-RC1] Update schema.json
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
|
2016-06-27 21:54:41 +02:00 |
|