mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00
Code Issues Releases Wiki Activity
24,686 Commits 18 Branches 192 Tags
Commit Graph

24686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
1bd20eb273 Merge pull request #3740 from kinerity/ticket/13955 
[ticket/13955] Fix WebFontConig to load web fonts correctly
 2015-07-07 10:46:47 +02:00
Kailey Truscott
4ac2256683 [ticket/13955] Revert changes made in previous commit 
Revert the javascript function change
Place the families code on it's own line

PHPBB3-13955
 2015-07-06 16:43:57 -04:00
Kailey Truscott
886ca1dbb9 [ticket/13955] Fix javascript to conform to Google and add simple_header 
Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header

PHPBB3-13955
 2015-07-06 01:43:03 -04:00
Kailey Truscott
b346f216c2 [ticket/13955] Fix WebFontConig to load web fonts correctly 
Fix overall_header's WebFontConfig section to load fonts correctly
in all browsers.

PHPBB3-13955
 2015-07-03 23:44:43 -04:00
Joas Schilling
60b4d5132f Merge pull request #3734 from RMcGirr83/ticket/13759 
[ticket/13759] Initial commit broke timestamps when quoting a post.
 2015-07-03 17:16:28 +02:00
RMcGirr83
18a08e1af1 [ticket/13579] This commit corrects the regression. 
PHPBB3-13759
 2015-07-02 20:43:14 -04:00
Tristan Darricau
2be39c5a8f Merge pull request #3654 from s9e/ticket/13880 
[ticket/13880] Automatically remove quotes that are nested too deep
 2015-06-29 11:33:00 +02:00
Joas Schilling
7b903919bf Merge pull request #3620 from VSEphpbb/ticket/13818 
[ticket/13818] Add Extension and Style CDB Links into ACP Management pages
 2015-06-27 14:54:33 +02:00
Joas Schilling
7b93df1522 Merge pull request #3714 from marc1706/ticket/13951 
[ticket/13951] Make sure the page number is an integer
 2015-06-27 11:14:23 +02:00
Joas Schilling
2237030398 Merge pull request #3725 from RMcGirr83/ticket/13962 
[ticket/13962] MCP Queue dropdown for forum selection
 2015-06-27 11:01:47 +02:00
Joas Schilling
dbd653327c Merge pull request #3729 from Zoddo/ticket/13967 
[ticket/13967] Use HTTPS on phpbb.com links
 2015-06-27 10:53:36 +02:00
JoshyPHP
ae2237f640 [ticket/13880] Replaced the quote regexp to allow brackets 
This matches the regexp used in bbcode::bbcode_cache_init()

PHPBB3-13880
 2015-06-27 04:25:54 +02:00
JoshyPHP
817db2f135 [ticket/13880] Automatically remove quotes that are nested too deep 
PHPBB3-13880
 2015-06-27 02:52:26 +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
7d7b536874 Merge pull request #3728 from Crizz0/ticket/13966 
[ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_…
 2015-06-26 10:19:58 +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
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
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
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection 
PHPBB3-13962
 2015-06-23 13:26:47 -04: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
abf98f92e6 Merge pull request #3722 from rxu/ticket/13948 
[ticket/13948] Correctly forwarding to the RIR for whois feature

* rxu/ticket/13948:
  [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
da7b24449d Merge pull request #3715 from marc1706/ticket/13949 
[ticket/13949] Replace colon with colon lang key in memberlist search page
 2015-06-19 10:39:33 +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
783a156bd2 [ticket/13951] Make sure the page number is an integer 
PHPBB3-13951
 2015-06-18 09:22:07 +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
8b28881aa2 Merge pull request #3712 from VSEphpbb/ticket/13882 
[ticket/13882] Add lazy load avatars to phpbb avatar wrappers
 2015-06-17 15:39:06 +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
0bab5db1dd Merge pull request #3711 from bantu/ticket/13903 
[ticket/13903] Replacing regexp path naming for container by md5.

* bantu/ticket/13903:
  [ticket/13903] Replacing regexp path naming for container by md5.
 2015-06-16 20:03:31 +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
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
Andreas Fischer
efc09df8df Merge pull request #3710 from marc1706/ticket/12952 
[ticket/12952] Check obvious errors before status in functional tests

* marc1706/ticket/12952:
  [ticket/12952] Check obvious errors before status in functional tests
 2015-06-16 14:24:34 +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
Marc Alexander
2503723e2f [ticket/12952] Check obvious errors before status in functional tests 
This will change the output from just saying that the status did not match
the expected one to actually showing any errors before complaining about a
possible difference in the status code.

PHPBB3-12952
 2015-06-16 11:10:22 +02:00
CHItA
c6308ee7c0 Merge branch 'nickvergessen/ticket/13947' into 3.1.x 2015-06-16 01:18:12 +02:00
Joas Schilling
002f08ba35 [ticket/13947] Add CHItA to the list of developers 
PHPBB3-13947
 2015-06-16 00:17:00 +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 release-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
Joas Schilling
f688bc6160 Merge branch 'ticket/13938' into prep-release-3.1.5 2015-06-14 07:44:58 +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
Joas Schilling
e59b96e968 Merge pull request #3706 from marc1706/ticket/13942 
[ticket/13942] Check if path to language file contains language path
 2015-06-14 07:22:57 +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
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
Joas Schilling
a50e2c0c47 Merge branch 'ticket/13939' into prep-release-3.1.5 2015-06-13 15:42:42 +02:00