makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 18:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
33956 commits 18 branches 192 tags 209 MiB
Commit graph

380 commits

Author SHA1 Message Date
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Joas Schilling
9d6cef2225 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-07 22:12:37 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
 2014-10-07 20:30:40 +02:00
Joas Schilling
d64a515476 [ticket/13137] Create schema.json in build script 
PHPBB3-13137
 2014-10-07 17:18:00 +02:00
Joas Schilling
e23d2e7b20 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Prepare Changelog
  [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
  [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-09-20 09:55:56 +02:00
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Joas Schilling
7faf66c492 [ticket/12974] Update nightly build version to 3.2.0-a1-dev 
PHPBB3-12974
 2014-08-12 10:56:20 +02:00
Joas Schilling
483b40dfa3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
  [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Prepare Changelog
  [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
  [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3

Conflicts:
	phpBB/styles/subsilver2/style.cfg
 2014-08-12 10:17:47 +02:00
Joas Schilling
3be239b864 [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development 2014-08-12 10:15:42 +02:00
Joas Schilling
b40225c142 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 2014-08-11 19:30:55 +02:00
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2 
PHPBB3-12958
 2014-08-10 12:17:03 +02:00
Joas Schilling
83544992ec Merge pull request #2644 from Nicofuma/ticket/12051 
[ticket/12051] Optimise Composer Autoloader on Build

* Nicofuma/ticket/12051:
  [ticket/12051] Optimise Composer Autoloader on Build
 2014-08-07 12:30:46 +02:00
Joas Schilling
b5492a07da [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development 2014-07-11 17:22:16 +02:00
Joas Schilling
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
Tristan Darricau
a2af95cb37 [ticket/12825] Better sniff for the extensions and skip the vendor/ directory 
PHPBB3-12825
 2014-07-06 23:34:17 +02:00
Joas Schilling
19b4391eef [prep-release-3.1.0-RC1] Update phpBB Version for RC2 development 2014-06-25 00:06:08 +02:00
Joas Schilling
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
Tristan Darricau
ffb992f9a9 [ticket/12051] Optimise Composer Autoloader on Build 
PHPBB3-12051
 2014-06-23 22:26:25 +02:00
Andreas Fischer
ddb35531ac [ticket/12723] Do not mention too many details on documentation. 
PHPBB3-12723
 2014-06-22 01:49:59 +02:00
Andreas Fischer
900a5b07c4 [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions 
PHPBB3-12757
 2014-06-22 01:33:13 +02:00
Andreas Fischer
e7c6da2c54 [ticket/12723] Use core suffix in filename instead of phpbb in the middle. 
PHPBB3-12723
 2014-06-22 01:19:02 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header 
PHPBB3-12723
 2014-06-22 00:45:34 +02:00
Andreas Fischer
f2e57d339e [ticket/12682] Make Code Sniffer run properly on Travis CI again. 
The --ignore parameter takes a case-insensitive pattern and as such
'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name.
This results in nothing being checked against ruleset-php-legacy.xml.

Using absolute paths in the --ignore pattern fixes this issues.

PHPBB3-12682
 2014-06-13 13:32:19 +02:00
Joas Schilling
da48b7df22 [prep-release-3.1.0-b4] Update phpBB Version for b5 development 2014-05-30 17:52:38 +02:00
Joas Schilling
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
Andreas Fischer
9cea96ad4e Merge branch 'task/sami' into task/sami-ascraeus 
* task/sami:
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
 2014-05-16 18:13:45 +02:00
Andreas Fischer
f08f283143 [task/sami] Replace phpdoctor with sami. 
PHPBB3-12495
 2014-05-16 17:56:03 +02:00
Joas Schilling
3b3f941f5f Merge branch 'ticket/10839-olympus' into ticket/10839 
* ticket/10839-olympus:
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default

Conflicts:
	phpunit.xml.dist
 2014-05-09 11:22:30 +02:00
Joas Schilling
333120a992 [ticket/10839] Fix note about running slow tests and build task 
PHPBB3-10839
 2014-05-09 11:19:49 +02:00
Tristan Darricau
c5f5520013 [ticket/12325] Generate the list of the deleted files and folders 
https://tracker.phpbb.com/browse/PHPBB3-12325

PHPBB3-12325
 2014-05-05 16:38:21 +02:00
Joas Schilling
a469974c85 [prep-release-3.1.0-b3] Update phpBB Version for b4 development 2014-05-04 20:23:33 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
013cc2c66f [ticket/12390] Move cleaning of vendor into it's own target 
PHPBB3-12390
 2014-04-16 20:16:03 +02:00
Joas Schilling
8d012197f4 [ticket/12390] Remove documentation, tests and other files from vendor/ 
PHPBB3-12390
 2014-04-12 16:35:20 +02:00
Joas Schilling
45f2efea19 [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 2014-03-30 22:53:09 +02:00
Joas Schilling
254b7739a8 [prep-release-3.1.0-b2] Update version to 3.1.0-b2 2014-03-30 22:08:10 +02:00
Andreas Fischer
5e688f9540 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
 2014-03-25 17:32:03 +01:00
s9e
55e7459922 [ticket/12302] Added --no-dev to composer call in build.xml 
PHPBB3-12302
 2014-03-25 17:20:59 +01:00
Joas Schilling
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
Joas Schilling
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
Joas Schilling
bf93e20afb [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development 2014-02-05 22:23:33 +01:00
Joas Schilling
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
Nils Adermann
1a31f03a7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12162] Set language to C before running diff to ensure its english
  [ticket/11509] Be exact when referencing the branch name.
  [ticket/12161] Do not use subdirectories in build/save directory.
  [ticket/11509] Run commit message checker only in one environment.
  [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.

Conflicts:
	.travis.yml
 2014-02-04 13:05:20 +01:00
Joas Schilling
aae4d4c90d [ticket/12162] Set language to C before running diff to ensure its english 
PHPBB3-12162
 2014-02-04 12:32:25 +01:00
Andreas Fischer
78116a5298 [ticket/12161] Do not use subdirectories in build/save directory. 
This is pretty much pointless because a new build will wipe the save directory
and there are only a few files in there anyway.

PHPBB3-12161
 2014-02-04 02:07:45 +01:00
Andreas Fischer
dfe1761c95 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12140] Remove the diff class / MOD text build script

Conflicts:
	build/build_diff.php
 2014-02-02 14:01:39 +01:00
Nils Adermann
9047c0c061 [ticket/12140] Remove the diff class / MOD text build script 
PHPBB3-12140
 2014-02-02 13:36:12 +01:00