Marc Alexander
c34fd1e7c0
[ticket/13904] Fix fileupload functional tests
...
PHPBB3-13904
2015-09-09 08:27:47 +02:00
Marc Alexander
a53825ad76
[ticket/13904] No longer use fileerror class for extending filespec class
...
PHPBB3-13904
2015-09-09 08:27:46 +02:00
Marc Alexander
eb11973ea8
[ticket/13904] Use factory instead of container and add factory to services
...
PHPBB3-13904
2015-09-09 08:27:45 +02:00
Marc Alexander
f32a94ae5d
[ticket/13904] Pass filesystem to upload avatar again
...
PHPBB3-13904
2015-09-09 08:27:44 +02:00
Marc Alexander
dbfdb61f82
[ticket/13904] Fix fileupload tests
...
PHPBB3-13904
2015-09-09 08:27:43 +02:00
Marc Alexander
2915647a54
[ticket/13904] Fix filespec tests
...
PHPBB3-13904
2015-09-09 08:27:42 +02:00
Marc Alexander
57de896286
[ticket/13904] Remove unneeded parameters from avatars and fix tests
...
PHPBB3-13904
2015-09-09 08:27:42 +02:00
Marc Alexander
0a98fc2561
[ticket/13904] Remove fileupload class
...
PHPBB3-13904
2015-09-09 08:27:41 +02:00
Marc Alexander
a96e7a8ec6
[ticket/13904] Get rid of useless parameters and variables
...
PHPBB3-13904
2015-09-09 08:27:40 +02:00
Marc Alexander
186b4495b6
[ticket/13904] Allow using factory for none files. classes
...
PHPBB3-13904
2015-09-09 08:27:39 +02:00
Marc Alexander
8c2cbc0599
[ticket/13904] Remove magic method from factory and allow short names
...
PHPBB3-13904
2015-09-09 08:27:38 +02:00
Marc Alexander
1af6f052d8
[ticket/13904] Load upload class using factory
...
PHPBB3-13904
2015-09-09 08:27:37 +02:00
Marc Alexander
d2be8e1503
[ticket/13904] Add fileupload class to files classes
...
PHPBB3-13904
2015-09-09 08:27:37 +02:00
Marc Alexander
92e49cd0ac
[ticket/13904] Turn filespec into prototype and improve init methods
...
PHPBB3-13904
2015-09-09 08:27:36 +02:00
Marc Alexander
0cbb713cc2
[ticket/13904] Fix uploading for use with new filespec class
...
PHPBB3-13904
2015-09-09 08:27:35 +02:00
Marc Alexander
891ffb8ac7
[ticket/13904] Remove filespec class from functions_upload
...
PHPBB3-13904
2015-09-09 08:27:13 +02:00
Marc Alexander
c72d6a71bb
[ticket/13904] Modify constructor to be instantiatable by container
...
PHPBB3-13904
2015-09-09 08:26:07 +02:00
Marc Alexander
557f1a89d5
[ticket/13904] Add filespec class to files classes
...
PHPBB3-13904
2015-09-09 08:26:06 +02:00
Marc Alexander
b971f20a5d
[ticket/13904] Add initial factory for handling file classes
...
PHPBB3-13904
2015-09-09 08:26:05 +02:00
Tristan Darricau
dccc0877c1
Merge pull request #3891 from marc1706/ticket/14150
...
[ticket/14150] Update fast-image-size to newest version
* marc1706/ticket/14150:
[ticket/14150] Update fast-image-size to newest version
2015-09-09 00:16:22 +02:00
Marc Alexander
9d18b3d1ee
Merge branch '3.1.x'
2015-09-08 13:35:04 +02:00
Marc Alexander
90d5eefccf
Merge pull request #3881 from VSEphpbb/ticket/14142
...
[ticket/14142] Remove unused ignore_configs from avatar drivers
2015-09-08 13:34:58 +02:00
Marc Alexander
58286171f1
[ticket/14150] Update fast-image-size to newest version
...
PHPBB3-14150
2015-09-08 12:59:55 +02:00
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
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
release-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
Tristan Darricau
7701034871
[ticket/14140] Update SYmfony to 2.3.32
...
PHPBB3-14140
2015-09-03 14:57:05 +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
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
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