Commit graph

29790 commits

Author SHA1 Message Date
Marc Alexander
7c59f084a6
Merge pull request #3937 from hanakin/ticket/14204
[ticket/14204]Fix form buttons to use consistent button codebase
2017-03-18 14:35:38 +01:00
Oliver Schramm
b4478676b5 Merge pull request #4731 from Rishabh04-02/ticket/15120
[ticket/15120] Semicolon missing
2017-03-11 01:03:56 +01:00
Rishabh04-02
e077bd70a4
[ticket/15120] Semicolon missing
PHPBB3-15120
2017-03-10 11:00:46 +05:30
Marc Alexander
1eb364b8d3
Merge pull request #4627 from hanakin/ticket/14981
[ticket/14981] Update nomalize.css to v5.0
2017-03-09 22:22:03 +01:00
Marc Alexander
f7a58e0a6a
Merge branch '3.2.x' 2017-03-09 22:11:59 +01:00
Marc Alexander
5d597787eb
Merge pull request #4729 from vinny/ticket/15118
[ticket/15118] Fix html error in jumpbox.html
2017-03-09 22:11:55 +01:00
Vinny
6071a5b8aa [ticket/15118] Fix html error in jumpbox.html
PHPBB3-15118
2017-03-09 14:34:42 -03:00
Marc Alexander
a96f55ec15
Merge branch 'ticket/14970' 2017-03-08 21:45:52 +01:00
Marc Alexander
18641e822e
Merge branch '3.2.x' 2017-03-08 21:29:20 +01:00
Marc Alexander
3e9f12d12d
Merge pull request #4696 from marc1706/ticket/14979
[ticket/14979] Do not display underline for unread icon
2017-03-08 21:29:16 +01:00
Marc Alexander
173ca21ca1
Merge branch '3.2.x' 2017-03-08 21:27:15 +01:00
Marc Alexander
1edb0bd173
Merge pull request #4700 from DavidIQ/ticket/15089
[ticket/15089] Reverse the order of cookie secure radio buttons
2017-03-08 21:27:11 +01:00
Marc Alexander
6ce33c2e69
Merge branch '3.2.x' 2017-03-08 21:24:51 +01:00
Marc Alexander
013c9ad9ef
Merge pull request #4702 from JimMH/patch-3
[ticket/15092] Correct database update instructions
2017-03-08 21:24:47 +01:00
Marc Alexander
8921c3a3b8
Merge branch '3.2.x' 2017-03-08 21:21:21 +01:00
Marc Alexander
f319b93dc3
Merge pull request #4713 from DavidIQ/ticket/15106
[ticket/15106] Remove space before comma in sub-forum list
2017-03-08 21:21:16 +01:00
Marc Alexander
37ee22a0e6
Merge branch '3.2.x' 2017-03-08 21:09:40 +01:00
Marc Alexander
e0d31d8897
Merge pull request #4714 from vinny/ticket/14732
[ticket/14732] Remove PHP Code syntax highlighting references
2017-03-08 21:07:47 +01:00
Marc Alexander
0097a575ec
[ticket/14970] Also run stylelint against admin css
PHPBB3-14970
2017-03-08 20:59:16 +01:00
Vinny
51a55cee5d [ticket/14732] Remove references from tests
PHPBB3-14732
2017-02-28 05:59:22 -03:00
Vinny
8227289ecc [ticket/14732] Remove PHP Code syntax highlighting references
PHPBB3-14732
2017-02-28 05:26:20 -03:00
David Colón
25c54beee7 [ticket/15106] Remove space before comma in sub-forum list 2017-02-28 00:24:57 -05:00
Marc Alexander
54d60dc8b1
[ticket/14970] Fix issues noted by stylelint
PHPBB3-14970
2017-02-23 22:27:42 +01:00
Marc Alexander
967817143d
Merge branch '3.2.x' 2017-02-23 22:21:25 +01:00
Marc Alexander
7a1f4d5008
Merge branch '3.1.x' into 3.2.x 2017-02-23 22:21:20 +01:00
Marc Alexander
9267235f30
Merge pull request #4605 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2017-02-23 22:21:16 +01:00
Marc Alexander
4365d85b38
Merge branch '3.2.x' 2017-02-22 21:54:10 +01:00
Marc Alexander
cf439f2173
Merge pull request #4629 from hubaishan/ticket/14975
[ticket/14975] Correct RTL style css
2017-02-22 21:49:13 +01:00
Marc Alexander
fa2d1eb8b1
[ticket/14970] Remove unneeded parameters from check-stylesheet.sh
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
ccd4aed3c8
[ticket/14970] Add stylelint-order as dependency
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
dcf83ce60b
[ticket/14970] Update package.json definitions for bugs & homepage
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
6a8f20a788
[ticket/14970] Do not output node install output in stylelint
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
f872020c1a
[ticket/14970] Try using newer node version
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
1be84e0233
[ticket/14970] Run stylelint on travis
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
47caa97ff2
[ticket/14970] Fixed issues picked up by stylelint
PHPBB3-14970
2017-02-22 21:46:07 +01:00
Marc Alexander
67bc5f93ce
[ticket/14970] Add stylelint to package.json
PHPBB3-14970
2017-02-22 21:44:15 +01:00
Marc Alexander
c8dcf82b3e
[ticket/14970] Ignore node_modules directory
PHPBB3-14970
2017-02-22 21:44:15 +01:00
Marc Alexander
9ac840f853
[ticket/14970] Add package.json for phpBB
PHPBB3-14970
2017-02-22 21:44:15 +01:00
Saeed Hubaishan
3331581ee5 [ticket/14975] Changes requested by hanakin
[ticket/14975] Changes requested by hanakin

[PHPBB3-14975]
2017-02-22 13:30:48 +03:00
Marc Alexander
d956ac418d Merge branch '3.2.x' 2017-02-22 11:09:30 +01:00
Marc Alexander
dbf7f2b7ee Merge branch '3.1.x' into 3.2.x 2017-02-22 11:09:02 +01:00
Marc Alexander
4c3ddea09f Merge remote-tracking branch 'origin/ticket/14927' into 3.1.x 2017-02-22 11:08:22 +01:00
Marc Alexander
bc86210db8
[ticket/14927] Put vars on one line
PHPBB3-14927
2017-02-21 22:15:12 +01:00
Marc Alexander
cfeea80a8c
Merge branch '3.2.x' 2017-02-21 22:08:21 +01:00
Marc Alexander
a302fb47a8
Merge branch '3.1.x' into 3.2.x 2017-02-21 21:33:14 +01:00
Marc Alexander
191a776ce6
Merge pull request #4636 from javiexin/ticket/14995
[ticket/14995] Add ACP template events acp_ext_list_*_name_after
2017-02-21 21:32:03 +01:00
Marc Alexander
7794696317
Merge branch '3.2.x' 2017-02-21 21:14:34 +01:00
Marc Alexander
efe6bcf95a
Merge branch '3.1.x' into 3.2.x 2017-02-21 21:14:12 +01:00
Marc Alexander
896249f0e8
Merge pull request #4604 from rxu/ticket/13344
[ticket/13344] Add core event to acp/info/acp_logs.php
2017-02-21 21:10:35 +01:00
david63
bac6dbda5e
[ticket/14927] Corrected order in docblock of event & target version
PHPBB3-14927
2017-02-21 20:46:58 +01:00