mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-07 17:33:32 +02:00
Code Issues Releases Wiki Activity
30,710 Commits 18 Branches 192 Tags
Commit Graph

30710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hanakin
ae7d5f1207 [ticket/14131] Fix prefixing 
PHPBB3-14131
 2017-09-09 14:13:42 +02:00
hanakin
cd0a2a7e63 [ticket/14131] Re-color everything consistently 
PHPBB3-14131
 2017-09-09 14:13:42 +02:00
Tristan Darricau
870ced94eb
Merge pull request #4939 from CHItA/ticket/15351 
[ticket/15351] Fix missing global usage

* github.com:phpbb/phpbb:
  [ticket/15351] Fix missing global usage
 2017-09-09 13:19:56 +02:00
Máté Bartus
bd7cdd2e25 [ticket/15351] Fix missing global usage 
PHPBB3-15351
 2017-09-09 12:58:05 +02:00
Máté Bartus
dababbb9ad Merge branch '3.2.x' 2017-09-09 12:09:50 +02:00
Máté Bartus
c265eab081 Merge pull request #4932 from Nicofuma/ticket/15351 
[ticket/15351] Makes confirm_works in a router context (app.php)
 2017-09-09 12:07:52 +02:00
Tristan Darricau
c368d170cf
[ticket/15351] Makes confirm_works in a router context (app.php) 
PHPBB3-15351
 2017-09-08 16:26:39 +02:00
Marc Alexander
ad24ecae11 Merge pull request #4937 from rubencm/ticket/15330 
[ticket/15330] Twig function to know if a language string is defined
 2017-09-08 16:16:44 +02:00
Oliver Schramm
7a32f79752 Merge branch '3.2.x' 2017-09-08 16:06:52 +02:00
Oliver Schramm
16da17a4ba Merge branch '3.1.x' into 3.2.x 2017-09-08 16:06:47 +02:00
Oliver Schramm
93621aa184 Merge pull request #4929 from marc1706/ticket/15347 
[ticket/15347] Use single quotes in update hashes query
 2017-09-08 16:06:46 +02:00
Oliver Schramm
da1f2fb9a9 Merge branch '3.2.x' 2017-09-08 15:02:26 +02:00
Oliver Schramm
b75a9dcbe3 Merge pull request #4936 from marc1706/ticket/7845 
[ticket/7845] Ensure config script path is not empty
 2017-09-08 15:02:25 +02:00
Rubén Calvo
c87b94133c [ticket/15330] Fix typo 
PHPBB3-15330
 2017-09-08 14:39:04 +02:00
Oliver Schramm
92f4cb442b Merge branch '3.2.x' 2017-09-08 14:22:17 +02:00
Oliver Schramm
1095a67a1b Merge pull request #4934 from marc1706/ticket/7488 
[ticket/7488] Display no forums message if user can't see forums of category
 2017-09-08 14:22:17 +02:00
Oliver Schramm
aa15e61e4c Merge branch '3.2.x' 2017-09-08 13:53:38 +02:00
Oliver Schramm
65692e8785 Merge pull request #4935 from JimMH/patch-4 
[ticket/15352] Descriptions are not used in categories
 2017-09-08 13:53:17 +02:00
Jim Mossing Holsteyn
563fc6ed6c [ticket/15352] Descriptions are not using in categories 
PHPBB3-15352
 2017-09-08 13:50:42 +02:00
Tristan Darricau
9b2c45d892
Merge pull request #4894 from rubencm/ticket/15276 
[ticket/15276] Use storage in avatars

* github.com:phpbb/phpbb: (34 commits)
  [ticket/15276] Changed annotation
  [ticket/15276] Remove unused code
  [ticket/15276] Revert some changes
  [ticket/15276] Use IniGetWrapper
  [ticket/15276] Add missing dependency
  [ticket/15276] Remove unused dependency
  [ticket/15276] Add missing properties
  [ticket/15276] Use InitGetWrapper
  [ticket/15276] Fix comments
  [ticket/15276] Fix code and add phpdoc
  [ticket/15276] Use stream_copy_to_stream
  [ticket/15276] Fix typo
  [ticket/15276] Use mimetype guesser
  [ticket/15276] Update file_info to get size of images
  [ticket/15276] Update
  [ticket/15276] Remove avatar_path
  [ticket/15276] Remove avatar_path from acp
  [ticket/15276] Use finfo to get mimetype
  [ticket/15276] Update file_info
  [ticket/15276] Fix code style
  ...
 2017-09-08 13:32:38 +02:00
Rubén Calvo
21f3c53882 [ticket/15330] Twig function to know if a language string is defined 
PHPBB3-15330
 2017-09-08 11:56:20 +02:00
Marc Alexander
654c2370ea
[ticket/7845] Ensure config script path is not empty 
PHPBB3-7845
 2017-09-08 11:54:42 +02:00
Marc Alexander
339ec5bded
[ticket/7488] Display no forums message if user can't see forums of category 
PHPBB3-7488
 2017-09-08 11:42:50 +02:00
Marc Alexander
7e4498dfb5
[ticket/15347] Fix query quotes in update hashes cli command 
PHPBB3-15347
 2017-09-08 10:54:58 +02:00
