mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-31 14:03:06 +02:00
Code Issues Releases Wiki Activity
28,593 Commits 18 Branches 191 Tags
Commit Graph

3046 Commits

Author SHA1 Message Date
JoshyPHP
13a756bfb7 [ticket/14700] Prevent an exception on duplicate smilies in text_formatter 
PHPBB3-14700
 2016-07-21 03:40:01 +02:00
Marc Alexander
486ffa85a2 Merge pull request #4344 from Senky/ticket2/14586 
[ticket/14586] Add OAuth1 support
 2016-07-20 20:25:01 +02:00
Marc Alexander
e7ce7ecbe7 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/config/feed.yml
	phpBB/feed.php
	phpBB/phpbb/feed/base.php
 2016-07-17 22:09:53 +02:00
Marc Alexander
befacabf7e Merge pull request #4365 from rxu/ticket/14688 
[ticket/14688] Add core events to the feeds
 2016-07-17 21:32:20 +02:00
rxu
3df9b2c8f8 [ticket/14688] Add core events to the feeds 
PHPBB3-14688
 2016-07-17 21:14:13 +07:00
Marc Alexander
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
Marc Alexander
e8454e018d Merge pull request #4378 from Crizz0/ticket/14704 
[ticket/14704] Removes unused function and language files in base.php
 2016-07-17 15:57:21 +02:00
Marc Alexander
44303aa425 Merge branch '3.1.x' into 3.2.x 2016-07-17 10:46:51 +02:00
Marc Alexander
63db42522b Merge pull request #4321 from Senky/ticket/14615 
[ticket/14615] Fix HTML5 validation errors on avatar deletion
 2016-07-17 10:46:44 +02:00
Marc Alexander
ebdef04f5d Merge pull request #4380 from JoshyPHP/ticket/14706 
[ticket/14706] Updated [list] BBCode to automatically create a list item
 2016-07-14 20:18:24 +02:00
Marc Alexander
61bca182f6 Merge branch '3.1.x' into 3.2.x 2016-07-14 20:11:51 +02:00
Marc Alexander
38082c41e3 Merge pull request #4347 from Senky/ticket/14631 
[ticket/14631] Load truncate_string() if needed
 2016-07-14 20:11:48 +02:00
Andreas Fischer
c1cb59c237 Merge pull request #4349 from marc1706/ticket/14665 
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration

* marc1706/ticket/14665:
  [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
 2016-07-10 20:06:43 +02:00
JoshyPHP
24da2db987 [ticket/14706] Updated [list] BBCode to automatically create a list item 
Fixes issues with missing list items. Produces valid HTML.

PHPBB3-14706
 2016-07-08 07:49:10 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-07 19:19:40 +02:00
Crizzo
53b9216c78 [ticket/14704] Removes unused function and language files in base.php 
PHPBB3-14704
 2016-07-03 14:22:08 +02:00
Tristan Darricau
7cbb049572
[prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Marc Alexander
cf2b96def7 Merge pull request #4346 from lavigor/ticket/14661 
[ticket/14661] Fix a typo in twig.php
 2016-06-08 20:47:14 +02:00
Marc Alexander
a9beed3ad0 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:32:28 +02:00
Marc Alexander
a90d8fa8d4 [ticket/14665] Remove invalid syntax in report_id_auto_increment migration 
PHPBB3-14665
 2016-06-08 08:38:55 +02:00
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager 
PHPBB3-14664
 2016-06-07 23:40:31 +03:00
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
Jakub Senko
33d1d19f97 [ticket/14586] Add OAuth1 support 
PHPBB3-14586
 2016-05-30 13:02:49 +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
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too 
PHPBB3-11446
 2016-05-27 12:59:30 +02: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
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
7e6371ea8e [ticket/11446] Use sql_in_set properly in phpbb_notification_manager 
PHPBB3-11446
 2016-05-23 18:13:17 +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
David Colón
3bafbc81ef [ticket/14591] Use the correct delimiter for MSSQL 
PHPBB3-14591
 2016-05-18 14:53:52 -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
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
Marc Alexander
961ffee684 Merge branch '3.1.x' into 3.2.x 2016-05-12 19:16:03 +02:00
Richard McGirr
03348087d8 [ticket/14610] Implement lavigor method 
PHPBB3-14610
 2016-05-09 17:28:55 -04:00
Richard McGirr
f57f09f814 [ticket/14610] Remove whitespace 
PHPBB3-14610
 2016-05-08 09:24:11 -04:00
Richard McGirr
3572f4c92e [ticket/14610] Don't log an error if the Q&A captcha has been solved 
https://tracker.phpbb.com/browse/PHPBB3-14610

PHPBB3-14610
 2016-05-08 08:50:06 -04:00
Tristan Darricau
1629e6aaf3
[ticket/14628] Supports translatable error messages in the CLI installer 
PHPBB3-14628
 2016-05-05 17:05:17 +02:00
Marc Alexander
6eda942a7f [ticket/14607] Add missing auto_increment to report_id 
PHPBB3-14607
 2016-05-01 17:29:10 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Marc Alexander
ead261e6db Merge pull request #4286 from VSEphpbb/ticket/14569 
[ticket/14569] Extract CLI progress bar creation to a method
 2016-04-23 23:04:05 +02:00
Joas Schilling
29bb1ab72d Merge branch '3.1.x' into 3.2.x 2016-04-16 12:50:31 +02:00
Joas Schilling
1b01667c7b [prep-release-3.1.9] Add migration for 3.1.9 2016-04-16 12:16:23 +02:00
Máté Bartus
4614cc972f [ticket/14589] Fix @var usage 
PHPBB3-14589
 2016-04-13 19:02:43 +02:00
Máté Bartus
4c257d47a6 Merge pull request #4236 from Nicofuma/ticket/13616 
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
 2016-04-13 10:11:24 +02:00
Matt Friedman
d713ce94ff [ticket/14569] Extract CLI progress bar creation to a method 
PHPBB3-14569
 2016-04-12 10:56:23 -07:00
Tristan Darricau
560bee1be4
Merge pull request #4284 from CHItA/ticket/14589 
[ticket/14589] Add error messages for failable installer requirements

* CHItA/ticket/14589:
  [ticket/14589] Fix grammatical errors in language strings
  [ticket/14589] Add error messages for failable installer requirements
 2016-04-12 11:27:03 +02:00