mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-27 13:32:33 +01:00
Code Issues Releases Wiki Activity
27,561 Commits 17 Branches 190 Tags
Commit Graph

27561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-06 13:16:03 +01:00
Marc Alexander
ffd6abdeaf Merge remote-tracking branch 'ErnadoO/ticket/14386' into ticket/14386 
Conflicts:
	phpBB/includes/functions_upload.php
 2016-01-06 13:15:43 +01:00
Erwan Nader
73ca420029 [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-03 10:01:00 +01:00
Marc Alexander
dfa88441de Merge pull request #4102 from JoshyPHP/ticket/10628 
[ticket/10628] http:// prepended to "www." urls
 2016-01-01 09:55:34 +01:00
Marc Alexander
e0529ecfe8 Merge pull request #4103 from JoshyPHP/ticket/12221 
[ticket/12221] URLs Containing javascript: are Garbled
 2016-01-01 09:53:59 +01:00
JoshyPHP
2eac5a0ddd [ticket/12221] Added test 
PHPBB3-12221
 2015-12-28 20:10:42 +01:00
JoshyPHP
7273e24101 [ticket/10628] Added test 
Tests that the textarea's content is preserved, that no "http://"
is added to the text or to the preview's HTML and that the www
URL is linkified

PHPBB3-10628
 2015-12-28 19:46:46 +01:00
Marc Alexander
0efbb78afa Merge branch '3.1.x' 2015-12-26 22:10:41 +01:00
Marc Alexander
296243f34f Merge pull request #4100 from marc1706/ticket/14303 
[ticket/14303] Use UTF8 quotes in app.php lang file
 2015-12-26 22:10:38 +01:00
phpBB España
bb5a171674 [ticket/14303] Use UTF8 quotes in app.php lang file 
PHPBB3-14303
 2015-12-26 08:14:33 +01:00
Marc Alexander
fc97c7137d Merge pull request #4099 from marc1706/ticket/14371 
[ticket/14371] Small fix for the quick links alignment
 2015-12-24 15:16:21 +01:00
Melvin García
5e8105a1cd [ticket/14371] Small fix for the quick links alignment 
PHPBB3-14371
 2015-12-24 14:00:34 +01:00
Marc Alexander
b1e4a3e1b7 Merge pull request #4094 from Nicofuma/ticket/14377 
[ticket/14377] Allow extensions to register compiler pass
 2015-12-23 19:27:19 +01:00
Tristan Darricau
d256d81a51 [ticket/14377] Handle new $classname() in the sniffer 
PHPBB3-14377
 2015-12-23 18:45:37 +01:00
Marc Alexander
6a4e296c43 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
 2015-12-23 13:32:44 +01:00
Marc Alexander
84ed888cb9 Merge pull request #4084 from exussum12/ticket/14046 
[ticket/14046] Jabber message incorrect
 2015-12-23 13:32:23 +01:00
Marc Alexander
e6887ec10a Merge pull request #4096 from CHItA/ticket/14380 
[ticket/14380] Maintain consistent template var paths in 3.2 installer
 2015-12-22 22:52:52 +01:00
Mate Bartus
84171c5776 [ticket/14380] Maintain consistent template var paths in 3.2 installer 
PHPBB3-14380
 2015-12-22 21:52:05 +01:00
Máté Bartus
26b068f5b3 Merge pull request #4095 from marc1706/ticket/14378 
[ticket/14378] Use consistent template variable paths
 2015-12-22 21:43:19 +01:00
Marc Alexander
c02fc0f63f [ticket/14378] Use consistent template variable paths 
PHPBB3-14378
 2015-12-22 20:02:44 +01:00
Marc Alexander
d033597c5d Merge branch '3.1.x' 
Conflicts:
	phpBB/adm/style/installer_footer.html
 2015-12-22 19:51:21 +01:00
Marc Alexander
a7ca311d6c Merge pull request #4093 from VSEphpbb/ticket/14374 
[ticket/14374] Update dynamic fallback jquery CDN script tag
 2015-12-22 19:34:22 +01:00
Tristan Darricau
d44e34aa14 [ticket/14377] Allow extensions to register compiler pass 
PHPBB3-14377
 2015-12-22 18:48:49 +01:00
Matt Friedman
1654caf34b [ticket/14374] Update dynamic fallback jquery CDN script tag 
PHPBB3-14374
 2015-12-22 09:29:29 -08:00
Tristan Darricau
332ca57942 Merge pull request #4091 from marc1706/ticket/14373 
[ticket/14373] Do not pass arrays to strpos()

* marc1706/ticket/14373:
  [ticket/14373] Do not pass arrays to strpos()
 2015-12-22 15:40:48 +01:00
Marc Alexander
2fe81c1ccb [ticket/14373] Do not pass arrays to strpos() 
PHPBB3-14373
 2015-12-20 22:20:56 +01:00
Marc Alexander
c2a5411dcb Merge pull request #4076 from Nicofuma/ticket/14177 
[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment
 2015-12-20 12:59:23 +01:00
Marc Alexander
96bd531701 Merge pull request #4087 from VSEphpbb/ticket/14368 
[ticket/14368] Fix color of post editor input boxes
 2015-12-20 11:03:44 +01:00
Matt Friedman
11ad71b381 [ticket/14368] Fix color of post editor input boxes 
https://tracker.phpbb.com/browse/PHPBB3-14368

PHPBB3-14368
 2015-12-19 10:29:22 -08:00
Tristan Darricau
5bbb6e1215 Merge pull request #4083 from RMcGirr83/ticket_14362 
[ticket/14362] Missing lang var in install file

* RMcGirr83/ticket_14362:
  [ticket/14362] Missing lang var in install file
 2015-12-19 18:17:32 +01:00
Tristan Darricau
554b90b59f [release-3.2.0-a2] Update version to 3.2.0-a3 2015-12-19 17:34:46 +01:00
Tristan Darricau
e23b48490c Merge branch 'prep-release-3.2.0-a2' 
* prep-release-3.2.0-a2:
  [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2
  [prep-release-3.2.0-a2]  Add migration for 3.2.0-a2
  [prep-release-3.2.0-a2] Update version to 3.2.0-a2
 2015-12-19 17:32:28 +01:00
Tristan Darricau
7381e99517 [prep-release-3.2.0-a2] Add changelog for 3.2.0-a2 2015-12-19 17:17:01 +01:00
Tristan Darricau
8daeb6962a [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 2015-12-19 17:17:01 +01:00
Tristan Darricau
6b09dbe16c [prep-release-3.2.0-a2] Update version to 3.2.0-a2 2015-12-19 17:17:01 +01:00
Joas Schilling
9a814e21aa Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-12-19 14:23:12 +01:00
Joas Schilling
9af2dc0b6b Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-12-19 14:21:57 +01:00
Joas Schilling
e3acdfed92 [prep-release-3.1.7] Add migration to update the version release-3.1.7 2015-12-19 12:21:25 +01:00
Joas Schilling
4ec32592a4 [prep-release-3.1.7] Increase version to 3.1.7 2015-12-19 12:21:04 +01:00
Scott Dutton
7ebbc69dbd [ticket/14046] Jabber message incorrect 
When making a Jabber message, the page says the message has been sent
when loading the page for the first time, This message should only be
shown after the message has actually been sent

PHPBB3-14046
 2015-12-16 22:15:29 +00:00
Richard McGirr
6eaeb7ebef [ticket/14362] Missing lang var in install file 
PHPBB3-14362
 2015-12-16 06:42:37 -05:00
Tristan Darricau
6ffbd26377 [ticket/14177] CS 
PHPBB3-14177
 2015-12-15 19:55:55 +01:00
Máté Bartus
28969511d2 Merge pull request #4081 from Nicofuma/ticket/14359 
[ticket/14359] Fix console.command.reparser.reparse service definition
 2015-12-14 22:34:58 +01:00
Tristan Darricau
3d6a6200d8 [ticket/14359] Fix console.command.reparser.reparse service definition 
PHPBB3-14359
 2015-12-14 22:32:16 +01:00
Máté Bartus
60587d77bb Merge pull request #4080 from Nicofuma/ticket/14358 
[ticket/14358] Includes the composer autoloader in create_schema_files.php
 2015-12-14 22:16:32 +01:00
Tristan Darricau
54d3d4be30 [ticket/14358] Includes the composer autoloader in create_schema_files.php 
PHPBB3-14358
 2015-12-14 22:13:23 +01:00
Marc Alexander
71738ff099 Merge branch '3.1.x' 2015-12-13 11:19:01 +01:00
Marc Alexander
67f3017274 Merge pull request #4078 from VSEphpbb/ticket/14353 
[ticket/14353] Complete [list] bbcode documentation/examples
 2015-12-13 11:18:53 +01:00
Joas Schilling
b2a26ab5f4 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-12-12 15:24:29 +01:00
Joas Schilling
1de3ede399 [3.1.x] Update version to 3.1.8-dev 2015-12-12 15:19:47 +01:00