Joas Schilling
17b00812a7
Merge branch '3.1.x'
2015-02-24 20:44:37 +01:00
RMcGirr83
80e1c233d9
[ticket/13587] SQL syntax errors in get_prune_users()
...
PHPBB3-13587
2015-02-24 13:28:47 -05:00
Andreas Fischer
b57e00226a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Andreas Fischer
525a62f72e
Merge pull request #3433 from Nicofuma/ticket/13643
...
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000
* Nicofuma/ticket/13643:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +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
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
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
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
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
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
Cesar G
71d3ddc623
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
...
PHPBB3-13551
2015-02-19 18:38:35 -08: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
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
RMcGirr83
153d1691ae
[ticket/13628] Allow ability for extension to add entries to user's profile
...
PHPBB3-13628
2015-02-18 16:35:10 +01:00
brunoais
f0850f1915
[ticket/13631] Better, more explicit comment explanation
...
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
...
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...
PHPBB3-13631
2015-02-18 10:33:49 +00:00
Marc Alexander
ddc96a7d07
Merge branch '3.1.x'
2015-02-18 00:19:10 +01:00
Marc Alexander
13948718c6
Merge pull request #3414 from rxu/ticket/13433
...
[ticket/13433] Fix parsing of email addresses
2015-02-18 00:03:25 +01:00
Joas Schilling
02d28c28cd
[ticket/13600] Allow extensions to create a custom help page
...
PHPBB3-13600
2015-02-17 23:57:30 +01:00
Andreas Fischer
978b96cbf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Andreas Fischer
f3d332b78f
Merge pull request #3411 from Senky/ticket/13570
...
[ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0
* Senky/ticket/13570:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Marc Alexander
b84dee2667
Merge branch 'develop-ascraeus' into develop
2015-02-17 17:13:34 +01:00
rxu
fa1c61f608
[ticket/13433] Fix parsing of email addresses
...
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.
PHPBB3-13433
2015-02-17 17:24:30 +07:00
Jakub Senko
ec8aeaf2cd
[ticket/13618] Fix typo in English FAQ
...
PHPBB3-13618
2015-02-16 20:27:52 +01:00
Jakub Senko
f23d2ec42f
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
...
PHPBB3-13570
2015-02-16 20:25:11 +01:00
kamijoutouma
4398a51dc6
[ticket/13615] Correctly display images for gallery avatar in subsilver2
...
Avatar Gallery shows categories but no images in subsilver2.
The ID was not specified in the template. Also, the correct parent template
loop is called avatar_local_row and not avatar_local_col.
PHPBB3-13615
2015-02-15 18:18:56 +01:00
