Joas Schilling
5b7dab01f9
Merge branch '3.1.x'
2015-06-27 10:53:50 +02:00
Zoddo
8bb48b575d
[ticket/13967] Use HTTPS on phpbb.com links
...
This fix the HTTPS breaking issue on the BBCode FAQ.
PHPBB3-13967
2015-06-26 14:53:05 +02:00
Marc Alexander
9e117a9eeb
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/mcp/mcp_post.php
2015-06-26 10:25:10 +02:00
Crizzo
ef6af2682b
[ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post
...
PHPBB3-13966
2015-06-25 22:22:56 +02:00
Tristan Darricau
8747c7a2c1
Merge pull request #3579 from s9e/ticket/13803
...
[ticket/13803] Implement a generic and scalable way to reparse rich text
2015-06-24 16:58:41 +02:00
Tristan Darricau
6bcf12a558
Merge pull request #3618 from marc1706/ticket/13832
...
[ticket/13832] Use preg_replace_callback instead of /e modifier
2015-06-24 16:36:15 +02:00
Tristan Darricau
d430acb568
Merge pull request #3669 from s9e/ticket/13901
...
[ticket/13901] Add more whitespace to long quotes for readability
2015-06-24 16:34:53 +02:00
Tristan Darricau
c1b1693098
Merge pull request #3683 from s9e/ticket/13921
...
[ticket/13921] Fix block BBCodes inside of inline BBCodes
2015-06-24 16:28:57 +02:00
Marc Alexander
510f704bc8
Merge branch '3.1.x'
2015-06-24 08:54:50 +02:00
Marc Alexander
84bbd4490e
Merge pull request #3538 from RMcGirr83/ticket/13759
...
[ticket/13759] Take post_time into account
2015-06-24 08:54:45 +02:00
Marc Alexander
58b40945b0
Merge branch '3.1.x'
2015-06-24 08:52:05 +02:00
Marc Alexander
11e312f41c
Merge pull request #3528 from RMcGirr83/ticket/13598
...
[ticket/13598] Allow topic lock on topic creation
2015-06-24 08:51:57 +02:00
Andreas Fischer
8213f24b35
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13952] Fix docblocks
[ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
d43da6cee9
Merge pull request #3721 from rxu/ticket/13952
...
[ticket/13952] Inject event dispatcher dependency to the tidy search cron task
* rxu/ticket/13952:
[ticket/13952] Fix docblocks
[ticket/13952] Inject dispatcher dependency to the tidy search cron task
2015-06-22 00:45:42 +02:00
Andreas Fischer
759eb29215
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13948] Correctly forwarding to the RIR for whois feature
2015-06-21 21:53:03 +02:00
rxu
bcac964cd0
[ticket/13948] Correctly forwarding to the RIR for whois feature
...
Allow any space count in the ReferralServer string for whois services response.
PHPBB3-13948
2015-06-21 15:48:28 +07:00
rxu
e0476d4f53
[ticket/13952] Fix docblocks
...
PHPBB3-13952
2015-06-20 23:41:53 +07:00
rxu
a8fe3926dc
[ticket/13952] Inject dispatcher dependency to the tidy search cron task
...
PHPBB3-13952
2015-06-20 21:39:06 +07:00
Marc Alexander
4aba193131
Merge branch '3.1.x'
2015-06-19 10:39:40 +02:00
Raphaël M
c083a4adda
[ticket/13949] Replace colon with colon lang key in memberlist search page
...
[ticket/13949] Replace colon with colon lang key in memberlist search
page
PHPBB3-13949
2015-06-19 09:52:33 +02:00
Marc Alexander
1b354ae468
Merge branch '3.1.x'
2015-06-17 16:02:47 +02:00
Marc Alexander
a259d61f57
Merge pull request #3649 from callumacrae/ticket/13879
...
[ticket/13879] Replaced px with em where appropriate.
2015-06-17 16:02:41 +02:00
Marc Alexander
ef890e3363
Merge branch '3.1.x'
2015-06-17 15:39:12 +02:00
Marc Alexander
9f17e224c4
Merge pull request #3708 from s9e/ticket/13946
...
[ticket/13946] Increase the CSS margin around [code] and [list]
2015-06-17 15:32:29 +02:00
Tristan Darricau
ceed27fe27
Merge pull request #3661 from marc1706/ticket/6466
...
[ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
2015-06-17 10:07:12 +02:00
Matt Friedman
4f05364eb9
[ticket/13882] Add lazy load avatars to phpbb wrappers
...
PHPBB3-13882
2015-06-16 11:58:31 -07:00
Andreas Fischer
9296c75738
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13903] Replacing regexp path naming for container by md5.
Conflicts:
phpBB/phpbb/di/container_builder.php
2015-06-16 20:06:28 +02:00
Wardormeur
08a6f663de
[ticket/13903] Replacing regexp path naming for container by md5.
...
Replacement of the path creation based on a blacklist by a md5 filename to
support broader configurations
PHPBB3-13903
2015-06-16 18:29:41 +02:00
JoshyPHP
4be0730898
[ticket/13946] Changed [list] margin to match [code]
...
PHPBB3-13946
2015-06-16 17:20:14 +02:00
Andreas Fischer
beb830df71
Merge pull request #3675 from s9e/ticket/13906
...
[ticket/13906] Fixed old signatures in post preview
* s9e/ticket/13906:
[ticket/13906] Renamed test
[ticket/13906] Added test
[ticket/13906] Fixed old signatures in post preview
2015-06-16 14:34:44 +02:00
Andreas Fischer
65fef50869
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:32:01 +02:00
Andreas Fischer
e8769fd561
Merge pull request #3695 from javiexin/ticket/13931
...
[ticket/13931] Wrong order in docs/events.md
* javiexin/ticket/13931:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
2015-06-16 14:29:18 +02:00
Marc Alexander
80768b526b
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/user_loader.php
2015-06-16 12:35:51 +02:00
Marc Alexander
dc9245dd7a
Merge pull request #3653 from callumacrae/ticket/13882
...
[ticket/13882] Lazy load the notification avatars.
2015-06-16 12:33:17 +02:00
CHItA
d5414592f1
Merge branch '3.1.x'
2015-06-16 01:20:22 +02:00
Joas Schilling
002f08ba35
[ticket/13947] Add CHItA to the list of developers
...
PHPBB3-13947
2015-06-16 00:17:00 +02:00
JoshyPHP
08c7afedfa
[ticket/13946] Increase the CSS margin around [code] and [list]
...
PHPBB3-13946
2015-06-14 19:06:36 +02:00
Joas Schilling
2a662c5e07
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
phpBB/phpbb/user.php
2015-06-14 17:40:18 +02:00
Joas Schilling
7ccb19fa00
Merge branch 'prep-release-3.1.5' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-06-14 17:38:04 +02:00
Joas Schilling
8f5d761112
[prep-release-3.1.5] Add migration for 3.1.5
2015-06-14 16:14:07 +02:00
Joas Schilling
38a1442d40
[prep-release-3.1.5] Update version for final 3.1.5 release
2015-06-14 16:11:22 +02:00
cyberalien
e6407907e2
[ticket/13938] Fix inconsistencies between <link> tags
...
PHPBB3-13938
2015-06-14 07:43:19 +02:00
cyberalien
8eb4ec29ee
[ticket/13938] Remove type and / from <link> elements
...
PHPBB3-13938
2015-06-14 07:43:02 +02:00
cyberalien
338abf77e3
[ticket/13938] Change web font code in simple_header
...
Apply ticket 13876 to simple_header.html
PHPBB3-13938
2015-06-14 07:42:37 +02:00
cyberalien
f9c50a8db3
[ticket/13938] Remove link to print.css in simple_header.html
...
Remaining fixes for ticket 13873: remove link to print.css and
remove type and media from other links.
PHPBB3-13938
2015-06-14 07:42:23 +02:00
Marc Alexander
714533d12e
[ticket/13942] Check if path to language file contains language path
...
PHPBB3-13942
2015-06-13 17:15:28 +02:00
Andreas Fischer
2eceaaddf6
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
Andreas Fischer
89f7fc63e8
Merge pull request #3703 from javiexin/ticket/10711
...
[ticket/10711] Duplicate key error on forum_tracks_table
* javiexin/ticket/10711:
[ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
cyberalien
5170cd67fb
[ticket/13939] Check if loadingIndicator exists before accessing it
...
PHPBB3-13939
2015-06-13 15:42:30 +02:00
Andreas Fischer
e0d1f81114
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
2015-06-13 15:18:44 +02:00