mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-22 23:40:12 +02:00
Code Issues Releases Wiki Activity
24,655 Commits 18 Branches 192 Tags
Commit Graph

24655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tristan Darricau
f46057ca02 [ticket/13362] Ignore the whole cache directory in git 
PHPBB3-13362
 2014-11-25 18:00:07 +01:00
Joas Schilling
1a0cba1099 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-11-25 16:47:22 +01:00
Joas Schilling
f4898b9258 Merge branch 'prep-release-3.1.2' into develop-ascraeus 2014-11-25 16:44:57 +01:00
Joas Schilling
9c9623e47f [prep-release-3.1.2] Update the development version to 3.1.3-RC1-dev 2014-11-25 16:43:43 +01:00
Joas Schilling
1ad0dd28f1 Merge branch 'develop-olympus' into prep-release-3.1.2 release-3.1.2 2014-11-25 16:36:32 +01:00
Joas Schilling
ff9b541070 Merge pull request #3180 from naderman/ticket/13376 
[ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
 2014-11-25 16:36:18 +01:00
Nils Adermann
965042d015 [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 
Also introduce a clear cookie message hardcoded just in case.

PHPBB3-13376
 2014-11-25 15:57:12 +01:00
Joas Schilling
9264d7c758 [prep-release-3.1.2] Update Changelog with 13376 2014-11-25 15:44:39 +01:00
Joas Schilling
0fbe8e8e69 [prep-release-3.1.2] Add migration to update version to 3.1.2 2014-11-24 21:32:17 +01:00
Joas Schilling
3862b60094 [prep-release-3.1.2] Increase version number to 3.1.2 2014-11-24 21:31:49 +01:00