1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

25439 Commits

Author SHA1 Message Date
Joas Schilling
9c6fba558c [ticket/13647] Switch FAQ handling in view online to controller
PHPBB3-13647
2015-02-22 22:57:14 +01:00
Joas Schilling
19a236205f [ticket/13647] Generate route links for faq
PHPBB3-13647
2015-02-22 22:44:50 +01:00
Joas Schilling
9bd6535a7d [ticket/13647] Send 301 status
PHPBB3-13647
2015-02-22 22:44:31 +01:00
Joas Schilling
0357a4d89b Merge branch '3.1.x' 2015-02-22 22:27:59 +01:00
Joas Schilling
269dee4189 Merge pull request #3415 from RMcGirr83/ticket/13578
[ticket/13578] Add ucp_register.php core events
2015-02-22 22:27:41 +01:00
Nicofuma
ffc5a73a0c [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)

PHPBB3-13643
2015-02-22 21:53:05 +01:00
Joas Schilling
0595ab959c [ticket/13647] Move FAQ page to a controller
PHPBB3-13647
2015-02-22 20:20:28 +01:00
Andreas Fischer
71eb981a81 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
Andreas Fischer
d152bbc727 Merge pull request #3427 from prototech/ticket/13551
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN

* prototech/ticket/13551:
  [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Andreas Fischer
677337348f Merge branch '3.1.x'
* 3.1.x:
  [ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Andreas Fischer
702a51b01c Merge pull request #3431 from Nicofuma/ticket/13644
[ticket/13644] Always type hint dispatch_interface

* Nicofuma/ticket/13644:
  [ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Nicofuma
9b5493372d [ticket/13644] Always type hint dispatch_interface
PHPBB3-13644
2015-02-22 17:01:37 +01:00
RMcGirr83
7bfb8686d9 [ticket/13578] Add ucp_register.php core events
PHPBB3-13578
2015-02-22 08:52:19 -05:00
Kailey Truscott
b8c388f184 [ticket/13637] Update event name and docblock
Update the event name to core.ucp_pm_compose_modify_data
Change description of to_group_id and submit dockblock

PHPBB3-13637
2015-02-20 20:36:17 -05:00
Joas Schilling
3657d7a85a Merge branch '3.1.x' 2015-02-20 22:26:47 +01:00
Joas Schilling
379eae1a92 Merge pull request #3418 from brunoais/ticket/13631
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Joas Schilling
7f3ad29c47 Merge branch '3.1.x' 2015-02-20 21:00:49 +01:00
Joas Schilling
e6e7d7040a Merge pull request #3423 from RMcGirr83/ticket/13635
[ticket/13635] Add sql_ary to ucp profile event
2015-02-20 21:00:39 +01:00
Joas Schilling
33ea266daf Merge branch '3.1.x' 2015-02-20 20:55:55 +01:00
Joas Schilling
059790f386 Merge pull request #3425 from dragosvr92/patch-4
Update colours.css
2015-02-20 20:55:23 +01:00
Joas Schilling
76d22f3e53 Merge branch '3.1.x' 2015-02-20 20:53:03 +01:00
Joas Schilling
835ee2ba63 Merge pull request #3380 from n-aleha/ticket/13586
[ticket/13586] Allow '0' as username with Jabber notifications
2015-02-20 20:52:54 +01:00
Joas Schilling
275d6bec6a Merge branch '3.1.x' 2015-02-20 20:50:18 +01:00
Joas Schilling
5e215aef26 Merge pull request #3369 from marc1706/ticket/13577
[ticket/13577] Skip tests requiring fileinfo if not enabled
2015-02-20 20:50:10 +01:00
Joas Schilling
61fa9dcb9f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/search_results.html
2015-02-20 20:42:52 +01:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results
PHPBB3-13533
2015-02-20 20:41:17 +01:00
Joas Schilling
0dab7e2552 Merge branch '3.1.x' 2015-02-20 20:29:45 +01:00
Joas Schilling
c24a840048 Merge pull request #3277 from dhruvgoel92/ticket/13472
[ticket/13472] Delete admin activation notification when deleting user
2015-02-20 20:29:05 +01:00
Joas Schilling
a1ecb10c5c Merge branch '3.1.x' 2015-02-20 20:22:18 +01:00
Joas Schilling
8a06f21ea9 Merge branch 'ticket/13640' into 3.1.x 2015-02-20 20:22:03 +01:00
Dragos-Valentin Radulescu
5c3ca7404d [ticket/13640] Rearrange css in a better order
PHPBB3-13640
2015-02-20 20:21:31 +01:00
Joas Schilling
de061b5e11 Merge branch '3.1.x' 2015-02-20 19:56:36 +01:00
Joas Schilling
31ae574830 Merge pull request #3197 from brunoais/ticket/13142
[ticket/13142] Before query to list unapproved and deleted posts
2015-02-20 19:54:02 +01:00
Dragos-Valentin Radulescu
eff928c29b [ticket/13639] Update colours.css
The rule is a left over from development. it should be removed from colours.css

.icon-search-advanced { background-image: url("./images/icon_search_adv.gif");}

Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166

PHPBB3-13639
2015-02-20 20:26:33 +02:00
Scout4all
3f4dcc6920 [ticket/13463] Correctly position notification mark read icon in RTL.
PHPBB3-13463
2015-02-19 19:07:07 -08:00
Cesar G
71d3ddc623 [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
PHPBB3-13551
2015-02-19 18:38:35 -08:00
Kailey Truscott
d28d90bd90 [ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
Add a new PHP event to ucp_pm_compose to alter the default vars

PHPBB3-13637
2015-02-19 20:50:51 -05:00
Andreas Fischer
19f8e25515 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:15 +01:00
Andreas Fischer
3db7ac0aad Merge pull request #3422 from VSEphpbb/ticket/13634-3.0.x
[ticket/13634] Update branch names on README

* VSEphpbb/ticket/13634-3.0.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
Andreas Fischer
e4b4428173 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
  [ticket/13634] Update links to travis build icons
  [ticket/13634] Update branch names on README
2015-02-19 19:27:14 +01:00
RMcGirr83
1f345a8cf9 [ticket/13635] Add sql_ary to ucp profile event
PHPBB3-13635
2015-02-19 05:45:10 -05:00
Marc Alexander
a43c1a46c3 Merge branch '3.1.x' 2015-02-18 21:11:04 +01:00
Marc Alexander
7fd3767bbd Merge pull request #3417 from nickvergessen/ticket/13600
[ticket/13600] Allow extensions to create a custom help page
2015-02-18 21:10:43 +01:00
Marc Alexander
5ad4685f00 Merge branch '3.1.x' 2015-02-18 18:04:46 +01:00
Marc Alexander
098854a822 Merge pull request #3395 from s9e/ticket/13595
[ticket/13595] Remove unused instances of the bbcode class
2015-02-18 18:02:23 +01:00
Matt Friedman
bbf4bcc986 [ticket/13634] Update links to travis build icons
PHPBB3-13634
2015-02-18 08:42:14 -08:00
Matt Friedman
03f9c69e60 [ticket/13634] Update branch names on README
PHPBB3-13634
2015-02-18 08:37:36 -08:00
Marc Alexander
21c6223eb3 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
2015-02-18 17:35:03 +01:00
Marc Alexander
60f60acea3 Merge pull request #3420 from marc1706/ticket/13628
[ticket/13628] Allow ability for extension to add entries to user's profile
2015-02-18 17:30:13 +01:00