Commit graph

2870 commits

Author SHA1 Message Date
Marc Alexander
dcd8540f3c
Merge branch '3.2.x' 2016-11-20 13:18:34 +01:00
Marc Alexander
c3108d44ce
Merge branch '3.1.x' into 3.2.x 2016-11-20 13:18:31 +01:00
Marc Alexander
82960414f7 Merge branch '3.2.x' 2016-11-17 09:56:59 +01:00
Jakub Senko
e974f338af [ticket/14739] Remove SQLite 2.8.x database driver
PHPBB3-14739
2016-11-16 17:59:28 +01:00
Jakub Senko
ba5243ba76 [ticket/14842] Don't display filesize limit if there is none
PHPBB3-14842
2016-11-15 14:22:42 +01:00
Tristan Darricau
a713f5159a
Merge branch '3.2.x'
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:13 +02:00
Marc Alexander
66e481c501 Merge branch '3.2.x' 2016-09-06 21:50:28 +02:00
Marc Alexander
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00
Marc Alexander
2efdaaa0e2 Merge pull request #4426 from bantu/ticket/14109
[ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.…
2016-09-06 21:50:22 +02:00
Marc Alexander
d13ef57ff4 Merge branch '3.2.x' 2016-09-06 21:45:52 +02:00
Marc Alexander
801519ca4d Merge pull request #4435 from Crizz0/ticket/14764
[ticket/14764] Wrong link to database update script has been fixed
2016-09-06 21:45:49 +02:00
Crizzo
f6b376def8 [ticket/14764] Implements feedback to wording in install db updater
PHPBB3-14764
2016-09-05 20:57:28 +02:00
Crizzo
86752fc6df [ticket/14764] Wrong link to database update script has been fixed
PHPBB3-14764
2016-09-02 22:05:37 +02:00
Marc Alexander
7a9f8ddee9 Merge branch '3.2.x' 2016-08-31 21:42:15 +02:00
Marc Alexander
dff950162c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/phpbb/db/migration/tool/module.php
2016-08-31 21:41:17 +02:00
Marc Alexander
f008708d5c Merge pull request #4377 from rxu/ticket/14703
[ticket/14703] Fix parent module selection for custom extension modules
2016-08-31 21:39:09 +02:00
Andreas Fischer
3ee5472a8c [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8.
This is required for proper overall database operation. In previous versions,
InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are
 defined.

PHPBB3-14109
2016-08-28 20:40:10 +01:00
Marc Alexander
8783ede6e0 Merge branch '3.2.x' 2016-08-21 09:51:28 +02:00
Marc Alexander
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
Marc Alexander
b14043b276 Merge pull request #4411 from Senky/ticket/12925
[ticket/12925] Pluralize permanent delete checkbox label
2016-08-21 09:51:23 +02:00
Jakub Senko
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label
PHPBB3-12925
2016-08-15 18:27:33 +02:00
Marc Alexander
0df1d39c1f Merge branch '3.2.x' 2016-08-13 23:14:11 +02:00
Oliver Schramm
3346609126 [ticket/14742] Display message if reverting schema is in progress
PHPBB3-14742
2016-08-11 01:25:45 +02:00
Oliver Schramm
4938887e5d Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 01:20:59 +02:00
Oliver Schramm
9fb649793d [ticket/14742] Pause after each schema change
It is certainly better than running them all at once

PHPBB3-14742
2016-08-11 01:03:23 +02:00
Jakub Senko
c64b8102b7 [ticket/10809] Remove MSSQL support
PHPBB3-10809
2016-08-02 12:06:06 +02:00
Marc Alexander
4ac2547d62 Merge pull request #4301 from 3D-I/PHPBB3-14596
[ticket/14596] Deny installation of Ascraeus under PHP 7
2016-07-31 15:18:35 +02:00
Oliver Schramm
46045eb9b0 Merge branch '3.2.x' 2016-07-30 23:23:00 +02:00
Máté Bartus
61a147546d [ticket/14633] Check for XML extension support on install
PHPBB3-14633
2016-07-30 13:04:39 +02:00
rxu
eaafb758ce [ticket/14703] Select the parent module id from the several found
PHPBB3-14703
2016-07-23 21:34:05 +07:00
Marc Alexander
83fadbe697 Merge branch '3.2.x' 2016-07-20 20:25:08 +02:00
Marc Alexander
486ffa85a2 Merge pull request #4344 from Senky/ticket2/14586
[ticket/14586] Add OAuth1 support
2016-07-20 20:25:01 +02:00
3Di
0026ed02ae [ticket/14596] Deny installation of Ascraeus under PHP 7
PHPBB3-14596
2016-07-18 23:45:58 +02:00
Marc Alexander
7eb8d8fcae Merge branch '3.2.x' 2016-07-17 15:57:33 +02:00
Marc Alexander
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
Marc Alexander
e8454e018d Merge pull request #4378 from Crizz0/ticket/14704
[ticket/14704] Removes unused function and language files in base.php
2016-07-17 15:57:21 +02:00
rxu
652e3da28d [ticket/14703] Refine the parent module selection for custom extension modules
PHPBB3-14703
2016-07-10 21:47:04 +07:00
Marc Alexander
113738fce9 Merge branch '3.2.x' 2016-07-07 19:20:42 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
2016-07-07 19:19:40 +02:00
Marc Alexander
55b854906d Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
2016-07-07 19:15:33 +02:00
Marc Alexander
fc8a7013d6 Merge branch '3.2.x' 2016-07-06 19:24:08 +02:00
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
Marc Alexander
cddb884be6 Merge pull request #4354 from Stanzilla/smtp_explain
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
2016-07-06 19:23:54 +02:00
Crizzo
53b9216c78 [ticket/14704] Removes unused function and language files in base.php
PHPBB3-14704
2016-07-03 14:22:08 +02:00
Marc Alexander
9e7f5e9d86 Merge branch '3.2.x' 2016-06-19 22:07:44 +02:00
Marc Alexander
219977ccf3 Merge branch '3.1.x' into 3.2.x 2016-06-19 22:07:42 +02:00
rxu
773a701d62 [ticket/14683] Fix typos in email templates.
PHPBB3-14683
2016-06-20 00:15:37 +07:00
Marc Alexander
9639f6ad63 Merge pull request #4326 from Crizz0/ticket/14640
[ticket/14640] Changes docu-link in language/en/install.php from 3.3 to 3.2
2016-06-19 18:56:04 +02:00
Marc Alexander
f8978f23a6 Merge branch '3.2.x' 2016-06-19 18:25:37 +02:00