makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
24682 commits 18 branches 192 tags 207 MiB
Commit graph

24682 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Cesar G
589394e80b [ticket/13396] Normalize multibyte characters in attachment file names. 
PHPBB3-13396
 2014-12-02 16:23:40 -08: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
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
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
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
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