Commit graph

21521 commits

Author SHA1 Message Date
Joas Schilling
72f7c5e9c2 Merge branch '3.1.x' 2015-02-26 22:40:03 +01:00
Joas Schilling
ea4b993516 Merge pull request #2992 from prototech/ticket/12599
[ticket/12599] Update documentation style
2015-02-26 22:34:05 +01:00
Marc Alexander
c9df29d680 Merge pull request #3303 from Nicofuma/ticket/13513
[ticket/13513] Use paths relative to the phpBB root in the router
2015-02-26 13:41:51 +01:00
Cesar G
4df853abcc [ticket/12599] Remove empty line at end of code boxes.
PHPBB3-12599
2015-02-25 20:08:08 -08:00
Cesar G
a07b29c1df [ticket/12599] Place standalone text in a box.
PHPBB3-12599
2015-02-25 20:08:03 -08:00
Cesar G
6e5f33e5fb [ticket/12599] Get the font sizes under control.
PHPBB3-12599
2015-02-25 20:02:40 -08:00
Cesar G
62f69224a4 [ticket/12599] Add padding on the sides of the inline code boxes.
PHPBB3-12599
2015-02-25 20:02:28 -08:00
Cesar G
5cd3e7627c [ticket/12599] Use the back to top icon instead of text.
PHPBB3-12599
2015-02-25 20:02:16 -08:00
Cesar G
14fecb2f02 [ticket/12599] Move images to assets/ and update the phpBB logo.
PHPBB3-12599
2015-02-25 20:02:06 -08:00
Cesar G
4565cac049 [ticket/12599] Move documentation stylesheet to assets directory.
PHPBB3-12599
2015-02-25 20:01:53 -08:00
Cesar G
e29e0e5018 [ticket/12599] Remove corner images from documentation style.
PHPBB3-12599
2015-02-25 20:01:25 -08:00
Cesar G
37b919142f [ticket/13563] Remove PM column from subsilver2's memberlist_body.html.
The PM link was intentionally dropped due to excessive query requirements,
thus the column is without purpose now. See PHPBB3-13229

PHPBB3-13563
2015-02-25 19:15:11 -08:00
Joas Schilling
261c3bc1d0 Merge branch '3.1.x' 2015-02-24 21:57:14 +01:00
Joas Schilling
3ac583271f Merge pull request #3381 from rxu/ticket/13591
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
Joas Schilling
06d6bcbe00 Merge branch '3.1.x' 2015-02-24 21:53:05 +01:00
Joas Schilling
9f9e392c7d Merge pull request #3436 from RMcGirr83/ticket/13650
[ticket/13650] Validate ucp profile data changes
2015-02-24 21:53:01 +01:00
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
Richard McGirr
03ded5853b [ticket/13650] Validate ucp profile data changes
PHPBB3-13650
2015-02-23 21:19:10 -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