makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 12:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
25617 commits 18 branches 192 tags 207 MiB
Commit graph

25617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jakub Senko
8d6ab63fea [ticket/11424] Add space between control flow keywords and parenthesis 
PHPBB3-11424
 2015-02-19 22:07:26 +01: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
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
rxu
950c72a8a5 [ticket/13433] Add make_clickable() test for emails 
PHPBB3-13433
 2015-02-18 01:03:07 +07:00
Marc Alexander
b84dee2667 Merge branch 'develop-ascraeus' into develop 2015-02-17 17:13:34 +01:00
Marc Alexander
6322970766 Merge pull request #3412 from Senky/ticket/13618 
[ticket/13618] Small grammatical typo in the English FAQ
 2015-02-17 17:13:13 +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
kasimi
c7ce6cd26f [ticket/13540] Add total post count to mcp_topic_review_modify_row event 
PHPBB3-13540
 2015-02-17 00:48:04 +01: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
Jakub Senko
e31720bb6e [ticket/13467] Add a CONTRIBUTING file 
PHPBB3-13467
 2015-02-16 20:17:33 +01:00
kasimi
f9d34a16dd [ticket/13540] Add topic_info to mcp_topic_review_modify_row event 
PHPBB3-13540
 2015-02-16 20:11:19 +01:00
Jakub Senko
6f56dc8568 [ticket/11424] Handle race condition properly for Quick-Mod Tools 
PHPBB3-11424
 2015-02-16 19:51:09 +01:00
Jakub Senko
bf86553daa [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files 
PHPBB3-9457
 2015-02-16 18:02:16 +01:00
brunoais
b934617a3b [ticket/13625] Adding multiple variables to core.viewforum_get_topic_data 
Added topics_count, sort_days, sort_key and sort_dir to
core.viewforum_get_topic_data and adjusted the event's comment explaining
it's possible extended purpose now that it has more variables.

PHPBB3-13625
 2015-02-16 11:31:05 +00:00
Joas Schilling
c489c6090b Merge pull request #3401 from marc1706/ticket/13619 
[ticket/13619] Remove unneeded files and folders from vendor in release package
 2015-02-16 09:25:22 +01:00
Marc Alexander
9b6e57de3d Merge pull request #3394 from nickvergessen/ticket/10748-postgresql 
[ticket/10748][Part2] Split postgres DB tools into it's own class
 2015-02-15 22:32:39 +01:00
brunoais
957b23765f [ticket/13621] Prepend $where_sql and postpend closing parentheses on return 
Prepend $where_sql and postpend closing parentheses on statements with return

PHPBB3-13621
 2015-02-15 18:50:13 +00:00
Marc Alexander
2042bfc5db Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
 2015-02-15 18:52:05 +01:00
Marc Alexander
088907fe8e Merge pull request #3403 from marc1706/ticket/13615 
[ticket/13615] Correctly display images for gallery avatar in subsilver2
 2015-02-15 18:50:58 +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
Joas Schilling
1e3175cca3 [ticket/10748] Fix class type hinting 
PHPBB3-10748
 2015-02-15 17:01:20 +01:00
Marc Alexander
8793d2f2c8 [ticket/13619] Remove unneeded files and folders from vendor in release package 
PHPBB3-13619
 2015-02-15 14:52:12 +01:00