1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Commit Graph

29578 Commits

Author SHA1 Message Date
Marc Alexander
3ae7a42ea1 Merge pull request #6067 from rxu/ticket/16604-master
[ticket/16604] Display warning messages on storage path setting issues
2020-10-24 15:42:59 +02:00
Marc Alexander
32224a9d5a Merge branch '3.3.x' 2020-10-24 10:42:00 +02:00
Marc Alexander
dd7a184926 [3.3.x] Update version numbers to 3.3.3-dev 2020-10-24 10:39:11 +02:00
Marc Alexander
840173a21e [prep-release-3.3.2] Update Changelog for 3.3.2-RC1 2020-10-19 21:20:20 +02:00
Marc Alexander
66e9832f5e [prep-release-3.3.2] Add migration for 3.3.2-RC1 2020-10-19 20:48:53 +02:00
Marc Alexander
67ad602041 [prep-release-3.3.2] Update version numbers to 3.3.2 2020-10-18 13:54:44 +02:00
Marc Alexander
7716961f07 [prep-release-3.3.2] Update version number to 3.3.2-RC1 2020-10-18 13:54:02 +02:00
Marc Alexander
6876559ceb [prep-release-3.3.2] Add 2020 to CREDITS.txt 2020-10-18 13:53:00 +02:00
rxu
473bb417a2 [ticket/16604] Optimize code and avoid code duplication
PHPBB3-16604
2020-10-18 15:56:13 +07:00
rxu
43805f4eaa [ticket/16604] Only apply checks to the local storage provider
PHPBB3-16604
2020-10-18 00:07:56 +07:00
rxu
3ba7a7a30e [ticket/16604] Display warning messages on storage path setting issues
PHPBB3-16604
2020-10-17 22:56:11 +07:00
Marc Alexander
a29d7d51ea Merge pull request #6063 from marc1706/ticket/16616-master
[ticket/16616] Update composer dependencies to latest versions
2020-10-17 17:00:18 +02:00
Marc Alexander
16d8698e1b Merge pull request #6062 from marc1706/ticket/16616
[ticket/16616] Update composer dependencies to latest versions
2020-10-17 16:59:39 +02:00
Marc Alexander
912549029c Merge branch 'ticket/16616' into ticket/16616-master 2020-10-17 11:04:24 +02:00
Marc Alexander
dc40572312 [ticket/16616] Do not use latest polyfill-intl-idn
It has a declaration conflict with patchwork/utf8.

PHPBB3-16616
2020-10-17 10:57:42 +02:00
Marc Alexander
7acf4f4030 Merge branch '3.3.x' 2020-10-14 21:21:42 +02:00
Marc Alexander
3c014ccb2b Merge pull request #6058 from Crizz0/ticket/16612
[ticket/16612] Restructure HTML of Terms PP COPPA
2020-10-14 21:21:19 +02:00
Christian Schnegelberger
bd22a92d68 [ticket/16612] Add <br> to ToU and PP
PHPBB3-16612
2020-10-13 20:00:29 +02:00
Christian Schnegelberger
40c2fa7e5e [ticket/16612] Remove html from lang key instead of 1 br per paragraph
PHPBB3-16612
2020-10-13 19:20:48 +02:00
Christian Schnegelberger
604b3f49b7 [ticket/16612] Change class names from agreement text
PHPBB3-16612
2020-10-09 19:13:24 +02:00
Marc Alexander
0ba01ce638 [ticket/16616] Update latest versions on master
PHPBB3-16616
2020-10-08 21:47:26 +02:00
Marc Alexander
d09927b823 Merge branch 'ticket/16616' into ticket/16616-master 2020-10-08 21:46:44 +02:00
Marc Alexander
f6cbc7e80b [ticket/16616] Update composer dependencies to latest versions
PHPBB3-16616
2020-10-08 21:38:03 +02:00
Marc Alexander
e54a2ae91d Merge pull request #6060 from marc1706/ticket/16604
[ticket/16604] Remove checks for avatar upload path in avatar settings
2020-10-08 21:27:43 +02:00
Marc Alexander
63e0b1b2f3 Merge branch '3.3.x' 2020-10-08 21:26:20 +02:00
Marc Alexander
0417599344 Merge pull request #6002 from rxu/ticket/16512
[ticket/16512] Fix make_clickable() to make use of custom link classes
2020-10-08 21:26:10 +02:00
Marc Alexander
f29eebc629 Merge branch '3.3.x' 2020-10-08 21:19:09 +02:00
Marc Alexander
c694e86422 Merge pull request #6054 from senky/ticket/16593
[ticket/16593] Define params in the constructor
2020-10-08 21:18:47 +02:00
Marc Alexander
5d063429f3 [ticket/16604] Remove checks for avatar upload path in avatar settings
This is unfortunately no longer possible to do on master.

