Andreas Fischer
636524fa56
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13819] Add missing sql_freeresult() to files in includes/
Conflicts:
phpBB/includes/acp/acp_database.php
2015-05-06 01:06:21 +02:00
Andreas Fischer
65b40f15f5
Merge pull request #3595 from marc1706/ticket/13819
...
[ticket/13819] Add missing sql_freeresult() to files in includes/
* marc1706/ticket/13819:
[ticket/13819] Add missing sql_freeresult() to files in includes/
2015-05-06 00:46:57 +02:00
Marc Alexander
de90dd25b2
[ticket/13819] Add missing sql_freeresult() to files in includes/
...
PHPBB3-13819
2015-05-05 23:55:13 +02:00
Joas Schilling
de687f32ed
Merge pull request #3432 from Nicofuma/ticket/13638
...
[ticket/13638] Prepend the assets path phpbb root
2015-05-05 18:17:14 +02:00
Nicofuma
51376a4391
[ticket/13638] Inject $filesystem in \phpbb\template\asset
...
PHPBB3-13638
2015-05-05 17:07:11 +02:00
Nicofuma
321ed2a3dd
[ticket/13638] Add tests
...
PHPBB3-13638
2015-05-04 23:23:54 +02:00
Nicofuma
f097f84f16
[ticket/13638] Handle assets outside of phpbb_root_path
...
PHPBB3-13638
2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d
[ticket/13638] Prepend the assets path phpbb root
...
PHPBB3-13638
2015-05-04 23:23:18 +02:00
Nicofuma
ba53901ffb
Merge branch '3.1.x'
2015-05-04 22:53:21 +02:00
Nicofuma
ab3e4b8abc
Merge pull request #3564 from VSEphpbb/ticket/13516
...
[ticket/13516] Do not search ICC profiles in extension vendors
2015-05-04 22:52:28 +02:00
Matt Friedman
5a107d9dc1
[ticket/13516] Update image search script
...
PHPBB3-13516
2015-05-04 10:33:14 -07:00
Tristan Darricau
6be8841a57
Merge pull request #3590 from rxu/ticket/13814
...
[ticket/13814] Prevent phpbb_is_writable() method from truncating files
2015-05-04 14:39:36 +02:00
rxu
0d2c8b5961
[ticket/13814] Prevent phpbb_is_writable() method from truncating files
...
phpbb_is_writable() of filesystem class uses 'w' mode to fopen files
which causes checked files to be truncated. Use the 'c' mode instead.
PHPBB3-13814
2015-05-04 16:53:27 +07:00
Tristan Darricau
1a42ec64c8
Merge pull request #3589 from marc1706/ticket/13782
...
[ticket/13782] Rename classes that use reserved PHP7 keywords
2015-05-04 11:16:33 +02:00
Tristan Darricau
98546a738b
Merge branch '3.1.x'
2015-05-04 10:57:17 +02:00
Tristan Darricau
0e7448e2b3
Merge pull request #3562 from VSEphpbb/ticket/11521
...
[ticket/11521] Add missing lang strings for migration exceptions
2015-05-04 10:56:41 +02:00
Marc Alexander
292d0ab382
[ticket/13782] Rename null driver test to dummy driver test
...
PHPBB3-13782
2015-05-04 10:13:04 +02:00
Marc Alexander
232f71dae4
[ticket/13782] Rename null log to dummy for PHP7 compatibility
...
PHPBB3-13782
2015-05-04 10:11:28 +02:00
Marc Alexander
b3cc20a575
[ticket/13782] Rename null driver to dummy for PHP7 compatibility
...
PHPBB3-13782
2015-05-04 10:10:12 +02:00
Nicofuma
da68cfb775
Merge branch '3.1.x'
2015-05-03 22:44:39 +02:00
Nicofuma
1b75411e81
Merge pull request #3588 from nickvergessen/ticket/13809-asc
...
[ticket/13809] Perform the lint test prior to normal tests
2015-05-03 22:43:57 +02:00
Joas Schilling
923fdb0aa0
[ticket/13809] Test each file individually
...
PHPBB3-13809
2015-05-03 20:08:02 +02:00
Joas Schilling
b73b9f1dec
[ticket/13809] Perform the lint test prior to normal tests
...
PHPBB3-13809
2015-05-03 20:07:51 +02:00
Joas Schilling
36abb61d39
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-05-03 18:44:34 +02:00
Joas Schilling
f42a737419
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-05-03 18:44:01 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Joas Schilling
429b99922e
[prep-release-3.1.4] Add migration
2015-05-03 17:12:12 +02:00
Joas Schilling
199d823f7a
[prep-release-3.1.4] Update version to 3.1.4
2015-05-03 17:07:35 +02:00
Andreas Fischer
9074738a10
Merge branch '3.1.x'
...
* 3.1.x:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 16:45:10 +02:00
Andreas Fischer
713fe496ce
Merge branch '3.0.x' into 3.1.x
...
* 3.0.x:
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:44:55 +02:00
Andreas Fischer
cfeb2bec80
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
2015-05-03 16:43:32 +02:00
Andreas Fischer
52aafb4dea
Merge branch 'prep-release-3.0.14' into 3.0.x
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:41:58 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
2015-05-03 16:22:28 +02:00
Andreas Fischer
5382552fc8
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 14:40:50 +02:00
Tristan Darricau
8596742579
Merge pull request #3535 from MateBartus/ticket/13762
...
[ticket/13762] Moving language related functionality into a service
2015-05-02 22:51:43 +02:00
MateBartus
9a99c9e4b1
[ticket/13762] Replace user service with lang in twig extension
...
PHPBB3-13762
2015-05-02 13:37:13 +02:00
MateBartus
9f1f6f96ce
[ticket/13762] Optional DI injectable default language module array
...
PHPBB3-13762
2015-05-02 13:37:13 +02:00
MateBartus
179a470022
[ticket/13762] Moving language related functionality into a separate class
...
PHPBB3-13762
2015-05-02 13:37:12 +02:00
Tristan Darricau
2f480be02d
Merge pull request #3565 from MateBartus/ticket/13793
...
[ticket/13793] Remove translation on throwing exceptions
2015-05-02 13:21:21 +02:00
Tristan Darricau
e51571eaa3
Merge branch '3.1.x'
2015-05-02 11:54:50 +02:00
Tristan Darricau
af3cde98f4
Merge branch '3.0.x' into 3.1.x
2015-05-02 11:54:09 +02:00
Tristan Darricau
9c320ccdce
Merge pull request #3575 from marc1706/ticket/13792
...
[ticket/13792] Use hhvm instead of manually installing nightlys for now
2015-05-02 11:45:05 +02:00
Marc Alexander
7f820ee962
[ticket/13792] Use hhvm instead of manually installing nightlys for now
...
Nightly builds are currently not supported because packages for precise
no longer exist and travis is still running on it.
PHPBB3-13792
2015-05-01 15:45:40 +02:00
MateBartus
57072a1e28
[ticket/13793] Remove translation on throwing exceptions
...
PHPBB3-13793
2015-05-01 12:40:53 +02:00
Joas Schilling
d67fdfa02b
Merge branch '3.1.x'
2015-04-29 17:16:21 +02:00
Joas Schilling
9cd0295dd8
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-04-29 17:15:56 +02:00
Joas Schilling
1ad09d9c8b
[prep-release-3.1.4] Increase version number to 3.1.4-RC2
2015-04-29 09:59:40 +02:00
Andreas Fischer
39f1e8c009
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:51 +02:00
Andreas Fischer
95add752b7
Merge branch '3.0.x' into 3.1.x
...
* 3.0.x:
2015-04-28 22:17:44 +02:00
