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
MateBartus
74dbaac039
[ticket/13800] Make router's extension manager dependency optional
...
PHPBB3-13800
2015-05-02 23:45:45 +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
Joas Schilling
45baaf6022
[ticket/13807] Only output the header for diff
...
PHPBB3-13807
2015-05-02 17:29:55 +02:00
Joas Schilling
34141b576e
[ticket/13807] Fix minor coding flaws
...
PHPBB3-13807
2015-05-02 16:55:35 +02:00
Joas Schilling
2226043325
[ticket/13807] Fix "changed version" to match our version numbering
...
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
96d97ae2d2
[ticket/13807] Add an option to generate a diff for the release highlights
...
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
bdad879508
[ticket/13807] Allow filtering template events
...
PHPBB3-13807
2015-05-02 14:35:26 +02:00
Joas Schilling
e0180991bf
[ticket/13807] Allow filtering events by phpBB version
...
PHPBB3-13807
2015-05-02 14:35:18 +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
JoshyPHP
e5a167e6c2
[ticket/13805] Updated generate_text_for_storage() to match message_parser
...
PHPBB3-13805
2015-05-02 01:53:11 +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
rxu
aef5be3d17
[ticket/13791] Add more post buttons template events to viewtopic_body.html
...
The purpose is to allow adding custom post buttons outside of original post
buttons conditionals/list in prosilver (for subsilver2 it's not the issue).
PHPBB3-13791
2015-05-01 10:59:18 +07:00
JoshyPHP
66ad805127
[ticket/9073] Added regression test
...
PHPBB3-9073
2015-04-30 00:35:32 +02:00
JoshyPHP
abb4a2f6de
[ticket/8419] Added regression test
...
PHPBB3-8419
2015-04-30 00:21:43 +02:00
JoshyPHP
71660301d6
[ticket/13425] Added regression test
...
PHPBB3-13425
2015-04-30 00:09:35 +02:00
JoshyPHP
c56726e9da
[ticket/13641] Added regression test
...
PHPBB3-13641
2015-04-29 23:59:55 +02:00
JoshyPHP
2bbd78ec7d
[ticket/10268] Added regression test
...
PHPBB3-10268
2015-04-29 23:01:19 +02:00
javiexin
34602037dc
[ticket/13795] Modify core event in posting to include poll data
...
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
PHPBB3-13795
2015-04-29 20:15:20 +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
Marc Alexander
818df0ec68
[ticket/12542] Use extended CSS for all browsers
...
PHPBB3-12542
2015-04-29 12:30:35 +02:00
Marc Alexander
c018b3bbc7
[ticket/12542] Rename javascript method and add doc block
...
PHPBB3-12542
2015-04-29 12:24:12 +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
Marc Alexander
ae8129b699
[ticket/12542] Add different outline colors for body & textarea
...
PHPBB3-12542
2015-04-29 00:12:55 +02:00
