Marc Alexander
3ddee852fa
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/functions_messenger.php
2015-09-07 12:16:12 +02:00
Marc Alexander
9537ec56eb
Merge pull request #3884 from Nicofuma/ticket/14143
...
[ticket/14143] Flush the mail queue when writing it
2015-09-07 12:15:24 +02:00
Michael Miday
71def7cda6
[ticket/14107] Remove template var
2015-09-06 09:13:35 +02:00
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
Tristan Darricau
0e93efd7cb
[ticket/14143] Flush the mail queue when writing it
...
PHPBB3-14143
2015-09-05 17:53:29 +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
Andreas Fischer
35bb32ff88
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/14140] Update SYmfony to 2.3.32
Conflicts:
phpBB/composer.lock
2015-09-05 16:08:21 +02:00
Andreas Fischer
8cab2374f9
Merge pull request #3877 from Nicofuma/ticket/14140
...
[ticket/14140] Update Symfony to 2.3.32
* Nicofuma/ticket/14140:
[ticket/14140] Update SYmfony to 2.3.32
2015-09-05 16:08:13 +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
Matt Friedman
076807c63a
[ticket/14142] Remove unused ignore_configs from avatar drivers
...
PHPBB3-14142
2015-09-04 13:38:14 -07:00
Zoddo
053a6d1d70
[ticket/8800] Add "mark topics read" link to "View unread posts"
...
PHPBB3-8800
2015-09-04 20:06:13 +02:00
Tristan Darricau
7701034871
[ticket/14140] Update SYmfony to 2.3.32
...
PHPBB3-14140
2015-09-03 14:57:05 +02:00
lavigor
9a5de3fc1e
[ticket/14134] Send warning notification PM in user's language.
...
PHPBB3-14134
2015-09-02 19:37:41 +03: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
9546035632
Merge branch 'ticket/14140' into ticket/14140-master
...
* ticket/14140:
[ticket/14140] Update SYmfony to 2.3.32
2015-09-02 12:28:30 +02:00
Tristan Darricau
1c4a72bba0
[ticket/14140] Update SYmfony to 2.3.32
...
PHPBB3-14140
2015-09-02 12:26:26 +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
Matt Friedman
b4dbb5b249
[ticket/14138] Use span tags instead of abbr
...
PHPBB3-14138
2015-09-01 15:13:12 -07:00
Tristan Darricau
4a75a8eaa3
Merge pull request #3875 from hanakin/ticket/14137
...
[Ticket/14137] Fix Notification Menu Layout issue
* hanakin/ticket/14137:
[ticket/14137]
2015-09-01 22:25:14 +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
Tristan Darricau
4979d98aa9
Merge pull request #3873 from lavigor/ticket/14133
...
[ticket/14133] Comment fix for phpbb_get_user_rank()
* lavigor/ticket/14133:
[ticket/14133] Comment fix for phpbb_get_user_rank()
2015-09-01 18:46:56 +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
Tristan Darricau
8c758e223e
Merge pull request #3866 from hanakin/ticket/14038
...
[Ticket/14038] Jumpbox improvements
* hanakin/ticket/14038:
[ticket/14038] Minor color tweaks
[ticket/14038] Switch to spacer spans
[ticket/14038] Stylize & differintiate
[ticket/14038] Give links some visual love
2015-09-01 18:07:06 +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
Zoddo
1fbdf615f2
[ticket/9485] Fix tests
...
PHPBB3-9485
2015-08-30 22:43:19 +02:00
Zoddo
51600b8f18
[ticket/9485] Add post_id to relevant $phpbb_log->add()
...
PHPBB3-9485
2015-08-30 22:43:07 +02:00
Max Pen
96521767f8
[ticket/13992] Fix HTML5 error from w3.org validator
...
PHPBB3-13992
2015-08-30 22:02:39 +02:00
Zoddo
306fbf23a8
[ticket/9485] Add a "View post" link in the moderation logs
...
PHPBB3-9485
2015-08-30 19:52:00 +02:00
