Matt Friedman
6b178c758e
[ticket/12060] Fix docblock for acp_bbcodes_modify_create event
...
PHPBB3-12060
2013-12-16 15:31:25 -08:00
Joas Schilling
e3e34add7f
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:45 +01:00
Joas Schilling
89fd73c18d
Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympus
...
* Elsensee/ticket/10023:
[ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:21 +01:00
Joas Schilling
4a73ce0933
Merge remote-tracking branch 'prototech/ticket/12009' into develop
...
* prototech/ticket/12009:
[ticket/12009] Prevent user from enabling invalid extension through direct URL
[ticket/12009] Update functional test to check for invalid extensions.
[ticket/12009] Fix functional tests.
[ticket/12009] Move valid extensions in tests to correct dir structure.
[ticket/12009] Do not allow incorrectly structured extensions to be installed.
2013-12-16 10:18:56 +01:00
Joas Schilling
8da2f349fe
Merge remote-tracking branch 'vsephpbb/ticket/12054' into develop
...
* vsephpbb/ticket/12054:
[ticket/12054] Re-word event documentation
[ticket/12054] Reword descriptions and resort events alphabetically
[ticket/12054] Update index_body_linklist_before/after template events
2013-12-16 10:08:19 +01:00
Matt Friedman
b13f64b5a9
[ticket/12054] Re-word event documentation
...
PHPBB3-12054
2013-12-14 12:59:52 -08:00
Paul Tarjan
f495f937e9
HHVM is failing for now
...
Lets at least keep running it so we remember to fix it
2013-12-13 18:11:49 -08:00
Matt Friedman
f045458679
[ticket/12060] Rename event in message parser to modify_format_display_text_after
...
PHPBB3-12060
2013-12-13 17:00:06 -08:00
Matt Friedman
a24d2058cd
[ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
...
event
PHPBB3-12060
2013-12-13 16:47:38 -08:00
Matt Friedman
aa0c463d0f
[ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
...
PHPBB3-12060
2013-12-13 16:46:12 -08:00
Matt Friedman
31eb759aa4
[ticket/12060] Use separate template event for acp user signature posting buttons
...
PHPBB3-12060
2013-12-13 13:36:59 -08:00
Matt Friedman
8864c601a2
[ticket/12060] Rename event from append to after in acp_bbcodes.html
...
PHPBB3-12060
2013-12-13 13:34:58 -08:00
Paul Tarjan
66c9ca4400
Try running unit tests on HHVM
2013-12-13 11:49:12 -08:00
Joas Schilling
a999dbad74
Merge remote-tracking branch 'vsephpbb/ticket/12063' into develop
...
* vsephpbb/ticket/12063:
[ticket/12063] Use CSS to replace valign=top
[ticket/12063] Remove obsolete valign attributes from tr tags
2013-12-13 20:28:22 +01:00
Matt Friedman
7bc4571753
[ticket/12063] Use CSS to replace valign=top
...
PHPBB3-12063
2013-12-13 10:33:38 -08:00
Matt Friedman
b26e4dd42c
[ticket/12060] Correctly label alpha versions in event docblocks
...
PHPBB3-12060
2013-12-13 10:31:04 -08:00
Cesar G
c42bd28d17
[ticket/12009] Prevent user from enabling invalid extension through direct URL
...
PHPBB3-12009
2013-12-12 14:40:03 -08:00
Matt Friedman
21e269b9ca
[ticket/12060] Fix u_action comments in docblocks
...
PHPBB3-12060
2013-12-12 14:09:58 -08:00
Matt Friedman
75831dc2d0
[ticket/12060] Change @since in event docblocks
...
PHPBB3-12060
2013-12-12 14:09:30 -08:00
Matt Friedman
730a05bd30
[ticket/12060] Update the docblock comments in acp core events
...
PHPBB3-12060
2013-12-12 13:59:30 -08:00
Matt Friedman
caca36bc50
[ticket/12060] Refactor u_action in the events that use it
...
PHPBB3-12060
2013-12-12 13:58:59 -08:00
Matt Friedman
6ccec39e43
[ticket/12060] Use $sql_ary instead of $sql
...
PHPBB3-12060
2013-12-12 13:50:13 -08:00
Cesar G
2735982c55
[ticket/12009] Update functional test to check for invalid extensions.
...
PHPBB3-12009
2013-12-12 13:03:04 -08:00
Cesar G
495ded59f3
[ticket/12009] Fix functional tests.
...
PHPBB3-12009
2013-12-12 12:24:16 -08:00
Cesar G
31234b26d8
[ticket/12009] Move valid extensions in tests to correct dir structure.
...
PHPBB3-12009
2013-12-12 10:52:51 -08:00
Matt Friedman
b6eb1f66e1
[ticket/12060] Update docblock for core event due to addition of another var
...
PHPBB3-12060
2013-12-12 10:37:11 -08:00
Matt Friedman
a59bbeed2d
[ticket/11966] Merge branch 'develop' into ticket/11966
...
PHPBB3-11966
2013-12-12 10:28:10 -08:00
Matt Friedman
1be42e7ab2
[ticket/12054] Reword descriptions and resort events alphabetically
...
PHPBB3-12054
2013-12-12 10:11:53 -08:00
Matt Friedman
9e0dd14e19
[ticket/12060] Remove re-tabbing of html from subsilver2 files
...
PHPBB3-12060
2013-12-12 09:56:51 -08:00
Matt Friedman
0156136c85
[ticket/12060] Add $update_this_message var to the core event
...
PHPBB3-12060
2013-12-12 09:56:00 -08:00
Matt Friedman
b1e05be6ea
[ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
...
PHPBB3-12060
2013-12-12 09:55:21 -08:00
Matt Friedman
3659ba884e
[ticket/12060] Copy this_u_action back to original this->u_action var
...
PHPBB3-12060
2013-12-12 09:54:46 -08:00
Oliver Schramm
e6b91de17b
[ticket/10023] Make password change notification more noticeable
...
PHPBB3-10023
2013-12-12 16:57:06 +01:00
Joas Schilling
da6ced59d9
Merge remote-tracking branch 'vsephpbb/ticket/12064' into develop
...
* vsephpbb/ticket/12064:
[ticket/12064] Delete obsolete viewsource.html file from adm/style/
2013-12-12 10:29:31 +01:00
Joas Schilling
4816446c4a
Merge remote-tracking branch 'Marc/ticket/11859' into develop
...
* Marc/ticket/11859:
[ticket/11859] Add missing get_template_name method to test drivers
[ticket/11859] Make avatar drivers return template filename
2013-12-12 10:21:36 +01:00
Cesar G
4d65727acc
[ticket/12009] Do not allow incorrectly structured extensions to be installed.
...
PHPBB3-12009
2013-12-11 23:11:52 -08:00
Joas Schilling
d252ef3f60
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/12061] Fix keyboard shortcut in firefox
Conflicts:
phpBB/styles/prosilver/template/overall_footer.html
2013-12-09 01:23:29 +01:00
Joas Schilling
6658cd279c
Merge remote-tracking branch 'Elsensee/ticket/12061' into develop-olympus
...
* Elsensee/ticket/12061:
[ticket/12061] Fix keyboard shortcut in firefox
2013-12-09 01:21:24 +01:00
Andreas Fischer
d5742d7ec1
Merge remote-tracking branch 'imkingdavid/ticket/12069' into develop
...
* imkingdavid/ticket/12069:
[ticket/12069] Globalize in submit_post()
2013-12-08 21:43:06 +01:00
David King
6b081433c5
[ticket/12069] Globalize in submit_post()
...
PHPBB3-12069
2013-12-08 15:08:30 -05:00
Nathan Guse
b5bfe7b3ca
Merge pull request #1923 from prototech/ticket/12067
...
[ticket/12067] Remove double scrollbar from notifications dropdown.
2013-12-08 12:04:14 -08:00
Nathan Guse
e379b84c7b
Merge pull request #1926 from imkingdavid/ticket/12069
...
[ticket/12069] Fix event documentation
2013-12-08 12:03:33 -08:00
David King
0b76880816
[ticket/12069] Fix event documentation
...
PHPBB3-12069
2013-12-08 15:01:53 -05:00
Nathan Guse
44a0e91ab9
Merge pull request #1925 from imkingdavid/ticket/12069
...
[ticket/12069] Add core.submit_post_end event
2013-12-08 11:47:07 -08:00
David King
fdac051956
[ticket/12069] Add core.submit_post_end event
...
PHPBB3-12069
2013-12-08 14:42:46 -05:00
Marc Alexander
47ea6bc9e6
Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
...
Conflicts:
tests/functional/fixtures/ext/foo/bar/config/services.yml
2013-12-07 13:32:19 +01:00
Marc Alexander
f32a30eeca
[ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
...
PHPBB3-11997
2013-12-07 13:28:44 +01:00
Marc Alexander
a7f2788c72
[ticket/11997] Use get_controller_redirect_url() in redirect() function
...
This method of path_helper will now be used instead of the previous hack
of the phpbb_own_realpath() function.
PHPBB3-11997
2013-12-07 13:25:04 +01:00
Marc Alexander
8bbede4251
[ticket/11997] Add method for controller redirect URLs to path helper
...
This method will allow us to get proper redirect URLs for controllers.
PHPBB3-11997
2013-12-07 13:23:57 +01:00
Marc Alexander
8370857f04
[ticket/11997] Undo changes to phpbb_own_realpath()
...
PHPBB3-11997
2013-12-07 13:20:40 +01:00