1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

166 Commits

Author SHA1 Message Date
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
9be5405e5b [prep-release-3.1.0-b1] Update build version to 3.1.0-b2-dev 2014-03-15 17:32:07 +01:00
407e0dbd8b [prep-release-3.1.0-b1] Update version to 3.1.0-b1 2014-03-15 15:37:21 +01:00
40e76c090e [ticket/11764] Create separate packages for subsilver2 on releases.
PHPBB3-11764
2014-03-08 17:37:29 +01:00
1e86f71133 [ticket/12180] Add "Each file MUST end with exactly one newline character" rule
PHPBB3-12180
2014-02-10 15:01:50 +01:00
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
127c0c4493 [prep-release-3.1.0-a3] Update version to 3.1.0-a3 2014-02-05 16:55:21 +01:00
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
aae4d4c90d [ticket/12162] Set language to C before running diff to ensure its english
PHPBB3-12162
2014-02-04 12:32:25 +01:00
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
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
9047c0c061 [ticket/12140] Remove the diff class / MOD text build script
PHPBB3-12140
2014-02-02 13:36:12 +01:00
2081d973b0 [ticket/12030] Fix some spelling issues
PHPBB3-12030
2014-01-08 23:53:45 +01:00
df61389238 [ticket/12030] Fix wrong file and directory names
PHPBB3-12030
2013-12-19 16:40:30 +01:00
4429022b98 [ticket/12030] Include adm/images/ when the css file was updated
The images are referenced relative from the admin.css file.
So when it was updated and the images where not, the updater will be without
images, unless we ensure that they are included in the update-package.

PHPBB3-12021
PHPBB3-12030
2013-12-19 15:25:38 +01:00
eac19fb5f6 [ticket/12030] Include config directory completly in update packages
When one of the config files was updated, we need to include all config files
because they are referenced relative from the files themselves.

PHPBB3-12030
2013-12-19 15:23:09 +01:00
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
10bfb2fe05 [task/code-sniffer] Completely ignore database_update.php.
PHPBB3-11980
2013-10-30 13:56:11 +01:00
6ac46ad469 [task/code-sniffer] Add PSR1.Files.SideEffects.FoundWithSymbols
PHPBB3-11980
2013-10-30 11:40:34 +01:00
49269fbdf4 [task/code-sniffer] Add PSR1.Classes.ClassDeclaration.MissingNamespace
PHPBB3-11980
2013-10-30 01:33:00 +01:00
3944efe528 [task/code-sniffer] Add Generic.WhiteSpace.DisallowSpaceIndent
PHPBB3-11980
2013-10-30 01:15:57 +01:00
63ce04d565 [task/code-sniffer] Add Generic.Functions.CallTimePassByReference
PHPBB3-11980
2013-10-30 00:49:01 +01:00
94334992ec [task/code-sniffer] Add Generic.Formatting.DisallowMultipleStatements
PHPBB3-11980
2013-10-30 00:44:24 +01:00
69a766fe79 [task/code-sniffer] Add OneClassPerFile and OneInterfacePerFile.
PHPBB3-11980
2013-10-30 00:31:39 +01:00
27a180f5d2 [task/code-sniffer] Add Generic.CodeAnalysis.UselessOverridingMethod
PHPBB3-11980
2013-10-30 00:12:47 +01:00
721e652425 [task/code-sniffer] Add Generic.CodeAnalysis.ForLoopShouldBeWhileLoop
PHPBB3-11980
2013-10-29 23:56:11 +01:00
387ed37b31 [task/code-sniffer] Do not abort immediately on PHP Code Sniffer failure.
PHPBB3-11980
2013-10-29 23:53:07 +01:00
d326a49fd0 [task/code-sniffer] Check function/method argument list spacing.
PHPBB3-11980
2013-10-29 21:27:07 +01:00
99fccb6f19 [task/code-sniffer] Cleanup code sniffer ruleset files.
PHPBB3-11980
2013-10-29 01:36:37 +01:00
92144b370c [task/code-sniffer] Check phpBB/phpbb first. This is where new files go.
PHPBB3-11980
2013-10-29 01:00:24 +01:00
6a7db8d51a [task/code-sniffer] Require code sniffer to pass on Travis CI.
PHPBB3-11980
2013-10-29 00:59:51 +01:00
8c83acb28b [task/code-sniffer] Add code sniffer rulesets.
PHPBB3-11980
2013-10-27 17:50:58 +01:00
e660d1bac1 [task/code-sniffer] Phing target for sniffing.
PHPBB3-11980
2013-10-27 17:43:03 +01:00
7fb3676957 [task/code-sniffer] Move code sniffer below build folder.
PHPBB3-11980
2013-10-27 17:42:49 +01:00
7a46976a78 [prep-release-3.1.0-a1] Only build packages for the latest olympus versions 2013-10-14 12:21:54 +02:00
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
7e96b663f1 [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+
PHPBB3-11913
2013-10-14 00:15:10 +02:00
818296cfc9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11877] Create package links and checksums for announcement via script.
2013-10-03 22:26:37 -05:00
dbd0380c3f [ticket/11877] Create package links and checksums for announcement via script.
PHPBB3-11877
2013-10-01 16:16:19 +02:00
af2ad7a162 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
2013-09-30 23:35:06 +02:00
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256.
PHPBB3-11876
2013-09-30 18:09:27 +02:00
da9756ba25 [ticket/11876] Move checksum generation from build PHP files to phing build.xml
This also removes paths from the checksum files.

PHPBB3-11876
2013-09-30 18:08:42 +02:00
94fccd8a5e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.

Conflicts:
	build/build.xml
2013-09-30 17:05:40 +02:00
ac4736db08 [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. 2013-09-30 17:04:14 +02:00
8db820be63 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
2013-09-27 01:39:24 +02:00
50f6af2a20 [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. 2013-09-27 01:37:14 +02:00
9a5415fe6d Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-09-27 01:32:09 +02:00
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
fcb9476615 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-09-05 00:37:40 +02:00