Commit graph

30449 commits

Author SHA1 Message Date
Jakub Senko
4cf666f0bc [ticket/14631] Load truncate_string() if needed
PHPBB3-14631
2016-06-07 19:39:15 +02:00
lavigor
ff8b5058e0 [ticket/14661] Fix a typo in twig.php
PHPBB3-14661
2016-06-05 13:40:40 +03:00
Marc Alexander
82649b37e4 Merge pull request #4302 from cyberalien/ticket/14612
[ticket/14612] Fix incorrect class for fieldset in mcp_approve.html
2016-06-04 16:15:48 +02:00
Richard McGirr
08acf2acba [ticket/14630] Rename core event
PHPBB3-14630
2016-06-02 05:18:14 -04:00
Marc Alexander
4fdbd6217d Merge branch '3.1.x' into 3.2.x 2016-05-31 21:43:19 +02:00
Marc Alexander
b63c61d099 Merge pull request #4343 from Senky/ticket/14643
[ticket/14643] Offer latest backup to restore by default
2016-05-31 21:43:16 +02:00
Marc Alexander
72248cab45 [ticket/14291] Do not update filesize if displaying thumbnail
PHPBB3-14291
2016-05-30 20:05:45 +02:00
Jakub Senko
33d1d19f97 [ticket/14586] Add OAuth1 support
PHPBB3-14586
2016-05-30 13:02:49 +02:00
Jakub Senko
73073ac8c3 [ticket/14643] Offer latest backup to restore by default
PHPBB3-14643
2016-05-29 17:28:33 +02:00
Jakub Senko
9961aefa38 [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
PHPBB3-14652
2016-05-29 11:42:32 +02:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event
PHPBB3-14506
2016-05-29 11:41:54 +02:00
Marc Alexander
50227dbc75 Merge branch '3.1.x' into 3.2.x 2016-05-28 09:59:50 +02:00
Marc Alexander
0a512b2695 Merge pull request #4173 from lavigor/ticket/14466
[ticket/14466] Add an event to cron.php
2016-05-28 09:59:47 +02:00
Marc Alexander
80db259ab9 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/phpbb/notification/manager.php
2016-05-27 22:13:35 +02:00
Marc Alexander
e30518461c Merge pull request #4332 from Senky/ticket/11446
[ticket/11446] Use sql_in_set properly in phpbb_notification_manager
2016-05-27 21:16:32 +02:00
Marc Alexander
9bea18b5db Merge pull request #4333 from markshawtoronto/ticket/14648
[ticket/14648] Fix bug where default notifications stop working if another setting is set.
2016-05-27 20:29:26 +02:00
Jakub Senko
10d96d4f33 [ticket/14429] Add core.modify_users_online_string_modify
PHPBB3-14429
2016-05-27 13:46:23 +02:00
Máté Bartus
be5ea21706 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14650] Semi-colon instead of slash to make Matt happy
  [ticket/14650] Move CONTRIBUTING.md and add pull request template
2016-05-27 13:28:47 +02:00
Máté Bartus
191b80a750 Merge pull request #4335 from marc1706/ticket/14650
[ticket/14650] Move CONTRIBUTING.md and add pull request template
2016-05-27 13:27:26 +02:00
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too
PHPBB3-11446
2016-05-27 12:59:30 +02:00
Marc Alexander
dcf90a8d8b [ticket/14650] Semi-colon instead of slash to make Matt happy
PHPBB3-14650
2016-05-26 18:46:34 +02:00
Marc Alexander
a8fb33218c [ticket/14650] Move CONTRIBUTING.md and add pull request template
PHPBB3-14650
2016-05-26 18:34:55 +02:00
Marc Alexander
e578450077 Merge pull request #4334 from rmcgirr83/ticket_14649
[ticket/14649] Add preview variable back to ucp_profile for event
2016-05-26 15:47:20 +02:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event
PHPBB3-14649
2016-05-26 06:26:14 -04:00
Mark Shaw
548357e14c [ticket/14648] Remove whitespace at the end of a line
PHPBB3-14648
2016-05-25 18:28:07 -04:00
Mark Shaw
2576993564 [ticket/14648] Fix bug where default notifications stop working if another setting is set.
When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work.

