1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

251 Commits

Author SHA1 Message Date
Joas Schilling
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
Joas Schilling
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
Joas Schilling
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
Andreas Fischer
10bfb2fe05 [task/code-sniffer] Completely ignore database_update.php.
PHPBB3-11980
2013-10-30 13:56:11 +01:00
Andreas Fischer
6ac46ad469 [task/code-sniffer] Add PSR1.Files.SideEffects.FoundWithSymbols
PHPBB3-11980
2013-10-30 11:40:34 +01:00
Andreas Fischer
49269fbdf4 [task/code-sniffer] Add PSR1.Classes.ClassDeclaration.MissingNamespace
PHPBB3-11980
2013-10-30 01:33:00 +01:00
Andreas Fischer
3944efe528 [task/code-sniffer] Add Generic.WhiteSpace.DisallowSpaceIndent
PHPBB3-11980
2013-10-30 01:15:57 +01:00
Andreas Fischer
63ce04d565 [task/code-sniffer] Add Generic.Functions.CallTimePassByReference
PHPBB3-11980
2013-10-30 00:49:01 +01:00
Andreas Fischer
94334992ec [task/code-sniffer] Add Generic.Formatting.DisallowMultipleStatements
PHPBB3-11980
2013-10-30 00:44:24 +01:00
Andreas Fischer
69a766fe79 [task/code-sniffer] Add OneClassPerFile and OneInterfacePerFile.
PHPBB3-11980
2013-10-30 00:31:39 +01:00
Andreas Fischer
27a180f5d2 [task/code-sniffer] Add Generic.CodeAnalysis.UselessOverridingMethod
PHPBB3-11980
2013-10-30 00:12:47 +01:00
Andreas Fischer
721e652425 [task/code-sniffer] Add Generic.CodeAnalysis.ForLoopShouldBeWhileLoop
PHPBB3-11980
2013-10-29 23:56:11 +01:00
Andreas Fischer
387ed37b31 [task/code-sniffer] Do not abort immediately on PHP Code Sniffer failure.
PHPBB3-11980
2013-10-29 23:53:07 +01:00
Andreas Fischer
d326a49fd0 [task/code-sniffer] Check function/method argument list spacing.
PHPBB3-11980
2013-10-29 21:27:07 +01:00
Andreas Fischer
99fccb6f19 [task/code-sniffer] Cleanup code sniffer ruleset files.
PHPBB3-11980
2013-10-29 01:36:37 +01:00
Andreas Fischer
92144b370c [task/code-sniffer] Check phpBB/phpbb first. This is where new files go.
PHPBB3-11980
2013-10-29 01:00:24 +01:00
Andreas Fischer
6a7db8d51a [task/code-sniffer] Require code sniffer to pass on Travis CI.
PHPBB3-11980
2013-10-29 00:59:51 +01:00
Andreas Fischer
8c83acb28b [task/code-sniffer] Add code sniffer rulesets.
PHPBB3-11980
2013-10-27 17:50:58 +01:00
Andreas Fischer
e660d1bac1 [task/code-sniffer] Phing target for sniffing.
PHPBB3-11980
2013-10-27 17:43:03 +01:00
Andreas Fischer
7fb3676957 [task/code-sniffer] Move code sniffer below build folder.
PHPBB3-11980
2013-10-27 17:42:49 +01:00
Joas Schilling
7a46976a78 [prep-release-3.1.0-a1] Only build packages for the latest olympus versions 2013-10-14 12:21:54 +02:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Andreas Fischer
7e96b663f1 [ticket/11913] Better download.phpbb.com directory structure for phpBB 3.1+
PHPBB3-11913
2013-10-14 00:15:10 +02:00
Nathan Guse
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
Andreas Fischer
dbd0380c3f [ticket/11877] Create package links and checksums for announcement via script.
PHPBB3-11877
2013-10-01 16:16:19 +02:00
Nils Adermann
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
Andreas Fischer
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256.
PHPBB3-11876
2013-09-30 18:09:27 +02:00
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
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
Andreas Fischer
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
Andreas Fischer
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
Andreas Fischer
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02:00
Andreas Fischer
02b4f1c874 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-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-08-01 17:30:21 +02:00
Andreas Fischer
ea8f584de9 [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. 2013-08-01 17:26:34 +02:00
Igor Wiedler
c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter
2013-07-14 15:27:25 -04:00
Nils Adermann
af69349398 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
2013-07-14 13:56:05 -04:00
Andreas Fischer
da1ee75140 [ticket/11704] Use the correct directory for dependency checking.
PHPBB3-11704
2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b [ticket/11704] Correctly escape "
PHPBB3-11704
2013-07-14 19:48:41 +02:00
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
Nils Adermann
1783134217 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
2013-07-13 13:12:28 -04:00
Andreas Fischer
e0aef4b320 [ticket/11674] Do not include vendor folder if there are no dependencies.
PHPBB3-11674
2013-07-13 18:32:33 +02:00
Joas Schilling
129e393b66 [ticket/11574] Include vendor into update packages
PHPBB3-11574
2013-07-13 09:57:56 +02:00
Andreas Fischer
f1dd35387c [develop-olympus] Bump version numbers for 3.0.12-RC1 release. 2013-07-12 21:10:05 +02:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
2013-05-09 19:42:13 +02:00
Andreas Fischer
f2f97dd5e0 [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
PHPBB3-11513
2013-05-09 19:21:40 +02:00
Oleg Pudeyev
f9354b98d8 Merge PR #1162 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:23 -05:00