mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity
28,396 Commits 18 Branches 192 Tags
Commit Graph

3024 Commits

Author SHA1 Message Date
Tristan Darricau
7cbb049572
[prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Marc Alexander
a9beed3ad0 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:32:28 +02:00
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager 
PHPBB3-14664
 2016-06-07 23:40:31 +03: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
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
Máté Bartus
f41c7bd2b1 [ticket/14590] Prevent refresh requests after the last tasks in modules 
PHPBB3-14590
 2016-04-11 18:18:09 +02:00
Máté Bartus
9163cc2864 [ticket/14589] Add error messages for failable installer requirements 
PHPBB3-14589
 2016-04-10 10:30:15 +02:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
5ee6c216e5 [prep-release-3.1.9] Add migration for 3.1.9-RC1 2016-04-09 08:13:31 +02:00
Marc Alexander
901f36e982 Merge pull request #4258 from Nicofuma/ticket/13683-3.2.x 
[ticket/13683] Respects force_server_vars settings when generating URLs
 2016-04-07 21:59:36 +02:00
Marc Alexander
9ad5c577f5 Merge pull request #4256 from Nicofuma/ticket/13683 
[ticket/13683] Respects force_server_vars settings when generating URLs
 2016-04-07 21:59:26 +02:00
Tristan Darricau
7bf8006b67 [ticket/14198] Use the build option to calculate the container cache filename 
PHPBB3-14198
 2016-04-04 21:32:46 +02:00
Tristan Darricau
f929db6190 Merge pull request #4248 from VSEphpbb/ticket/14561 
[ticket/14561] Add more user commands

* VSEphpbb/ticket/14561:
  [ticket/14561] Remove requires for functions in tests
  [ticket/14561] Small change to progress bar output
  [ticket/14561] Fix function docblock in activate command
  [ticket/14561] Add a progress bar to reclean command
  [ticket/14561] Use the user loader where appropriate
  [ticket/14561] Add extra help explaining reclean command
  [ticket/14561] Import classes with use statements
  [ticket/14561] Remove unused use statements
  [ticket/14561] Refactor tests
  [ticket/14561] Reclean usernames command
  [ticket/14561] User activate command
  [ticket/14561] User delete command
 2016-04-03 16:32:25 +02:00
Tristan Darricau
02469d4691 Merge branch 'ticket/13683' into ticket/13683-3.2.x 
* ticket/13683:
  [ticket/13683] Fix CS
 2016-04-03 16:27:08 +02:00
Tristan Darricau
d747ac146e [ticket/13683] Fix CS 
PHPBB3-13683
 2016-04-03 16:25:54 +02:00
Tristan Darricau
5754cbfec4 [ticket/13616] Fix CS + constant in the core extension 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
6d2acb5ba3 [ticket/13616] Fix UI tests 
PHPBB3-13616
 2016-04-03 16:23:16 +02:00
Tristan Darricau
5cdbef860d [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer 
PHPBB3-13616
 2016-04-03 16:22:07 +02:00
Tristan Darricau
e8762ce3cb Merge pull request #4266 from marc1706/ticket/13502 
[ticket/13502] Handle callable functions/objects in controller resolver

* marc1706/ticket/13502:
  [ticket/13502] Also cover passing object to resolver in tests
  [ticket/13502] Test getArguments() method of controller resolver
  [ticket/13502] Fix coding style
  [ticket/13502] Controller resolver should handle callable functions and objects
 2016-04-03 16:04:59 +02:00
Tristan Darricau
8769e765a2 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14532] Do not escape column default in mssql
 2016-04-03 16:02:50 +02:00
Marc Alexander
2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x 
Conflicts:
	phpBB/includes/acp/acp_modules.php
 2016-04-02 09:51:37 +02:00
Marc Alexander
3f4cf72872 [ticket/13502] Fix coding style 
PHPBB3-13502
 2016-04-01 21:33:14 +02:00
RFD
ada90d3b0a [ticket/13502] Controller resolver should handle callable functions and objects 
PHPBB3-13502
 2016-04-01 21:33:14 +02:00
Matt Friedman
2b90591a31 [ticket/14561] Small change to progress bar output 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
e81bf76dea [ticket/14561] Fix function docblock in activate command 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
afb69d7cd2 [ticket/14561] Add a progress bar to reclean command 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00
Matt Friedman
4b789c0418 [ticket/14561] Use the user loader where appropriate 
PHPBB3-14561
 2016-03-31 15:07:59 -07:00