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
|
88c86ff324
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-09 18:07:03 +01:00 |
|
Joas Schilling
|
9ce8b62894
|
Merge pull request #3242 from lavigor/ticket/13442
[ticket/13442] UTF-8 symbols for database host
|
2015-01-09 18:07:00 +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
|
24058dfefc
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/includes/bbcode.php
|
2015-01-09 17:49:30 +01:00 |
|
Joas Schilling
|
b64da23fe1
|
Merge pull request #3267 from Elsensee/ticket/13478
[ticket/13478] Add event core.bbcode_cache_init_end
|
2015-01-09 17:47:46 +01:00 |
|
Joas Schilling
|
ff44579523
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-09 17:41:47 +01:00 |
|
Joas Schilling
|
67c9f4d064
|
Merge pull request #3268 from Elsensee/ticket/13470
[ticket/13470] Fix non-empty username array if no usernames are given
|
2015-01-09 17:41:42 +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 |
|
Oliver Schramm
|
e3571fc6eb
|
[ticket/13470] Fix non-empty username array if no usernames are given
PHPBB3-13470
|
2015-01-08 22:17:05 +01:00 |
|
Oliver Schramm
|
953a98dc0b
|
[ticket/13478] Add event core.bbcode_cache_init_end
PHPBB3-13478
|
2015-01-08 00:13:58 +01:00 |
|
Joas Schilling
|
778c8e89d3
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-06 11:29:18 +01:00 |
|
Joas Schilling
|
87578e90eb
|
Merge pull request #3262 from Elsensee/ticket/13466
[ticket/13466] Add bitfield and uid to event core.message_parser_check_message
|
2015-01-06 11:29:11 +01:00 |
|
Joas Schilling
|
ba90746ce5
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
|
2015-01-06 11:25:26 +01:00 |
|
Joas Schilling
|
874356e57f
|
Merge pull request #3243 from kinerity/ticket/13437
[ticket/13437] Add template event viewtopic_body_post_author_before/after
|
2015-01-06 11:24:25 +01:00 |
|
Joas Schilling
|
1ed61fc39f
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-06 11:08:06 +01:00 |
|
Joas Schilling
|
26bf79425c
|
Merge pull request #3231 from rxu/ticket/13435
[ticket/13435] Add core event to modify submit_post() sql data
|
2015-01-06 11:08:01 +01:00 |
|
Joas Schilling
|
ba11a91524
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-06 11:05:12 +01:00 |
|
Joas Schilling
|
d36b0452bd
|
Merge pull request #3230 from omniError/ticket/13430
[ticket/13430] Add event core.prune_sql
|
2015-01-06 11:05:08 +01:00 |
|
Joas Schilling
|
2edf947415
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-06 11:01:53 +01:00 |
|
Wolfsblvt
|
387e4b942b
|
[ticket/13428] Add core events to memberlist.php for teampage
PHPBB3-13428
|
2015-01-06 11:01:18 +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 |
|
Joas Schilling
|
2fae00c433
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-06 10:04:58 +01:00 |
|
Joas Schilling
|
35b7f94754
|
Merge pull request #3070 from brunoais/ticket/13141
[Event] Allow applying additional permissions to MCP access besides f_read
|
2015-01-06 10:04:51 +01:00 |
|
Oliver Schramm
|
2532583765
|
[ticket/13466] Add bitfield and uid to event core.message_parser_check_message
PHPBB3-13466
|
2015-01-05 22:15:56 +01:00 |
|
Joas Schilling
|
ef00adac8b
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-05 20:40:15 +01:00 |
|
Joas Schilling
|
7a34bf9bf5
|
Merge pull request #3244 from rxu/ticket/13449
[ticket/13449] Add viewforum event after the topic's been assigned to template
|
2015-01-05 20:39:58 +01:00 |
|
Marc Alexander
|
3aad3f0b3f
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 12:21:28 +01:00 |
|
Marc Alexander
|
3638b2ff64
|
Merge pull request #3254 from VSEphpbb/ticket/13440
[ticket/13440] Update event version to 3.1.3-RC1
|
2015-01-04 12:21:09 +01:00 |
|
Marc Alexander
|
7b84b8bba8
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 11:26:00 +01:00 |
|
Marc Alexander
|
8c27c7f10b
|
Merge pull request #3253 from VSEphpbb/ticket/13439
[ticket/13439] Update event version to 3.1.3-RC1
|
2015-01-04 11:25:43 +01:00 |
|
Matt Friedman
|
88034ea2f0
|
[ticket/13440] Update event version to 3.1.3-RC1
PHPBB3-13440
|
2015-01-04 01:40:18 -08:00 |
|
Matt Friedman
|
86f66b5f72
|
[ticket/13439] Update event version to 3.1.3-RC1
PHPBB3-13439
|
2015-01-04 01:38:50 -08:00 |
|
Marc Alexander
|
dc39ccf525
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 00:56:22 +01:00 |
|
Marc Alexander
|
838b1250f6
|
Merge pull request #3249 from VSEphpbb/ticket/13440
[ticket/13440] Add event core.login_box_failed
|
2015-01-04 00:43:11 +01:00 |
|
Marc Alexander
|
4749dbbc1a
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 00:39:21 +01:00 |
|
Matt Friedman
|
9d9b8139d0
|
[ticket/13440] Add event core.login_box_failed
PHPBB3-13440
|
2015-01-03 15:23:50 -08:00 |
|
Matt Friedman
|
179a7a4c71
|
[ticket/13439] Add event core.acp_users_overview_before
PHPBB3-13439
|
2015-01-03 15:21:47 -08:00 |
|
rxu
|
970ed40b09
|
[ticket/13449] Add viewforum event after the topic's been assigned to template
PHPBB3-13449
|
2015-01-03 20:12:47 +07:00 |
|
Marc Alexander
|
ddceaee772
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-03 13:46:47 +01:00 |
|
Gaëtan Muller
|
0e0c649477
|
[ticket/13441] Functions_convert fails to set global moderators default group
PHPBB3-13441
|
2015-01-03 13:45:52 +01:00 |
|