mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 23:21:33 +02:00
Code Issues Releases Wiki Activity
24,806 Commits 18 Branches 192 Tags
1981f4f9661c11d535c208088ad8df014957307f
Commit Graph

1824 Commits

Author SHA1 Message Date
Joas Schilling
1981f4f966 Merge branch 'develop-ascraeus' into develop 2015-01-09 18:39:26 +01:00
Joas Schilling
d9bdd05c80 Merge pull request #3128 from omniError/ticket/13306 
[ticket/13306] add error level to collector
 2015-01-09 18:39:11 +01:00
Joas Schilling
a5007b7abd Merge branch 'develop-ascraeus' into develop 2015-01-09 18:12:02 +01:00
Joas Schilling
3350df131f Merge pull request #3227 from prototech/ticket/13366 
[ticket/13366] Ensure plupload_last_gc config entry is dynamic.
 2015-01-09 18:11:41 +01:00
Joas Schilling
8f5bbc95dc Merge branch 'develop-ascraeus' into develop 2015-01-09 18:03:34 +01:00
Joas Schilling
65ffc76e2f Merge pull request #3258 from marc1706/ticket/13385 
[ticket/13385] Free result in \phpbb\config\db::set_atomic()
 2015-01-09 18:03:21 +01:00
Joas Schilling
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +01:00
Marc Alexander
9d9c57f334 [ticket/13432] Make sure to add language file when including acp_modules 
PHPBB3-13432
 2015-01-09 13:47:36 +01:00
Marc Alexander
38f184ad6b [ticket/13385] Remove unneeded $result in \phpbb\config\db::set_atomic() 
PHPBB3-13385
 2015-01-09 13:41:36 +01:00
Joas Schilling
d9109355a3 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:48:34 +01:00
Joas Schilling
6fd8f1b835 Merge pull request #3221 from MasterShredder/ticket/13422 
[ticket/13422] New events for save custom cookies and set custom ban type
 2015-01-06 10:48:14 +01:00
Joas Schilling
93a85a65d0 Merge branch 'develop-ascraeus' into develop 2015-01-06 10:43:37 +01:00
Joas Schilling
2dab3c8c52 Merge pull request #3211 from brunoais/ticket/13148 
[ticket/13148] Creating a final way to modify edit logs output
 2015-01-06 10:25:10 +01:00
brunoais
92d7c16782 [ticket/13148] Wrong version num; copy & paste fail 
PHPBB3-13148
 2014-12-29 08:23:31 +00:00
brunoais
0104188074 [ticket/13148] Fixed my error 
PHPBB3-13148
 2014-12-28 20:35:16 +00:00
brunoais
d455dd68f6 [ticket/13148] Fixed syntax error 
PHPBB3-13148
 2014-12-28 20:25:36 +00:00
brunoais
cf036ea0e8 [ticket/13148] Added more variables as requested 
Added more variables as requested and some extra that may be of use.

PHPBB3-13148
 2014-12-28 19:52:58 +00:00
MasterShredder
3f88be6527 [ticket/13422] Changed variable descriptions 
PHPBB3-13422
 2014-12-28 03:35:21 +04:00
Joas Schilling
dbbcf3f372 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:17:03 +01:00
Joas Schilling
b0f1a0f4bb Merge pull request #3229 from n-aleha/ticket/13098 
[ticket/13098] Repair Yahoo contact field
 2014-12-27 14:16:55 +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
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
n-aleha
6463354a39 [ticket/13098] Repair Yahoo contact field 
Update the Yahoo link of the yahoo profile field.

PHPBB3-13098
 2014-12-12 13:54:35 +02:00
Cesar G
54b5ee5806 [ticket/13366] Ensure plupload_last_gc config entry is dynamic. 
PHPBB3-13366
 2014-12-09 18:50:29 -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
MasterShredder
fda5d8d637 [ticket/13422] Deleted event core.session_check_user_session 2014-12-08 21:37:07 +03:00
MasterShredder
1896825f39 [ticket/13422] Add new event core.session_set_custom_ban 
PHPBB3-13422
 2014-12-07 05:59:20 +04:00
MasterShredder
566510769b [ticket/13422] Add new event core.session_check_user_session 
PHPBB3-13422
 2014-12-07 05:57:07 +04: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
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
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
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
Joas Schilling
0869a77201 Merge branch 'develop-ascraeus' into develop 2014-11-29 09:09:17 +01:00
Oliver Schramm
893e4b3067 [ticket/13393] Call user->lang function directly 
PHPBB3-13393
 2014-11-27 00:55:01 +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
Marc Alexander
94d90c084b Merge branch 'develop-ascraeus' into develop 2014-11-25 23:15:30 +01:00
Joas Schilling
eb83bd5797 [ticket/13381] Fix header intendation of v312.php 
PHPBB3-13381
 2014-11-25 22:42:52 +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
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
dcd0f200d6 [prep-release-3.1.2] Add migration for 3.1.2-RC1 2014-11-22 19:27:34 +01:00
Joas Schilling
8f67892f5e Merge branch 'develop-ascraeus' into develop 2014-11-22 17:49:06 +01:00