PHPBB3-16604
2020-10-08 20:38:27 +02:00
Christian Schnegelberger
794ad66896 [ticket/16612] Get back to <br> and add <p> for coppa in template
PHPBB3-16612
2020-10-08 09:07:26 +02:00
Marc Alexander
6f6ee8ca24 Merge branch '3.3.x' 2020-10-07 21:31:26 +02:00
Marc Alexander
857cec0509 Merge pull request #6053 from senky/ticket/16562
[ticket/16562] Add password requirements to reset
2020-10-07 21:30:55 +02:00
Christian Schnegelberger
d3472cd4a1 [ticket/16612] Use px instead of em for css properties
PHPBB3-16612
2020-10-07 19:23:51 +02:00
rxu
d6078821c5 [ticket/16512] Minor code adjustments
PHPBB3-16512
2020-10-06 07:31:29 +07:00
Marc Alexander
b8f7b53386 Merge branch '3.3.x' 2020-10-05 18:12:42 +02:00
Marc Alexander
1f98477c22 Merge pull request #6049 from rxu/ticket/16604
[ticket/16604] Display warning messages on avatar upload setting issues
2020-10-05 18:12:38 +02:00
Marc Alexander
19080b2d08 Merge branch '3.3.x' 2020-10-05 18:08:53 +02:00
Marc Alexander
c8351d6d20 Merge pull request #6051 from rxu/ticket/16605
[ticket/16605] Fix possible SQL error on user registration
2020-10-05 18:08:48 +02:00
Marc Alexander
4897c3ccc4 Merge branch '3.3.x' 2020-10-04 21:15:47 +02:00
Marc Alexander
54eef1153f Merge pull request #6055 from senky/ticket/16532
[ticket/16532] Store example post in XML
2020-10-04 21:15:42 +02:00
Marc Alexander
6fe6fd6804 Merge branch '3.3.x' 2020-10-04 21:11:53 +02:00
Christian Schnegelberger
14d96d0086 [ticket/16612] Restructure HTML of Terms PP COPPA
PHPBB3-16612
2020-10-03 23:36:16 +02:00
Matt Friedman
52217bd4e4 [ticket/16608] Cosmic Logo
PHPBB3-16608
2020-10-02 00:15:22 -07:00
Matt Friedman
dfdb92d3ab [ticket/16608] Update images again
PHPBB3-16608
2020-10-02 00:00:13 -07:00
Matt Friedman
358a5d8b46 [ticket/16608] Adjust the blueness of the logo
PHPBB3-16608
2020-10-01 23:36:25 -07:00
Matt Friedman
dcfddb8445 [ticket/16608] Modernize readme
PHPBB3-16608
2020-10-01 17:57:12 -07:00
Jakub Senko
fa14375a65 [ticket/16562] Add password requirements to reset
Credits to thecoalman:
https://www.phpbb.com/community/viewtopic.php?p=15560491#p15560491

PHPBB3-16562
2020-09-30 13:35:15 +02:00
Jakub Senko
b494e6b043 [ticket/16593] Define params in the constructor
PHPBB3-16593
2020-09-30 13:17:16 +02:00
rxu
00849941c3 [ticket/16605] Fix possible SQL error on user registration
mysqli_insert_id() returns 0 if there was no previous query on the connection
or if the query did not update an AUTO_INCREMENT value for some reason.

PHPBB3-16605
2020-09-29 21:10:06 +07:00
rxu
36554f3ce8 [ticket/16604] Adjust code logic
PHPBB3-16604
2020-09-25 22:08:18 +07:00