Marc Alexander
a89fdabb35
Merge branch '3.2.x'
2017-12-27 20:44:44 +01:00
Daniel Sinn
5b22ccfa76
[ticket/15471] Add core events to ACP when pruning a forum
...
PHPBB3-15471
2017-11-30 15:40:18 -05:00
MichaelC
ddc9b720ad
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15463] Add MichaelC and Hanakin to the dev credits
2017-11-26 21:57:07 +00:00
Máté Bartus
d6d77a199b
[ticket/15463] Add MichaelC and Hanakin to the dev credits
...
PHPBB3-15463
2017-11-23 09:16:54 +01:00
Derky
1dd447c4aa
Merge branch '3.2.x'
2017-11-21 14:10:06 +01:00
Máté Bartus
57323d1650
[ticket/15461] Add Derky to the list of contributors.
...
PHPBB3-15461
2017-11-21 14:02:43 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
...
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
a51741df41
Merge branch '3.2.x'
2017-10-31 15:47:14 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
...
Fixed typos in some docs, guidelines, some non-user-facing files.
PHPBB3-15424
2017-10-29 12:44:01 +01:00
ftc2
8f97887683
[ticket/15385] nginx.sample.conf: www redirection, security regex
...
according to the latest wiki info:
http://wiki.nginx.org/Pitfalls#Taxing_Rewrites
`return 301` is preferred over a rewrite.
also, the 'security' regex breaks some official extensions because it
will match and deny access to `/ext/phpbb`.
looking through the names of dirs and files containing `phpbb`, it
looks like the intent of the regex was to only disallow the folder
`phpbb` in the root dir and not other `/phpbb` matches.
a negative lookbehind was added to specifically not match `/ext/phpbb`
but still match other occurrences of `/phpbb`.
Tracker ticket: https://tracker.phpbb.com/browse/PHPBB3-15385
2017-10-01 22:57:21 -06:00
Oliver Schramm
99306435bd
Merge branch '3.2.x'
2017-09-10 15:32:28 +02:00
Oliver Schramm
b1e3787197
Merge pull request #4889 from javiexin/ticket/15307
...
[ticket/15307] Extensions may add modes to acp_users
2017-09-10 15:32:23 +02:00
Oliver Schramm
aa15e61e4c
Merge branch '3.2.x'
2017-09-08 13:53:38 +02:00
Tristan Darricau
9b2c45d892
Merge pull request #4894 from rubencm/ticket/15276
...
[ticket/15276] Use storage in avatars
* github.com:phpbb/phpbb: (34 commits)
[ticket/15276] Changed annotation
[ticket/15276] Remove unused code
[ticket/15276] Revert some changes
[ticket/15276] Use IniGetWrapper
[ticket/15276] Add missing dependency
[ticket/15276] Remove unused dependency
[ticket/15276] Add missing properties
[ticket/15276] Use InitGetWrapper
[ticket/15276] Fix comments
[ticket/15276] Fix code and add phpdoc
[ticket/15276] Use stream_copy_to_stream
[ticket/15276] Fix typo
[ticket/15276] Use mimetype guesser
[ticket/15276] Update file_info to get size of images
[ticket/15276] Update
[ticket/15276] Remove avatar_path
[ticket/15276] Remove avatar_path from acp
[ticket/15276] Use finfo to get mimetype
[ticket/15276] Update file_info
[ticket/15276] Fix code style
...
2017-09-08 13:32:38 +02:00
Crizzo
4dfd12d5b2
[ticket/15350] Changes outdated wiki-link to new docs/
...
PHPBB3-15350
2017-09-07 15:05:53 +02:00
Máté Bartus
0755ae423b
Merge pull request #4905 from rxu/ticket/15324
...
[ticket/15324] Add more core and template events
2017-09-07 14:39:39 +02:00
Máté Bartus
049971d31d
Merge branch '3.2.x'
2017-09-07 14:39:03 +02:00
Máté Bartus
6211b69a6f
Merge branch '3.2.x'
2017-09-07 14:32:51 +02:00
Rubén Calvo
2afada5a5a
[ticket/15276] Remove avatar_path
...
PHPBB3-15276
2017-08-25 15:31:58 +02:00
kasimi
1f041c79c6
[ticket/15334] Add template event viewtopic_topic_title_before
...
PHPBB3-15334
2017-08-21 18:32:26 +02:00
rxu
68c3a0307d
[ticket/15324] Add more core and template events
...
PHPBB3-15324
2017-08-16 22:38:34 +07:00
javiexin
b6cb353239
[ticket/15307] Extensions may add modes to acp_users
...
Includes both PHP and Template events.
PHPBB3-15307
2017-08-06 14:22:57 +02:00
rxu
797234e416
[ticket/14972] replace all occurrences of sizeof() with the count()
...
PHPBB3-14972
2017-07-17 16:57:00 +07:00
Marc Alexander
f101532c09
Merge branch '3.2.x'
2017-07-16 21:42:30 +02:00
Marc Alexander
6f897568da
Merge pull request #30 from phpbb/ticket/security-181-rhea
...
[ticket/security-181] Harden protection of migrations files and other directories
2017-07-16 15:08:40 +02:00
Marc Alexander
8514e8be73
Merge branch '3.2.x'
2017-07-11 21:30:04 +02:00
Marc Alexander
324d1e3c55
Merge branch '3.2.x'
2017-07-11 21:19:00 +02:00
Marc Alexander
05c47a0f4a
Merge branch '3.1.x' into 3.2.x
2017-07-11 21:18:42 +02:00
Marc Alexander
b99d47ce7e
[prep-release-3.2.1] Add changelog since 3.2.0
2017-06-25 22:03:32 +02:00
Marc Alexander
35b7a4fae5
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1
2017-06-25 21:53:12 +02:00
Marc Alexander
a5d83e12ec
[prep-release-3.1.11] Update changelog
2017-06-25 21:36:40 +02:00
Marc Alexander
d811743303
[prep-release-3.1.11] Update changelog for 3.1.11-RC1
2017-06-25 17:48:07 +02:00
Marc Alexander
059c08181e
Merge branch '3.2.x'
2017-06-16 20:18:55 +02:00
Marc Alexander
7301748a3a
Merge branch '3.1.x' into 3.2.x
2017-06-16 20:18:50 +02:00
Marc Alexander
1c4f49249f
Merge pull request #4845 from javiexin/ticket/15241
...
[ticket/15241] Add ACP template event acp_profile_contact_last
2017-06-16 20:18:46 +02:00
javiexin
ecdc05a13e
[ticket/15241] Add ACP template event acp_profile_contact_last
...
Event to place code in Profile Field configuration screen,
as additional information for Contact Profile Fields.
PHPBB-15241
2017-06-05 15:14:42 +02:00
Marc Alexander
1377f13f36
Merge branch '3.2.x'
2017-06-05 11:44:13 +02:00
Marc Alexander
192d3932f6
Merge branch '3.1.x' into 3.2.x
2017-06-05 11:43:53 +02:00
Marc Alexander
3f6119c42b
Merge pull request #4818 from rxu/ticket/15205
...
[ticket/15205] Add template events prepending/appending subforum link
2017-06-05 11:22:13 +02:00
Marc Alexander
9a18d3e79c
Merge branch '3.2.x'
2017-05-30 19:10:22 +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
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
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
Daniel Mota
b63b83a920
[ticket/14996] Add Event for search_results_topic_title_after
...
PHPBB3-14996
2017-05-21 12:15:43 +02:00
rxu
e84459ba67
[ticket/15205] Add template events prepending/appending subforum link
...
PHPBB3-15205
2017-05-01 18:49:56 +07:00
Marc Alexander
b98b039056
Merge branch '3.2.x'
2017-04-27 10:04:12 -04:00
