mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00
Code Issues Releases Wiki Activity
26,783 Commits 18 Branches 192 Tags
Commit Graph

2499 Commits

Author SHA1 Message Date
Tristan Darricau
23205ca0cc Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
 2015-09-09 11:01:03 +02:00
Tristan Darricau
1affd34814 Merge pull request #3890 from marc1706/ticket/13423 
[ticket/13423] Set busyTimeout on connect to prevent db locking

* marc1706/ticket/13423:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
 2015-09-09 11:00:44 +02:00
Tristan Darricau
dccc0877c1 Merge pull request #3891 from marc1706/ticket/14150 
[ticket/14150] Update fast-image-size to newest version

* marc1706/ticket/14150:
  [ticket/14150] Update fast-image-size to newest version
 2015-09-09 00:16:22 +02:00
Marc Alexander
9d18b3d1ee Merge branch '3.1.x' 2015-09-08 13:35:04 +02:00
Marc Alexander
90d5eefccf Merge pull request #3881 from VSEphpbb/ticket/14142 
[ticket/14142] Remove unused ignore_configs from avatar drivers
 2015-09-08 13:34:58 +02:00
Marc Alexander
58286171f1 [ticket/14150] Update fast-image-size to newest version 
PHPBB3-14150
 2015-09-08 12:59:55 +02:00
Marc Alexander
ea594d00f7 [ticket/13423] Set busyTimeout on connect to prevent db locking 
PHPBB3-13423
 2015-09-07 12:23:49 +02:00
Joas Schilling
fb3e9d9a77 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-09-05 15:20:38 +02:00
Joas Schilling
f201c22ca7 Merge branch 'prep-release-3.1.6' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-09-05 15:19:16 +02:00
Joas Schilling
5258fba2e0 [prep-release-3.1.6] Add migration for 3.1.6 2015-09-05 12:45:53 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers 
PHPBB3-14142
 2015-09-04 13:38:14 -07:00
Tristan Darricau
615ed729b5 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
 2015-09-02 12:45:34 +02:00
Tristan Darricau
5faa12db4c Merge pull request #3855 from VSEphpbb/ticket/14123 
[ticket/14123] Add descriptive help to the CLI help output

* VSEphpbb/ticket/14123:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
 2015-09-02 12:44:52 +02:00
Tristan Darricau
5d4c7f9952 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/11468] Allow controllers to set paramters of page_header()
 2015-09-02 11:51:16 +02:00
Tristan Darricau
2ee8b14f86 Merge pull request #3872 from Zoddo/ticket/11468 
[ticket/11468] Allow controllers to set paramters of page_header()

* Zoddo/ticket/11468:
  [ticket/11468] Allow controllers to set paramters of page_header()
 2015-09-02 11:50:35 +02:00
Tristan Darricau
5b8164a1bb Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
 2015-09-01 21:47:19 +02:00
Zoddo
cc060a2611 [ticket/11468] Allow controllers to set paramters of page_header() 
PHPBB3-11468
 2015-08-30 23:24:07 +02:00
Zoddo
af246483e2 [ticket/13950] Hide undefined categories 
This hides the categories added by disabled extensions

PHPBB3-13950
 2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e [ticket/13950] Hide undefined permissions 
This hides the permissions of the disabled extensions

PHPBB3-13950
 2015-08-28 18:43:59 +02:00
Tristan Darricau
214c5c6d0b Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
 2015-08-28 17:34:50 +02:00
Tristan Darricau
bfbce5a1b0 Merge pull request #3764 from Zoddo/ticket/13988 
[ticket/13988] Use absolute path for image attachments in feeds

* Zoddo/ticket/13988:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
 2015-08-28 17:05:09 +02:00
Matt Friedman
6c36f56b12 [ticket/14123] Remove redundant help messages 
PHPBB3-14123
 2015-08-28 07:49:07 -07:00
Máté Bartus
e91e525e8a Merge pull request #3858 from Nicofuma/ticket/14125 
[ticket/14125] Add --env option to all CLI commands
 2015-08-28 12:00:46 +02:00
Máté Bartus
e8219e8610 Merge pull request #3470 from Nicofuma/ticket/13645 
[ticket/13645] Move the feeds to controllers
 2015-08-28 10:39:07 +02:00
Tristan Darricau
7d41a9894a Merge pull request #3863 from VSEphpbb/ticket/14128 
[ticket/14128] Fix img bbcode regression, lost postimage class

