Commit graph

24778 commits

Author SHA1 Message Date
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
rxu
0a419781c2 [ticket/13419] Add the lowermost template event
PHPBB3-13419
2014-12-06 16:36:33 +07: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
brunoais
96a734b012 [ticket/13158] Allow adding extra auth checks when the user is posting
PHPBB3-13158
2014-12-03 17:34:35 +00:00
brunoais
b7f83b2cfc [ticket/13148] Creating a final way to modify edit logs output
PHPBB3-13148
2014-12-03 16:04:32 +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
brunoais
fe1f7beaf8 [ticket/13142] Extra space before the comment block
PHPBB3-13142
2014-11-29 10:40:35 +00: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
Joas Schilling
96cc24c211 Merge branch 'develop-ascraeus' into develop 2014-11-28 19:59:15 +01:00
Joas Schilling
8f1a1874a9 Merge pull request #3194 from Nicofuma/ticket/13381
[ticket/13381] Allow ' *' in the doc blocks (especially the header files)
2014-11-28 19:58:56 +01:00
brunoais
bc7db0ae16 [ticket/13141] BUMPing version to 3.1.3
PHPBB3-13141
2014-11-28 15:05:20 +00:00
brunoais
88798b3514 [ticket/13141] Adding more variables to the event
Adding action, forum_id, mode, module and quickmod to
core.mcp_global_f_read_auth_after

PHPBB3-13141
2014-11-28 15:04:31 +00:00
Tristan Darricau
79ce924bc1 [ticket/13381] Allow ' *' in the doc blocks (especially the header files)
PHPBB3-13381
2014-11-27 11:20:26 +01:00
Tristan Darricau
c7116f1a54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:38 +01:00
Tristan Darricau
d43e8c94f5 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:39:11 +01:00
Tristan Darricau
b54dbe0df6 Merge pull request #3188 from marc1706/ticket/11613
[ticket/11613] Allow cookies for domains without dots

* marc1706/ticket/11613:
  [ticket/11613] Allow cookies to work on netbios domains
2014-11-27 10:38:45 +01:00
Cesar G
388fdae49f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post

Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
2014-11-26 18:44:56 -08:00
Cesar G
79a1495f66 Merge remote-tracking branch 'Prosk8er/ticket/13391' into develop-ascraeus
* Prosk8er/ticket/13391:
  [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
2014-11-26 18:43:24 -08:00
Oliver Schramm
893e4b3067 [ticket/13393] Call user->lang function directly
PHPBB3-13393
2014-11-27 00:55:01 +01:00
Oliver Schramm
a349db54d6 [ticket/13312] Use empty for usernames array
PHPBB3-13312
2014-11-26 23:10:02 +01:00
Oliver Schramm
41d0b5d3a2 [ticket/13312] Add event core.acp_email_send_before
PHPBB3-13312
2014-11-26 23:01:58 +01:00
Prosk8er
a5a18fb6dd [ticket/13391] subsilver2 poll options must have a setting of 1 when editing a post
PHPBB3-13391
2014-11-26 14:09:07 -05:00
Jakub Senko
b67b67f2df [ticket/11613] Allow cookies to work on netbios domains
PHPBB3-11613
2014-11-26 14:58:33 +01:00
Marc Alexander
36a337ffab Merge branch 'develop-ascraeus' into develop 2014-11-26 13:37:21 +01:00
Marc Alexander
ee90d227c2 Merge pull request #3187 from Nicofuma/ticket/13362
[ticket/13362] Fix cache paths in .gitignore
2014-11-26 13:37:02 +01:00
Marc Alexander
4c88c579b8 Merge branch 'develop-ascraeus' into develop 2014-11-26 13:30:24 +01:00
Marc Alexander
51f46a8f91 Merge pull request #3185 from Nicofuma/ticket/13389
[ticket/13389] Replace pattern with path
2014-11-26 13:30:03 +01:00
Marc Alexander
630e7077e0 Merge branch 'develop-ascraeus' into develop 2014-11-26 13:21:02 +01:00
Marc Alexander
6ac088ea2f Merge pull request #3075 from Senky/ticket/11613
[ticket/11613] Cookies do not work for netbios domain
2014-11-26 13:20:36 +01:00
Tristan Darricau
6a4179cef5 [ticket/13362] Fix cache paths in .gitignore
PHPBB3-13362
2014-11-26 12:38:02 +01:00
Tristan Darricau
90012c86e8 [ticket/13389] Replace pattern with path
PHPBB3-13389
2014-11-26 12:24:50 +01:00
Marc Alexander
94d90c084b Merge branch 'develop-ascraeus' into develop 2014-11-25 23:15:30 +01:00
Marc Alexander
aa3a46a35f Merge remote-tracking branch 'nickvergessen/ticket/13381' into develop-ascraeus 2014-11-25 23:15:03 +01:00
Joas Schilling
74dfb56459 Merge branch 'develop-ascraeus' into develop 2014-11-25 22:45:37 +01:00
Joas Schilling
2e7ae40d49 Merge pull request #3183 from Nicofuma/ticket/13362
[ticket/13362] Ignore the whole cache directory in git
2014-11-25 22:45:23 +01:00
Joas Schilling
eb83bd5797 [ticket/13381] Fix header intendation of v312.php
PHPBB3-13381
2014-11-25 22:42:52 +01:00