Commit graph

24753 commits

Author SHA1 Message Date
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
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
Marc Alexander
4da3d41083 Merge pull request #3248 from VSEphpbb/ticket/13439
[ticket/13439] Add event core.acp_users_overview_before
2015-01-04 00:25:20 +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
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
Joas Schilling
b9a539a06b Merge branch 'develop-ascraeus' into develop 2014-12-27 14:22:52 +01:00
Joas Schilling
a92589436a Merge pull request #3213 from brunoais/ticket/13158
[ticket/13158] Allow adding extra auth checks when the user is posting
2014-12-27 14:22:48 +01: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
7b0809414f Merge branch 'develop-ascraeus' into develop 2014-12-27 14:12:31 +01:00
Joas Schilling
6ff0aaaa70 Merge pull request #3225 from prototech/ticket/13302
[ticket/13302] Fix incorrect links to phpBB.com resources
2014-12-27 14:12:23 +01:00
Joas Schilling
cf8904bc2c Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/mcp_front.html
2014-12-27 14:09:38 +01:00
Joas Schilling
ffbe1d424b Merge pull request #3224 from prototech/ticket/13427
[ticket/13427] Add several before/after template events to mcp_front.html
2014-12-27 14:08:51 +01:00
Joas Schilling
8049b5fd97 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:07:43 +01:00
Joas Schilling
a5922a0e8b Merge pull request #3223 from prototech/ticket/13370
[ticket/13370] Allow calling class method in convertor framework directly
2014-12-27 14:07:37 +01:00
Joas Schilling
fbe0f04132 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/overall_footer.html
2014-12-27 14:03:34 +01:00
Joas Schilling
fa06c7967e Merge pull request #3218 from rxu/ticket/13419
[ticket/13419] Add the lowermost template event
2014-12-27 14:02:39 +01:00
Joas Schilling
228fda0f03 Merge branch 'develop-ascraeus' into develop 2014-12-27 14:01:11 +01:00
Joas Schilling
d5f99e0478 Merge pull request #3216 from kinerity/ticket/13409
[ticket/13409] Add event core.search_modify_param_before
2014-12-27 14:01:05 +01:00
Joas Schilling
344311481f Merge branch 'develop-ascraeus' into develop 2014-12-27 13:58:54 +01:00
Joas Schilling
7b43d5c54e Merge pull request #3214 from brunoais/ticket/13159
[ticket/13159] Allow to do extra auth checks on report posting
2014-12-27 13:58:49 +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
ea6fcc3dda Merge branch 'develop-ascraeus' into develop 2014-12-27 13:49:53 +01:00
Joas Schilling
faad779cf6 Merge pull request #3202 from Nicofuma/ticket/13402
[ticket/13402] Code sniffer, unused use, check the function doc blocks
2014-12-27 13:49:50 +01:00
Joas Schilling
8aadee60f7 Merge branch 'develop-ascraeus' into develop 2014-12-27 13:46:46 +01:00
Joas Schilling
f6b21a2789 Merge pull request #3191 from Elsensee/ticket/13312
[ticket/13312] Add event core.acp_email_send_before
2014-12-27 13:46:32 +01:00
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