mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 14:04:57 +02:00
Code Issues Releases Wiki Activity
27,702 Commits 18 Branches 192 Tags
Commit Graph

2790 Commits

Author SHA1 Message Date
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
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
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
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
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
lavigor
ef09b562db [ticket/13442] UTF-8 symbols for database host 
PHPBB3-13442
 2016-01-14 15:38:14 +03: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
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
Tristan Darricau
6594ef8b1e [ticket/14306] CS and correctly handle exception loop 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
7f8b6c02c6 [ticket/14306] Update the error message 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
761fa9da52 [ticket/14306] Doesn't try to build a "safe" container in the dev env 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Tristan Darricau
78349ed80f [ticket/14306] Automatically enable a safe mode when container building fails 
PHPBB3-14306
 2016-01-09 15:35:17 +01:00
Joas Schilling
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
Oliver Schramm
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +01:00
Marc Alexander
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version 
PHPBB3-14396
 2016-01-08 16:55:40 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2016-01-08 16:39:33 +01:00
Saeed Hubaishan
a339b9e84f [ticket/13180] Increase dateformat field size 
remove empty line as marc1706 guided

PHPBB3-13180
 2016-01-07 20:03:35 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size 
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
 2016-01-07 17:36:02 +01:00
Marc Alexander
ca04f61b8a Merge pull request #4000 from Elsensee/ticket/14250 
[ticket/14250] Review/bump dependencies
 2016-01-07 13:56:42 +01:00
Marc Alexander
3f44f36817 [ticket/13454] Add excessively removed code back 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables 
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables 
This is part 5 and there is more to come.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
38f3688217 [ticket/13454] Fix a few issues introduced by overdeleting stuff 
PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables 
Part 4

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables 
This is part 2 of the pr.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables 
This is the first part of the changes. More to come.

PHPBB3-13454
 2016-01-06 13:51:19 +01:00
Marc Alexander
ea6bcdff52 Merge branch '3.1.x' 2016-01-06 13:26:23 +01:00
Erwan Nader
59481da9da [ticket/14386] Use of sys_get_temp_dir() 
PHPBB3-14386
 2016-01-06 13:16:03 +01:00
Oliver Schramm
8ed59fb82a [ticket/14250] Change token_storage class to fit changed interface 
PHPBB3-14250
 2016-01-04 03:38:28 +01:00