1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 05:36:30 +02:00
Commit Graph

2846 Commits

Author SHA1 Message Date
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00
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
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
f6b376def8 [ticket/14764] Implements feedback to wording in install db updater
PHPBB3-14764
2016-09-05 20:57:28 +02:00
86752fc6df [ticket/14764] Wrong link to database update script has been fixed
PHPBB3-14764
2016-09-02 22:05:37 +02:00
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
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
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
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
b14043b276 Merge pull request #4411 from Senky/ticket/12925
[ticket/12925] Pluralize permanent delete checkbox label
2016-08-21 09:51:23 +02:00
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label
PHPBB3-12925
2016-08-15 18:27:33 +02:00
3346609126 [ticket/14742] Display message if reverting schema is in progress
PHPBB3-14742
2016-08-11 01:25:45 +02:00
4938887e5d Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 01:20:59 +02:00
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
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
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
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
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
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
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
55b854906d Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
2016-07-07 19:15:33 +02:00
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
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
53b9216c78 [ticket/14704] Removes unused function and language files in base.php
PHPBB3-14704
2016-07-03 14:22:08 +02:00
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
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
a460aec68c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/language/en/install.php
2016-06-19 18:25:16 +02:00
3708770eb9 [ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
This should help users trying to figure out why their
mail config is not working when they forgot to use a protocol prefix.

PHPBB3-14184
2016-06-17 08:46:02 +02:00
7dc1af25bc [ticket/14654] Change Imagemagick to ImageMagick
PHPBB3-14654
2016-06-11 21:32:16 +02:00
33d1d19f97 [ticket/14586] Add OAuth1 support
PHPBB3-14586
2016-05-30 13:02:49 +02:00
3f1580263c [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docu
PHPBB3-14640
2016-05-18 22:18:15 +02:00
0d7625c534 [ticket/13716] Remove extra br tag and correct missing closing a html tag
PHPBB3-13716
2016-05-16 18:01:55 -04:00
39c4590f01 [ticket/13969] Remove obsolute language files
These help_*.php files have been moved to help/

PHPBB3-13969
2016-04-28 21:33:36 +02:00
3Di
269e253524 [ticket/14596] Deny installation of Ascraeus under PHP 7
PHPBB3-14596
2016-04-23 07:11:34 +02:00
c938077172 [ticket/13716] Fix verboseness
PHPBB3-13716
2016-04-12 05:17:02 -04:00
972255247b [ticket/14589] Fix grammatical errors in language strings
PHPBB3-14589
2016-04-11 19:42:40 +02:00
9163cc2864 [ticket/14589] Add error messages for failable installer requirements
PHPBB3-14589
2016-04-10 10:30:15 +02:00
e80f79fc9a [ticket/13716] Fix grammar and href title tags
PHPBB3-13716
2016-04-06 06:18:26 -04:00
04f320cb01 [ticket/13716] Check phpBB version against config version
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)

PHPBB3-13716
2016-04-05 07:09:12 -04:00
f929db6190 Merge pull request #4248 from VSEphpbb/ticket/14561
[ticket/14561] Add more user commands

* VSEphpbb/ticket/14561:
  [ticket/14561] Remove requires for functions in tests
  [ticket/14561] Small change to progress bar output
  [ticket/14561] Fix function docblock in activate command
  [ticket/14561] Add a progress bar to reclean command
  [ticket/14561] Use the user loader where appropriate
  [ticket/14561] Add extra help explaining reclean command
  [ticket/14561] Import classes with use statements
  [ticket/14561] Remove unused use statements
  [ticket/14561] Refactor tests
  [ticket/14561] Reclean usernames command
  [ticket/14561] User activate command
  [ticket/14561] User delete command
2016-04-03 16:32:25 +02:00
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
2016-04-02 10:06:59 +02:00
afb69d7cd2 [ticket/14561] Add a progress bar to reclean command
PHPBB3-14561
2016-03-31 15:07:59 -07:00
ed0f151d86 [ticket/14561] Add extra help explaining reclean command
PHPBB3-14561
2016-03-31 15:07:59 -07:00
16f9b4630c [ticket/14561] Reclean usernames command
PHPBB3-14561
2016-03-31 15:07:43 -07:00
91f1116e04 [ticket/14561] User activate command
PHPBB3-14561
2016-03-31 15:07:43 -07:00
8a9429efa4 [ticket/14561] User delete command
PHPBB3-14561
2016-03-31 15:07:43 -07:00