1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00

28586 Commits

Author SHA1 Message Date
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 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
801519ca4d Merge pull request 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
Marc Alexander
a4f42ced3d Merge pull request from rxu/ticket/14765
[ticket/14765] Fix the typo in the installer routing config
2016-09-04 17:47:51 +02:00
rxu
a01c773fa2 [ticket/14765] Fix the typo in the installer routing config
PHPBB3-14765
2016-09-03 22:13:34 +07:00
Tristan Darricau
312ca75be5
Merge pull request from marc1706/ticket/14763
[ticket/14763] Specify correct class for local files class type

* marc1706/ticket/14763:
  [ticket/14763] Specify correct class for local files class type
2016-09-03 14:53:57 +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
62e8ba3d49 [ticket/14763] Specify correct class for local files class type
PHPBB3-14763
2016-09-02 21:08:06 +02:00
Tristan Darricau
08f558d8f7
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14727] Event core.search_modify_submit_parameters
2016-09-01 16:24:07 +02:00
Tristan Darricau
65921a7891
Merge pull request from ErnadoO/ticket/14727
[ticket/14727] Event core.search_modify_submit_parameters

* ErnadoO/ticket/14727:
  [ticket/14727] Event core.search_modify_submit_parameters
2016-09-01 16:23:50 +02:00
Tristan Darricau
a3dc829dab
Merge pull request from Senky/ticket/10961
[ticket/10961] Send HTTP 403 when applicable

* Senky/ticket/10961:
  [ticket/10961] Send HTTP 403 when applicable
2016-09-01 14:53:54 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable
PHPBB3-10961
2016-09-01 08:48:37 +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 from rxu/ticket/14703
[ticket/14703] Fix parent module selection for custom extension modules
2016-08-31 21:39:09 +02:00
Tristan Darricau
05e6ed04ed
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14673] Changes wrong language variable in mcp_forum
2016-08-31 19:08:11 +02:00
Tristan Darricau
d737430a03
Merge pull request from Crizz0/ticket/14673
[ticket/14673] Changes wrong language variable in mcp_forum

* Crizz0/ticket/14673:
  [ticket/14673] Changes wrong language variable in mcp_forum
2016-08-31 19:08:05 +02:00
Tristan Darricau
2c6543cb6e
Merge pull request from hanakin/patch-2
[ticket/14588] fix header search rtl

* hanakin/patch-2:
  [ticket/14588] fix header search rtl
2016-08-31 19:04:13 +02:00
Michael Miday
7b880af02e [ticket/14588] fix header search rtl
https://tracker.phpbb.com/browse/PHPBB3-14588#add-comment

PHPBB3-14588
2016-08-29 15:02:26 +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
rxu
557f85e7fc [ticket/14703] Improve exception testing
PHPBB3-14703
2016-08-28 21:51:52 +07:00
Marc Alexander
a2838ad0b1 Merge branch '3.1.x' into 3.2.x 2016-08-28 15:54:11 +02:00
Marc Alexander
a019a86bfc Merge pull request from Senky/ticket/14469
Add viewforum_body_topicrow_before template event
2016-08-28 15:53:30 +02:00
Marc Alexander
7c79e7844c Merge branch '3.1.x' into 3.2.x 2016-08-28 15:44:49 +02:00
Marc Alexander
71a70500ea Merge pull request from kasimi/ticket/14715-3.1.x
[ticket/14715] Add template events in posting_topic_review & mcp_topic
2016-08-28 15:41:59 +02:00
Marc Alexander
08c6f56f4b Merge branch '3.1.x' into 3.2.x 2016-08-28 00:12:53 +02:00
Marc Alexander
863d65112b Merge pull request from Elsensee/ticket/12230
[ticket/12230] Disable newly registered group when post limit is set to 0
2016-08-28 00:12:43 +02:00
Crizzo
17421195df Merge branch 'rmcgirr83-ticket/14753' into 3.2.x 2016-08-27 16:18:37 +02:00
Richard McGirr
3b395aa7a4 [ticket/14753] Fix mcp_post
PHPBB3-14753
2016-08-27 06:12:50 -04:00
Richard McGirr
5c8fd9760b [ticket/14753] Fix language suffix
Missing L parameter in language strings