* VSEphpbb/ticket/14128:
  [ticket/14128] Fix img bbcode regression, lost postimage class
 2015-08-27 22:55:37 +02:00
Matt Friedman
e19d446881 [ticket/14128] Fix img bbcode regression, lost postimage class 
PHPBB3-14128
 2015-08-26 14:08:59 -07:00
Tristan Darricau
c868582e44 [ticket/14125] Add --env option to all CLI commands 
PHPBB3-14125
 2015-08-24 18:07:37 +02:00
Tristan Darricau
c9ec16f614 [ticket/13645] Fix docblocks 
PHPBB3-13645
 2015-08-24 03:24:26 +02:00
Matt Friedman
13851f308f [ticket/14123] Add descriptive help to the CLI help output 
PHPBB3-14123
 2015-08-23 15:14:08 -07:00
n-aleha
afccb9cb49 [ticket/12505] Fix variable usage in migration file 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
1f16704d34 [ticket/12505] Add migration 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
Tristan Darricau
f6a4843c6d Merge pull request #3652 from Elsensee/ticket/12143 
[ticket/12143] Make it possible to use translated group names for non-special groups

* Elsensee/ticket/12143:
  [ticket/12143] Fix tests after rebase
  [ticket/12143] Avoid no output from get_group_name()
  [ticket/12143] Fix those tests
  [ticket/12143] Add some tests
  [ticket/12143] Oops, fixed array index
  [ticket/12143] Replace group name output
  [ticket/12143] Add group helper class to translate groupnames
  [ticket/12143] Add is_set method to language service
 2015-08-23 22:42:18 +02:00
Tristan Darricau
5df9a45473 [ticket/13645] Proper OOP for feeds 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Tristan Darricau
f56fe0ba8d Merge pull request #3842 from CHItA/ticket/14097 
[ticket/14097] Improve error and failure handling in the installer

* CHItA/ticket/14097:
  [ticket/14097] Remove auto refresh on install failure
  [ticket/14097] Improve error and failure handling in the installer
 2015-08-23 21:44:28 +02:00
Joas Schilling
05851e2b4b Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-08-23 18:27:30 +02:00
Joas Schilling
623a8f2d0f [prep-release-3.1.6] Add migration for 3.1.6-RC1 2015-08-23 16:54:43 +02:00
Joas Schilling
a7272fec97 Merge pull request #3829 from Nicofuma/ticket/14099 
[ticket/14099] Update Twig to 1.20.0
 2015-08-23 16:30:26 +02:00
Marc Alexander
f2edec90b0 Merge branch '3.1.x' 2015-08-22 10:37:53 +02:00
Marc Alexander
d8dd6bad6b Merge pull request #3834 from brunoais/ticket/14104 
[ticket/14104] Fix missing  variables from previous commit
 2015-08-22 10:37:48 +02:00
Mate Bartus
dd1b777ca7 [ticket/14097] Remove auto refresh on install failure 
PHPBB3-14097
 2015-08-21 18:03:36 +02:00
Marc Alexander
942705e6c6 Merge branch '3.1.x' 2015-08-20 15:48:18 +02:00
Marc Alexander
897b9f333b [ticket/14037] Minor coding style improvements to event 
PHPBB3-14037
 2015-08-20 10:14:07 +02:00
javiexin
cf0170d5e3 [ticket/14037] Allows adapting memberlist profile fields headline 
Adds an event to allow modifying the profile fields headline in line
with modifications to profile fields data.

PHPBB3-14037
 2015-08-20 10:12:59 +02:00
Andreas Fischer
0a5f7d2e51 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Andreas Fischer
ef3de412b7 Merge pull request #3848 from VSEphpbb/ticket/14116 
[ticket/14116] sql_affectedrows method has no arguments

* VSEphpbb/ticket/14116:
  [ticket/14116] sql_affectedrows method has no arguments
 2015-08-20 03:52:34 +02:00
Matt Friedman
50a7167c9a [ticket/14116] sql_affectedrows method has no arguments 
PHPBB3-14116
 2015-08-19 16:12:01 -07:00
Tristan Darricau
5f905f67ee [ticket/14099] Fix the assets 
PHPBB3-14099
 2015-08-18 21:03:03 +02:00
Mate Bartus
f4f0ff0eec [ticket/14097] Improve error and failure handling in the installer 
PHPBB3-14097
 2015-08-17 18:38:07 +02:00
brunoais
81b4293cc5 [ticket/14104] Fix missing variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13691

PHPBB3-14104
 2015-08-15 22:04:51 +01:00