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

29159 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard McGirr
8d8f5783c6 [ticket/14416] footer nav links have incorrect tooltip styling applied 
PHPBB3-14416
 2016-01-17 07:03:21 -05: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
f34df97f8b Merge pull request #4125 from lavigor/ticket/14412 
[ticket/14412] Comment fixes for PHPDoc in the events
 2016-01-16 23:10:37 +01:00
Richard McGirr
9b51fe2dd5 [ticket/14289] Move append before prepend in events doc 
PHPBB3-14289
 2016-01-16 09:21:07 -05:00
Marc Alexander
b908524853 [ticket/13733] Update comment explaining migration class validation 
PHPBB3-13733
 2016-01-15 18:34:12 +01:00
Marc Alexander
0178c27092 Merge pull request #3626 from imkingdavid/ticket/13733 
[ticket/13733] Allow non-migration files inside migrations folder
 2016-01-15 18:31:27 +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
254291b644 Merge pull request #4123 from lavigor/ticket/13442 
[ticket/13442] UTF-8 symbols for database host
 2016-01-15 11:11:44 +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
Marc Alexander
f979d2c7b2 Merge pull request #4119 from Zoddo/ticket/14407 
[ticket/14407] Fix removing users from Newly Registered Users group
 2016-01-13 09:27:31 +01:00
Zoddo
fff6907a22 [ticket/14407] Fix removing users from Newly Registered Users group 
PHPBB3-14407
 2016-01-13 08:28:30 +01:00
Marc Alexander
549e91354d Merge pull request #4118 from JoshyPHP/ticket/14405 
[ticket/14405] Force a lookahead check on [URL] BBCodes
 2016-01-12 17:32:14 +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
Richard McGirr
469b975f94 [ticket/14289] Change to 3.1.8-RC1 and rename event 
PHPBB3-14289
 2016-01-10 07:17:43 -05: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
81cbabc1f6 Merge branch '3.1.x' 2016-01-09 16:30:43 +01:00
Marc Alexander
a86a6926ee Merge pull request #4098 from Nicofuma/ticket/14382-master 
[ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 16:30:42 +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
c1eb721650 Merge branch 'ticket/14382' into ticket/14382-master 
* ticket/14382:
  [ticket/14382] Specify the branch-alias in the composer.json files
 2016-01-09 15:39:26 +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