Commit graph

24702 commits

Author SHA1 Message Date
Joas Schilling
228fda0f03 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:01:11 +01:00
Joas Schilling
d5f99e0478 Merge pull request #3216 from kinerity/ticket/13409
[ticket/13409] Add event core.search_modify_param_before
2014-12-27 14:01:05 +01:00
Joas Schilling
344311481f Merge branch 'develop-ascraeus' into develop 2014-12-27 13:58:54 +01:00
Joas Schilling
7b43d5c54e Merge pull request #3214 from brunoais/ticket/13159
[ticket/13159] Allow to do extra auth checks on report posting
2014-12-27 13:58:49 +01:00
Joas Schilling
60b45bb0bd Merge branch 'develop-ascraeus' into develop 2014-12-27 13:51:30 +01:00
Joas Schilling
3ba62628dc Merge pull request #3205 from rxu/ticket/13406
[ticket/13406] Add a space between the index name and columns list
2014-12-27 13:51:24 +01:00
Joas Schilling
ea6fcc3dda Merge branch 'develop-ascraeus' into develop 2014-12-27 13:49:53 +01:00
Joas Schilling
faad779cf6 Merge pull request #3202 from Nicofuma/ticket/13402
[ticket/13402] Code sniffer, unused use, check the function doc blocks
2014-12-27 13:49:50 +01:00
Joas Schilling
8aadee60f7 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:46:46 +01:00
Joas Schilling
f6b21a2789 Merge pull request #3191 from Elsensee/ticket/13312
[ticket/13312] Add event core.acp_email_send_before
2014-12-27 13:46:32 +01:00
Joas Schilling
3c41df2255 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:38:25 +01:00
Joas Schilling
867a45138c Merge pull request #3175 from Senky/ticket/13368
[ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
2014-12-27 13:38:19 +01:00
Joas Schilling
00933ad287 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:37:11 +01:00
Joas Schilling
aea67c8e37 Merge pull request #3168 from Senky/ticket/11033
[ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
2014-12-27 13:37:04 +01:00
Joas Schilling
22948127f8 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/index.htm
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
	phpBB/styles/subsilver2/theme/images/index.htm
2014-12-27 13:35:23 +01:00
Joas Schilling
d2334ab3e0 Merge pull request #3167 from Senky/ticket/12924
[ticket/12924] Make meta tags self-closing
2014-12-27 13:34:48 +01:00
Joas Schilling
49a1025e59 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:31:22 +01:00
Joas Schilling
0fe30e8a96 Merge pull request #3170 from Nicofuma/ticket/13266-develop
[ticket/13266-develop] Enable twig dump function
2014-12-27 13:31:16 +01:00
Joas Schilling
5b1c9831c2 Merge pull request #3099 from Senky/ticket/13266
[ticket/13266] Enabling twig dump function if DEBUG is defined
2014-12-27 13:31:01 +01:00
Joas Schilling
bd3ef49e0b Merge branch 'develop-ascraeus' into develop 2014-12-27 13:29:17 +01:00
Joas Schilling
a66e4770c1 Merge pull request #3159 from Crizz0/ticket/13357
[ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
2014-12-27 13:29:04 +01:00
Jakub Senko
91dc002c31 [ticket/13368] Update version
PHPBB3-13368
2014-12-11 14:11:43 +01:00
Cesar G
892aa43eee Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12567] wrap to top
2014-12-09 17:59:01 -08:00
Cesar G
61df1ac2b3 Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeus
* Senky/ticket/12567:
  [ticket/12567] wrap to top
2014-12-09 17:58:43 -08:00
Cesar G
1d8e261747 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13319] Add missing table tags
2014-12-09 17:50:34 -08:00
Cesar G
46384adf00 Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeus
* Senky/ticket/13319:
  [ticket/13319] Add missing table tags
2014-12-09 17:50:14 -08:00
Marc Alexander
d22fa412c4 Merge pull request #3220 from nickvergessen/ticket/13421
Ticket/13421 Introduce an interface for db\tools.php
2014-12-10 00:03:24 +01:00
Joas Schilling
ec90f2b380 [ticket/13421] Move tools to subdirectory
PHPBB3-13421
2014-12-06 17:10:07 +01:00
Joas Schilling
d78bb2865b [ticket/13421] Always require the interface when possible
PHPBB3-13421
2014-12-06 16:17:04 +01:00
Joas Schilling
536bdf036b [ticket/13421] Inherit docs
PHPBB3-13421
2014-12-06 16:16:51 +01:00
Joas Schilling
10594779b9 [ticket/13421] Add an interface for \phpbb\db\tools
PHPBB3-13421
2014-12-06 16:16:44 +01:00
Joas Schilling
8a35718149 Merge branch 'develop-ascraeus' into develop 2014-12-06 14:22:58 +01:00
Joas Schilling
641a9e5441 Merge pull request #3208 from prototech/ticket/13396
[ticket/13396] Normalize multibyte characters in attachment file names.
2014-12-06 14:22:49 +01:00
Joas Schilling
f0c6c4db15 Merge branch 'develop-ascraeus' into develop 2014-12-06 13:42:55 +01:00
Joas Schilling
7fbf5649eb Merge branch 'ticket/13400' into develop-ascraeus 2014-12-06 13:42:24 +01:00
kochi
dfbc109b59 [ticket/13400] Information text if the server load id high at search
PHPBB3-13400
2014-12-06 13:42:16 +01:00
Kailey Truscott
0795b6bd6c [ticket/13409] Change search_id type and release version
PHPBB3-13409
2014-12-05 05:53:59 -05:00
Kailey Truscott
ddd1937655 [ticket/13409] Fix event name
PHPBB3-13409
2014-12-04 21:04:58 -05:00
Kailey Truscott
3bf55c0b4d [ticket/13409] Add event core.search_modify_param_before
PHPBB3-13409
2014-12-04 20:30:16 -05:00
brunoais
a8d3cbe53b [ticket/13159] Allow to do extra auth checks on report posting
PHPBB3-13159
2014-12-03 17:53:10 +00:00
Cesar G
589394e80b [ticket/13396] Normalize multibyte characters in attachment file names.
PHPBB3-13396
2014-12-02 16:23:40 -08:00
Tristan Darricau
7f7f60698c [ticket/13402] Handle arrays and multiples types
PHPBB3-13402
2014-11-30 20:55:29 +01:00
Tristan Darricau
13d4394844 [ticket/13402] Refactor unused use Sniff
PHPBB3-13402
2014-11-30 19:18:18 +01:00
Tristan Darricau
319efb026d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:19 +01:00
Tristan Darricau
70483d6088 Merge pull request #3204 from rxu/ticket/13405
[ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php

* rxu/ticket/13405:
  [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
2014-11-30 19:07:14 +01:00
rxu
2f92bc38e6 [ticket/13406] Add a space between the index name and columns list
Currently there's no space between the index name and columns list
when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors
on earlier MySQL versions like 3.23.

PHPBB3-13406
2014-11-30 16:52:36 +07:00
rxu
499c1467df [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
PHPBB3-13405
2014-11-30 11:27:47 +07:00
Tristan Darricau
c5227ab2a5 [ticket/13402] Code sniffer, unused use, check the function doc blocks
PHPBB3-13402
2014-11-29 19:17:52 +01:00
Joas Schilling
0869a77201 Merge branch 'develop-ascraeus' into develop 2014-11-29 09:09:17 +01:00
Joas Schilling
ac8b07ddd9 Merge pull request #3192 from Elsensee/ticket/13393
[ticket/13393] Call user->lang function directly
2014-11-29 09:08:51 +01:00