https://tracker.phpbb.com/browse/PHPBB3-14753

PHPBB3-14753
2016-08-27 05:48:15 -04:00
Andreas Fischer
8e787cba7a Merge pull request from Crizz0/ticket/14749
[ticket/14749] Adds missing } in mcp_forum.html to {TOPIC_DELETED

* Crizz0/ticket/14749:
  [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETED
2016-08-22 22:05:52 +02:00
Crizzo
0d39e659fe [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETED
PHPBB3-14749
2016-08-22 21:30:59 +02:00
Crizzo
429ecb938c [ticket/14673] Changes wrong language variable in mcp_forum
PHPBB3-14673
2016-08-22 21:23:01 +02:00
Marc Alexander
f814840568 Merge pull request from Elsensee/ticket/14746
[ticket/14746] Make msg_handler in installer independent from container
2016-08-21 19:04:17 +02:00
Marc Alexander
43762950bc Merge pull request from Elsensee/ticket/14636
[ticket/14636] Restore BC with compatibility functions
2016-08-21 18:57:33 +02:00
Oliver Schramm
cd2649273b [ticket/14636] Inject into set_config methods
PHPBB3-13573
PHPBB3-14636
2016-08-21 13:14:54 +02:00
Marc Alexander
cd0ffc5de6 Merge branch '3.1.x' into 3.2.x
Conflicts:
	.travis.yml
2016-08-21 10:07:19 +02:00
Marc Alexander
a36f96aefa Merge pull request from Elsensee/ticket/14743
[ticket/14743] Remove PHP7 from travis tests in 3.1.x
2016-08-21 10:06:41 +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 from Senky/ticket/12925
[ticket/12925] Pluralize permanent delete checkbox label
2016-08-21 09:51:23 +02:00
Marc Alexander
f054ab972d Merge branch '3.1.x' into 3.2.x 2016-08-21 09:44:37 +02:00
Marc Alexander
76748183bb Merge pull request from Elsensee/ticket/14742-32x
[ticket/14742-32x] Further improvements to migrator
2016-08-21 09:44:37 +02:00
Marc Alexander
6bcc372af5 Merge pull request from Elsensee/ticket/14742
[ticket/14742] Further improvements to migrator
2016-08-21 09:24:19 +02:00
Oliver Schramm
a37f10ae09 [ticket/14742] Increase user feedback by improving progress bar
We now count and display each step that was done
by increasing the task count.

PHPBB3-14742
2016-08-20 22:40:37 +02:00
Oliver Schramm
88384a1e63 Merge branch 'ticket/14742' into ticket/14742-32x
Conflicts:
	phpBB/phpbb/db/migrator.php
2016-08-20 22:38:45 +02:00
Oliver Schramm
773f6d08a5 [ticket/14742] Reset migration_data_state before reverting
PHPBB3-14742
2016-08-20 22:31:08 +02:00
Oliver Schramm
463e8e4b13 [ticket/14742] Change constants to use Symfony values
This is to avoid errors when comparing verbosity levels
in a CLI output handler that is using Symfony's OutputInterface
for example.

PHPBB3-14742
2016-08-20 22:28:29 +02:00
Oliver Schramm
7c99fcf782 [ticket/14742] Pause after each update_data step too
Rewriting process_data_step() to remove the now
useless foreach() loop.

PHPBB3-14742
2016-08-20 22:20:21 +02:00
Oliver Schramm
775d1c855a [ticket/14742] Improve readability of the code
PHPBB3-14742
2016-08-20 22:20:20 +02:00
Oliver Schramm
e050cf5c11 [ticket/14742] Fix comments in migrator
PHPBB3-14742
2016-08-20 03:35:38 +02:00