PHPBB3-14648
2016-05-25 14:30:04 -04:00
Crizzo
85fdff8230 [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html
PHPBB3-14620
2016-05-24 22:44:07 +02:00
Marc Alexander
3e88ea9c06 Merge pull request #4325 from DavidIQ/ticket/14591
[ticket/14591] Use the correct delimiter for MSSQL
2016-05-24 21:47:31 +02:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
PHPBB3-13978
2016-05-24 18:07:11 +02:00
Jakub Senko
7e6371ea8e [ticket/11446] Use sql_in_set properly in phpbb_notification_manager
PHPBB3-11446
2016-05-23 18:13:17 +02:00
Máté Bartus
283a039647 Merge pull request #4327 from paul999/ticket/14645
[ticket/14645] Language pack not reconised when using a symlink
2016-05-22 21:43:34 +02:00
Jakub Senko
c3fd07a5f0 [ticket/13865] Add id_ary, show_results to core.search_modify_param_before
PHPBB3-13865
2016-05-22 14:26:01 +02:00
Paul Sohier
1a68504174
[ticket/14645] Language pack not reconised when using a symlink
Symfony finder does not follow symlinks by default.
With this change it does, so a user is able to have the language pack outside
the phpBB directory, and linked with a symlink into phpBB/language/

PHPBB3-14645
2016-05-21 19:50:12 +02:00
Crizzo
3f1580263c [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docu
PHPBB3-14640
2016-05-18 22:18:15 +02:00
David Colón
3bafbc81ef [ticket/14591] Use the correct delimiter for MSSQL
PHPBB3-14591
2016-05-18 14:53:52 -04:00
Oliver Schramm
559325fbd6 [ticket/12230] Remove users from new users group when post limit is 0
PHPBB3-12230
2016-05-17 16:56:42 +02:00
Richard McGirr
0d7625c534 [ticket/13716] Remove extra br tag and correct missing closing a html tag
PHPBB3-13716
2016-05-16 18:01:55 -04:00
Richard McGirr
06507f9fa6 [ticket/14630] Change event name and fix capitalization
PHPBB3-14630
2016-05-16 17:57:26 -04:00
Jakub Senko
9ca3cd519a [ticket/14615] Fix HTML5 validation errors on avatar deletion
PHPBB3-14615
2016-05-16 22:21:31 +02:00
Marc Alexander
90cefcf0f4 Merge pull request #4315 from Nicofuma/ticket/14628
[ticket/14628] Supports translatable error messages in the CLI installer
2016-05-16 14:05:24 +02:00
Máté Bartus
7a28b7514a Merge pull request #4320 from marc1706/ticket/14624
[ticket/14624] Remove no longer existing event argumemt
2016-05-16 12:06:38 +02:00
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt
PHPBB3-14624
2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
2016-05-15 23:57:16 +02:00
Marc Alexander
e7262e2d39 Merge pull request #4314 from rmcgirr83/ticket_14624
[ticket/14624] Add event to ucp_profile in signature section
2016-05-15 23:52:37 +02:00
Tristan Darricau
40a00bd4e5
Merge pull request #4319 from derekheld/ticket/14595
[ticket/14595] Installer will now ask for a SMTP port as part of email setup.

* derekheld/ticket/14595:
  [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595
  [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595
2016-05-15 10:17:01 +02:00
Derek Held
9c34594bc3 [ticket/14595] Added smtp_port where places where smtp_host exists.
PHPBB3-14595
2016-05-14 09:19:26 -07:00
Derek Held
bf37cdf878 [ticket/14595] Added SMTP port to getConfigTreeBuilder
PHPBB3-14595
2016-05-14 07:57:55 -07:00
Crizzo
96973a7cec [ticket/14620] Changes 3.1 to 3.2 links in FAQ.html
PHPBB3-14620
2016-05-14 15:26:05 +02:00
Crizzo
42053efb51 [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues
PHPBB3-14620
2016-05-14 15:13:14 +02:00
Marc Alexander
961ffee684 Merge branch '3.1.x' into 3.2.x 2016-05-12 19:16:03 +02:00