Michael Miday
fd1195ed6a
[ticket/14107] Fix typo
2015-09-06 09:13:35 +02:00
Michael Miday
39ca60023b
[ticket/14107] Add back comment
2015-09-06 09:13:35 +02:00
Michael Miday
a21ed712bc
[ticket/14107] Fix dropdown rtl states
2015-09-06 09:13:35 +02:00
Andreas Fischer
c2a5108452
Merge pull request #3878 from Nicofuma/ticket/14140-master
...
[ticket/14140] Update Symfony to latest 2.8-dev version - #3877
* Nicofuma/ticket/14140-master:
[ticket/14140] Update Symfony to latest 2.8-dev version
[ticket/14140] Update SYmfony to 2.3.32
2015-09-05 16:08:28 +02:00
Joas Schilling
fb3e9d9a77
Merge branch '3.1.x'
...
Conflicts:
build/build.xml
2015-09-05 15:20:38 +02:00
Joas Schilling
f201c22ca7
Merge branch 'prep-release-3.1.6' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-09-05 15:19:16 +02:00
Joas Schilling
5258fba2e0
[prep-release-3.1.6] Add migration for 3.1.6
2015-09-05 12:45:53 +02:00
Joas Schilling
82a45cd4da
[prep-release-3.1.6] Update version for final 3.1.6 release
2015-09-05 12:45:00 +02:00
Tristan Darricau
615ed729b5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14123] Fix typo
[ticket/14123] Remove redundant help messages
[ticket/14123] Add descriptive help to the CLI help output
2015-09-02 12:45:34 +02:00
Tristan Darricau
5faa12db4c
Merge pull request #3855 from VSEphpbb/ticket/14123
...
[ticket/14123] Add descriptive help to the CLI help output
* VSEphpbb/ticket/14123:
[ticket/14123] Fix typo
[ticket/14123] Remove redundant help messages
[ticket/14123] Add descriptive help to the CLI help output
2015-09-02 12:44:52 +02:00
Tristan Darricau
42631dc093
[ticket/14140] Update Symfony to latest 2.8-dev version
...
PHPBB3-14140
2015-09-02 12:37:00 +02:00
Tristan Darricau
28da758163
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14075] Update version to 3.1.7-RC1
[ticket/14075] Add template event after poll preview panel
2015-09-02 12:04:49 +02:00
Tristan Darricau
58af8606c1
Merge pull request #3853 from marc1706/ticket/14075
...
[ticket/14075] Add template event after poll preview panel
* marc1706/ticket/14075:
[ticket/14075] Update version to 3.1.7-RC1
[ticket/14075] Add template event after poll preview panel
2015-09-02 12:03:58 +02:00
Tristan Darricau
058c3116ed
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 12:00:48 +02:00
Tristan Darricau
48d05bad25
Merge pull request #3860 from kinerity/ticket/14126
...
[ticket/14126] Add viewtopic_topic_title_after template event
* kinerity/ticket/14126:
[ticket/14126] Add viewtopic_topic_title_after template event
2015-09-02 11:59:14 +02:00
Tristan Darricau
5d4c7f9952
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/11468] Allow controllers to set paramters of page_header()
2015-09-02 11:51:16 +02:00
Tristan Darricau
2ee8b14f86
Merge pull request #3872 from Zoddo/ticket/11468
...
[ticket/11468] Allow controllers to set paramters of page_header()
* Zoddo/ticket/11468:
[ticket/11468] Allow controllers to set paramters of page_header()
2015-09-02 11:50:35 +02:00
Michael Miday
a6ff0c8775
[ticket/14137]
2015-09-01 22:15:48 +02:00
Tristan Darricau
5b8164a1bb
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13950] Hide undefined categories
[ticket/13950] Hide undefined permissions
2015-09-01 21:47:19 +02:00
Tristan Darricau
8749c99e34
Merge pull request #3765 from Zoddo/ticket/13950
...
[ticket/13950] Hide undefined permissions
* Zoddo/ticket/13950:
[ticket/13950] Hide undefined categories
[ticket/13950] Hide undefined permissions
2015-09-01 21:47:05 +02:00
Tristan Darricau
5e643ae750
Merge pull request #3861 from hanakin/ticket/12821
...
[ticket/12821] Convert all images to gradients
* hanakin/ticket/12821:
[ticket/12821] Graceful ie9 fallbacks
[ticket/12821] IE 9 requires filter: none for svg
[ticket/12821] Update all Gradients to last two
[ticket/12821] Convert all colors to upper
[ticket/12821] Update all gradients
2015-09-01 19:15:49 +02:00
Tristan Darricau
9faf434d37
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14133] Comment fix for phpbb_get_user_rank()
2015-09-01 18:51:10 +02:00
Michael Miday
39b39fd783
[ticket/12821] Graceful ie9 fallbacks
2015-09-01 18:24:08 +02:00
Michael Miday
39b20b89f3
[ticket/12821] IE 9 requires filter: none for svg
2015-09-01 18:24:08 +02:00
Michael Miday
9e8b4f5622
[ticket/12821] Update all Gradients to last two
2015-09-01 18:24:08 +02:00
Michael Miday
985e4ee3d4
[ticket/12821] Convert all colors to upper
2015-09-01 18:24:07 +02:00
Michael Miday
d81ca8d7a5
[ticket/12821] Update all gradients
2015-09-01 18:24:07 +02:00
lavigor
3fe517f50c
[ticket/14133] Comment fix for phpbb_get_user_rank()
...
PHPBB3-14133
2015-08-31 21:49:22 +03:00
Michael Miday
aafa5b6ed0
[ticket/14038] Minor color tweaks
2015-08-31 06:35:54 +02:00
Zoddo
cc060a2611
[ticket/11468] Allow controllers to set paramters of page_header()
...
PHPBB3-11468
2015-08-30 23:24:07 +02:00
Michael Miday
d228c80c61
[ticket/14038] Switch to spacer spans
2015-08-30 18:54:39 +02:00
Michael Miday
0e26b4e68f
[ticket/14038] Stylize & differintiate
2015-08-30 18:30:40 +02:00
Michael Miday
5b112b974f
[ticket/14038] Give links some visual love
2015-08-30 14:01:56 +02:00
Zoddo
af246483e2
[ticket/13950] Hide undefined categories
...
This hides the categories added by disabled extensions
PHPBB3-13950
2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e
[ticket/13950] Hide undefined permissions
...
This hides the permissions of the disabled extensions
PHPBB3-13950
2015-08-28 18:43:59 +02:00
Tristan Darricau
214c5c6d0b
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13988] Update tests
[ticket/13988] Use absolute path for image attachments in feeds
2015-08-28 17:34:50 +02:00
Tristan Darricau
bfbce5a1b0
Merge pull request #3764 from Zoddo/ticket/13988
...
[ticket/13988] Use absolute path for image attachments in feeds
* Zoddo/ticket/13988:
[ticket/13988] Update tests
[ticket/13988] Use absolute path for image attachments in feeds
2015-08-28 17:05:09 +02:00
Matt Friedman
76158e429b
[ticket/14123] Fix typo
...
PHPBB3-14123
2015-08-28 07:54:50 -07:00
Matt Friedman
6c36f56b12
[ticket/14123] Remove redundant help messages
...
PHPBB3-14123
2015-08-28 07:49:07 -07:00
Tristan Darricau
c3ceafb37d
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:41 +02:00
Tristan Darricau
624f5ae921
Merge pull request #3835 from rxu/ticket/14106
...
[ticket/14106] Fix topics sorting in MCP for topics merging.
* rxu/ticket/14106:
[ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:33 +02:00
Tristan Darricau
6d7a5dfe5e
Merge pull request #3802 from Oyabun1/ticket/14058
...
[ticket/14058] Contact us form missing email subject field in subsilver2
* Oyabun1/ticket/14058:
[ticket/14058] Contact us form missing email subject field in subsilver2
2015-08-28 16:29:31 +02:00
Tristan Darricau
9e0a075be1
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:28:59 +02:00
Tristan Darricau
90d18356a0
Merge pull request #3809 from marc1706/ticket/14070
...
[ticket/14070] Properly pass whether config should be ignored for avatars
* marc1706/ticket/14070:
[ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:27:05 +02:00
Máté Bartus
e91e525e8a
Merge pull request #3858 from Nicofuma/ticket/14125
...
[ticket/14125] Add --env option to all CLI commands
2015-08-28 12:00:46 +02:00
Máté Bartus
e8219e8610
Merge pull request #3470 from Nicofuma/ticket/13645
...
[ticket/13645] Move the feeds to controllers
2015-08-28 10:39:07 +02:00
Máté Bartus
6dc195e5a7
Merge pull request #3859 from Nicofuma/ticket/13897
...
[ticket/13897] Make dependency to the filesystem optional in error handler
2015-08-28 09:58:44 +02:00
Tristan Darricau
3babe02540
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
2015-08-27 23:09:11 +02:00
Tristan Darricau
7d41a9894a
Merge pull request #3863 from VSEphpbb/ticket/14128
...
[ticket/14128] Fix img bbcode regression, lost postimage class
* VSEphpbb/ticket/14128:
[ticket/14128] Fix img bbcode regression, lost postimage class
2015-08-27 22:55:37 +02:00
Matt Friedman
e19d446881
[ticket/14128] Fix img bbcode regression, lost postimage class
...
PHPBB3-14128
2015-08-26 14:08:59 -07:00
