mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
26,371 Commits 17 Branches 190 Tags
Commit Graph

26371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
65d44923b4 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/12952] Check obvious errors before status in functional tests
 2015-06-16 14:24:35 +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
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
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
d5414592f1 Merge branch '3.1.x' 2015-06-16 01:20: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
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 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
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
Joas Schilling
a50e2c0c47 Merge branch 'ticket/13939' into prep-release-3.1.5 2015-06-13 15:42:42 +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
Andreas Fischer
bf7a4f629d Merge pull request #3704 from Nicofuma/ticket/13941 
[ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3

* Nicofuma/ticket/13941:
  [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
 2015-06-13 15:18:43 +02:00
JoshyPHP
eb11c80b23 [ticket/13921] Fix block BBCodes inside of inline BBCodes 
PHPBB3-13921
 2015-06-13 14:27:12 +02:00
Tristan Darricau
5dbfd14699 [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3 
PHPBB3-13941
 2015-06-13 13:20:55 +02:00
javiexin
7b026eff79 [ticket/10711] Duplicate key error on forum_tracks_table 
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).

The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.

PHPBB3-10711
 2015-06-13 01:08:18 +02:00
Joas Schilling
a49bd38e83 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-06-11 23:29:55 +02:00
Joas Schilling
9238d28353 [3.1.x] Update dev version to 3.1.6-RC1 2015-06-11 23:25:43 +02:00
Joas Schilling
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
Joas Schilling
a3883a6f23 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-06-11 21:00:04 +02:00
Joas Schilling
4276962e78 [3.1.x] Increase dev version to 3.1.6-dev 2015-06-11 20:57:26 +02:00
Joas Schilling
69eb563e18 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 20:57:00 +02:00
Joas Schilling
2c65b9b133 Merge pull request #3699 from nickvergessen/ticket/13823 
[ticket/13823] Move the part of the query, so the update will get it …
release-3.1.5-RC1 		2015-06-10 22:26:16 +02:00
Joas Schilling
dfb7bb1de1 Merge branch '3.0.x' into prep-release-3.1.5 2015-06-10 22:23:34 +02:00
Joas Schilling
0d349a82ca Merge pull request #3700 from Nicofuma/ticket/13823 
[ticket/13823] Change diff options while packaging to not ignore all whitespaces
 2015-06-10 22:22:52 +02:00
Tristan Darricau
cdf580ee37 [ticket/13823] Change diff options while packaging to not ignore all whitespaces 
Removed:
    -w, --ignore-all-space       Ignore white space when comparing lines.

Added:
    -Z, --ignore-trailing-space  Ignore white space at line end.
    -b, --ignore-space-change    Ignore changes in the amount of white space.

PHPBB3-13823
 2015-06-10 14:15:10 +02:00
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly 
PHPBB3-13823
 2015-06-09 23:11:26 +02:00
Andreas Fischer
9713f52fc6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:56 +02:00
Andreas Fischer
d8343f2108 Merge pull request #3685 from Nicofuma/ticket/13923 
[ticket/13923] Update startup.php

* Nicofuma/ticket/13923:
  [ticket/13923] CS
  [ticket/13923] Update startup.php
 2015-06-09 21:27:49 +02:00
Andreas Fischer
37c197404e Merge branch '3.1.x' 
* 3.1.x:
 2015-06-09 21:27:26 +02:00
Andreas Fischer
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
 2015-06-09 21:27:23 +02:00
Andreas Fischer
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930 
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
 2015-06-09 21:27:07 +02:00
Tristan Darricau
b5573bb92d [ticket/13923] CS 
PHPBB3-13923
 2015-06-09 21:22:52 +02:00
Joas Schilling
790f7ded5b [prep-release-3.1.5] Add changelog for 3.1.5-RC1 2015-06-09 20:45:37 +02:00
Joas Schilling
23a45fcace [prep-release-3.1.5] Add migration for 3.1.5-RC1 2015-06-09 20:32:15 +02:00
Joas Schilling
d2a2c183ed [prep-release-3.1.5] Update version to 3.1.5-RC1 2015-06-09 20:30:40 +02:00
Joas Schilling
00c15c76c3 Merge branch '3.1.x' 2015-06-09 20:23:29 +02:00