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

23530 commits

Author SHA1 Message Date
Tristan Darricau
e91b1fa464 [ticket/13717] Fix tests 
PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Tristan Darricau
52b3d54805 [ticket/13717] Set the assets after rendering the whole template 
The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717
 2016-01-25 00:31:45 +01:00
Tristan Darricau
d8af5ac4f9 Merge pull request #4140 from Crizz0/ticket/14418 
[ticket/14418] Wrong language variable in viewtopic_topic_tools.html …

* Crizz0/ticket/14418:
  [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
 2016-01-24 18:35:04 +01:00
Tristan Darricau
49e4c11bad Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14411] Permanently delete post if delete_permanent is set
 2016-01-24 18:16:16 +01:00
Tristan Darricau
3566bb9e44 Merge pull request #4124 from marc1706/ticket/14411 
[ticket/14411] Permanently delete post if delete_permanent is set

* marc1706/ticket/14411:
  [ticket/14411] Permanently delete post if delete_permanent is set
 2016-01-24 18:16:00 +01:00
Crizzo
ca9560fc7a [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed 
In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it
had to be changed to L_TOPIC_TOOLS to display the right title in the
moderation wrench in viewtopic.php

PHPBB3-14418
 2016-01-24 12:10:03 +01:00
Marc Alexander
911ba68895 Merge pull request #4132 from VSEphpbb/ticket/14420 
[ticket/14420] Fix up search results topic lists
 2016-01-24 11:10:30 +01:00
Marc Alexander
e28a5da457 Merge branch '3.1.x' 2016-01-23 12:04:43 +01:00
Richard McGirr
b74dc1fa95 [ticket/14427] Memberlist displays inaccruate information 
PHPBB3-14427
 2016-01-22 06:03:42 -05:00
Marc Alexander
10756f3f87 Merge branch '3.1.x' 2016-01-21 17:37:15 +01:00
lavigor
5832698f4f [ticket/14423] Display database size for Aria storage engine 
PHPBB3-14423
 2016-01-20 21:34:30 +03:00
Matt Friedman
98467d2ea5 [ticket/14420] Fix up search results topic lists 
PHPBB3-14420
 2016-01-18 17:55:31 -08:00
Tristan Darricau
77d033f99e Merge pull request #4116 from marc1706/ticket/14402 
[ticket/14402] Tidy plupload cron should not rely on user id/ip being available

* marc1706/ticket/14402:
  [ticket/14402] Directly pass user id and ip
  [ticket/14402] Get rid of globals in tidy_plupload cron
  [ticket/14402] Do not expect user id and ip to be available in cron
 2016-01-18 23:46:22 +01:00
Tristan Darricau
39c9baa574 Merge pull request #4121 from marc1706/ticket/11875 
[ticket/11875] Use 4-byte integer instead of 3-byte integer for ID columns

* marc1706/ticket/11875:
  [ticket/11875] Add back new line
  [ticket/11875] Change more columns to use UINT and add missings ones
  [ticket/11875] Add migration file
  [ticket/11875] Recreate schemas for install
  [ticket/11875] Create new map for UNSIGNED 4-byte integer
  [ticket/11875] Upgrade default data type from MEDIUMINT to INT
 2016-01-18 23:29:41 +01:00
Marc Alexander
6e465c01bf [ticket/14419] Update composer dependencies and lock file 
PHPBB3-14419
 2016-01-18 21:39:51 +01:00
Marc Alexander
a30ecb81f8 Merge branch '3.1.x' 2016-01-17 23:28:33 +01:00
Marc Alexander
0c34641abd Merge pull request #3718 from javiexin/ticket/13908 
[ticket/13908] "After" clause in migration not working
 2016-01-17 23:28:29 +01:00
Marc Alexander
a98f12d1fc Merge branch '3.1.x' 2016-01-16 23:18:13 +01:00
Marc Alexander
12a10de0d1 Merge pull request #4122 from lavigor/ticket/12441 
[ticket/12441] Correct database size detection in MariaDB 10
 2016-01-16 23:18:13 +01:00
Marc Alexander
8e5b5a5c07 Merge branch '3.1.x' 2016-01-16 23:10:37 +01:00
Marc Alexander
8e584dfa6b Merge pull request #4077 from Nicofuma/ticket/14306 
[ticket/14306] Automatically enable a safe mode when container building fails
 2016-01-15 18:13:34 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events 
PHPBB3-14412
 2016-01-15 14:07:50 +03:00
Marc Alexander
6710ea3947 [ticket/14402] Directly pass user id and ip 
PHPBB3-14402
 2016-01-15 11:22:13 +01:00
Marc Alexander
3a555d94af [ticket/14402] Get rid of globals in tidy_plupload cron 
PHPBB3-14402
 2016-01-15 11:21:08 +01:00
Marc Alexander
3a82ace3eb [ticket/14402] Do not expect user id and ip to be available in cron 
PHPBB3-14402
 2016-01-15 11:21:07 +01:00
Marc Alexander
97e002cc3d Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/log/log.php
 2016-01-15 11:18:13 +01:00
Marc Alexander
295a424fc7 Merge pull request #4117 from Elsensee/ticket/14403 
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
 2016-01-15 11:15:56 +01:00
Marc Alexander
15157eed61 [ticket/14411] Permanently delete post if delete_permanent is set 
PHPBB3-14411
 2016-01-14 23:15:36 +01:00
Oliver Schramm
d045822cd8 [ticket/14403] Set a default user id and ip in CLI 
PHPBB3-14403
 2016-01-14 20:31:54 +01:00
lavigor
ef09b562db [ticket/13442] UTF-8 symbols for database host 
PHPBB3-13442
 2016-01-14 15:38:14 +03:00
lavigor
b34dbc2e84 [ticket/12441] Correct database size detection in MariaDB 10 
PHPBB3-12441
 2016-01-14 12:29:17 +03:00
Marc Alexander
a94c20faa2 [ticket/11875] Add back new line 
PHPBB3-11875
 2016-01-13 19:36:20 +01:00
Marc Alexander
7cd7bb3c01 [ticket/11875] Change more columns to use UINT and add missings ones 
PHPBB3-11875
 2016-01-13 19:35:04 +01:00
Marc Alexander
31607771e1 [ticket/11875] Add migration file 
PHPBB3-11875
 2016-01-13 17:02:42 +01:00
Marc Alexander
192a5f19f4 Merge pull request #2064 from hjpotter92/ticket/11875 
[ticket/11875] Set default data type from MEDIUMINT (3byte) to INT(10) (4byte)

Conflicts:
	phpBB/includes/db/schema_data.php
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/phpbb/db/tools/tools.php
 2016-01-13 13:21:08 +01:00
Marc Alexander
08647781c0 Merge pull request #4059 from JoshyPHP/ticket/14323 
[ticket/14323] Added support for truncating long URLs
 2016-01-13 12:55:31 +01:00
Marc Alexander
d55a8a8cee Merge branch '3.1.x' 2016-01-13 09:27:35 +01:00
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group 
PHPBB3-14407
 2016-01-13 08:28:30 +01:00
JoshyPHP
e4dae8ed4b [ticket/14405] Force a lookahead check on [URL] BBCodes 
PHPBB3-14405
 2016-01-12 11:54:20 +01:00
Marc Alexander
68d945e931 Merge branch '3.1.x' 2016-01-12 04:31:15 +01:00
Marc Alexander
826d6aac74 Merge pull request #3929 from kilianr/ticket/12618 
[ticket/12618] Allow extension author to use SSL for version-check.
 2016-01-12 04:11:56 +01:00
Kilian
ad34b87824 [ticket/12618] Change ssl:// to tls:// 
PHPBB3-12618
 2016-01-10 19:33:45 +01:00
Oliver Schramm
0cc41b94b1 [ticket/14403] Don't expect user_id and user_ip in phpbb\log 
PHPBB3-14403
 2016-01-10 17:43:10 +01:00
Joas Schilling
7f7b09fdeb Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
 2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2016-01-09 18:42:07 +01:00
Tristan Darricau
1e0340b0cf [ticket/14306] Improves Error display 
PHPBB3-14306
 2016-01-09 18:03:21 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Marc Alexander
d64680983a Merge pull request #4097 from Nicofuma/ticket/14382 
[ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 16:30:11 +01:00
Tristan Darricau
e8a4526f4a [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:42:42 +01:00
Tristan Darricau
3f40a89864 [ticket/14382] Specify the branch-alias in the composer.json files 
PHPBB3-14382
 2016-01-09 15:36:43 +01:00