1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

24784 Commits

Author SHA1 Message Date
Joas Schilling
b9c10e34bb Merge branch 'develop-ascraeus' into develop 2015-01-09 17:36:25 +01:00
Joas Schilling
d4c078cc78 Merge pull request #3271 from marc1706/ticket/13432
[ticket/13432] Make sure to add language file when including acp_modules
2015-01-09 17:36:07 +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
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
Joas Schilling
64d880a15c Merge branch 'Wolfsblvt-ticket/13428' into develop-ascraeus 2015-01-06 11:01:40 +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
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
Kailey Truscott
652a7630bb [ticket/13437] Change "View" to "view"
PHPBB3-13437
2015-01-02 10:38:56 -05:00
Kailey Truscott
7dad863a41 Fix events.md event name
PHPBB3-13437
2015-01-02 10:20:36 -05:00
Kailey Truscott
c61fa1aaa1 [ticket/13437] Add template event viewtopic_body_post_author_before/after
PHPBB3-13437
2015-01-02 10:00:01 -05: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
655d95002c [ticket/13422] Renamed event
PHPBB3-13422
2014-12-28 13:20:04 +04:00
MasterShredder
0a1f8388d0 [ticket/13422] Changed some spaces to tabs
PHPBB3-13422
2014-12-28 03:44:07 +04:00
MasterShredder
3f88be6527 [ticket/13422] Changed variable descriptions
PHPBB3-13422
2014-12-28 03:35:21 +04:00
MasterShredder
50ed202aac [ticket/13422] Renamed "continue" variable to "retain_cookie" for the event core.ucp_save_custom_cookies
PHPBB3-13422
2014-12-27 17:43:30 +04:00
Joas Schilling
b9a539a06b Merge branch 'develop-ascraeus' into develop 2014-12-27 14:22:52 +01:00