Rubén Calvo
443c5034ce [ticket/15276] Changed annotation 
PHPBB3-15276
 2017-09-07 16:44:01 +02:00
Marc Alexander
38cbdb6768
[ticket/15347] Use single quotes in update hashes query 
PHPBB3-15347
 2017-09-07 16:27:49 +02:00
Tristan Darricau
7221a47bb6
Merge pull request #4928 from Crizz0/ticket/15350 
[ticket/15350] Changes outdated wiki-link for plural-rules to new docs/

* github.com:phpbb/phpbb:
  [ticket/15350] Changes outdated wiki-link to new docs/
 2017-09-07 15:17:57 +02:00
Rubén Calvo
a8ba4a99e3 [ticket/15276] Remove unused code 
PHPBB3-15276
 2017-09-07 15:10:52 +02:00
Máté Bartus
114f38648b Merge pull request #4900 from rxu/ticket/15318 
[ticket/15318] Make user option to disable word censoring effective again
 2017-09-07 15:09:48 +02:00
Máté Bartus
b1fe0f9dbe Merge branch '3.2.x' 2017-09-07 15:09:40 +02:00
Máté Bartus
f6166225cf Merge pull request #4902 from MoleDJ/patch-1 
[ticket/15320] 	Redis cache does not save keys withouth expiration
 2017-09-07 15:09:08 +02:00
Máté Bartus
da357f80f8 Merge pull request #4903 from rxu/ticket/15323 
[ticket/15323] Allow Twig syntax in bbcode.html
 2017-09-07 15:08:12 +02:00
Máté Bartus
2c56beee33 Merge pull request #4890 from hanakin/ticket/15308 
[ticket/15308] Remove !important from pagination css class
 2017-09-07 15:07:26 +02:00
Crizzo
4dfd12d5b2 [ticket/15350] Changes outdated wiki-link to new docs/ 
PHPBB3-15350
 2017-09-07 15:05:53 +02:00
Tristan Darricau
d7005b816c
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15262] Update the font-weight of buttons
 2017-09-07 15:01:00 +02:00
Rubén Calvo
ed282199ac [ticket/15276] Revert some changes 
PHPBB3-15276
 2017-09-07 14:59:55 +02:00
Tristan Darricau
9af394eff3
Merge pull request #4920 from hanakin/ticket/15262 
[ticket/15262] Update button font-weight

* github.com:phpbb/phpbb:
  [ticket/15262] Update the font-weight of buttons
 2017-09-07 14:59:55 +02:00
Tristan Darricau
4bed192958
Merge pull request #4921 from hanakin/ticket/15343 
[ticket/15343] Fix forum row inner list

* github.com:phpbb/phpbb:
  [ticket/15343] make blocks
  [ticket/15343] Fix forum row inner list
 2017-09-07 14:58:26 +02:00
Rubén Calvo
9fcf30d504 [ticket/15276] Use IniGetWrapper 
PHPBB3-15276
 2017-09-07 14:50:55 +02:00
Tristan Darricau
51693764f9
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15309] Add margin to pagination
  [ticket/15309] Right-align responsive pagination for consistency
  [ticket/15309] Fix pagination overlap
 2017-09-07 14:46:12 +02:00
Tristan Darricau
c52bb42dcf
Merge pull request #4919 from sdschulze/ticket/15309 
[ticket/15309] Fix pagination overlap in prosilver via "left-box"

* github.com:phpbb/phpbb:
  [ticket/15309] Add margin to pagination
  [ticket/15309] Right-align responsive pagination for consistency
  [ticket/15309] Fix pagination overlap
 2017-09-07 14:44:21 +02:00
Tristan Darricau
1521def486
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15333] Call callback when confirm dialog is canceled
 2017-09-07 14:41:49 +02:00
Tristan Darricau
1ee4968a01
Merge pull request #4913 from kasimi/ticket/15333 
[ticket/15333] Call callback when confirm dialog is canceled

* github.com:phpbb/phpbb:
  [ticket/15333] Call callback when confirm dialog is canceled
 2017-09-07 14:41:49 +02:00
Máté Bartus
0755ae423b Merge pull request #4905 from rxu/ticket/15324 
[ticket/15324] Add more core and template events
 2017-09-07 14:39:39 +02:00
Máté Bartus
049971d31d Merge branch '3.2.x' 2017-09-07 14:39:03 +02:00
Máté Bartus
908b1c9bc9 Merge pull request #4906 from rxu/ticket/15327 
[ticket/15327] Add post anchor to the log postlink
 2017-09-07 14:37:51 +02:00
Tristan Darricau
b2be15e46e
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15332] Don't remove dark background if fadedark is false
 2017-09-07 14:36:09 +02:00
Tristan Darricau
f3b5862468
Merge pull request #4912 from kasimi/ticket/15332 
[ticket/15332] Don't remove dark background if fadedark is false

* github.com:phpbb/phpbb:
  [ticket/15332] Don't remove dark background if fadedark is false
 2017-09-07 14:36:09 +02:00
Máté Bartus
6211b69a6f Merge branch '3.2.x' 2017-09-07 14:32:51 +02:00
Máté Bartus
6c13ca7a19 Merge pull request #4908 from hubaishan/ticket/15317 
[ticket/15317] Fix phpbbcli language
 2017-09-07 14:32:27 +02:00