1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-31 05:53:14 +02:00

29752 Commits

Author SHA1 Message Date
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
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
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
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
david63
1b46435734
[ticket/14927] Add items to core.user_add_modify_data
PHPBB3-14927
2017-02-21 20:44:00 +01:00
Marc Alexander
e24d3a6ade
Merge branch '3.2.x' 2017-02-19 21:47:10 +01:00
Marc Alexander
bdaa6e4909
Merge branch '3.1.x' into 3.2.x 2017-02-19 21:47:06 +01:00
Marc Alexander
481a592b8d
Merge pull request #4598 from javiexin/ticket/14944
[ticket/14944] Add search for template loop indexes by key
2017-02-19 21:47:00 +01:00
Marc Alexander
38c3ded1f8
Merge branch '3.2.x' 2017-02-19 10:06:45 +01:00
Marc Alexander
937a386688
Merge pull request #4691 from DavidIQ/ticket/15058
[ticket/15058] Force browser to redownload stylesheets
2017-02-19 10:03:51 +01:00
Marc Alexander
277fcba26e
Merge branch '3.2.x' 2017-02-11 22:04:07 +01:00
Marc Alexander
9b4d455726
Merge branch '3.1.x' into 3.2.x 2017-02-11 22:04:01 +01:00
Marc Alexander
b567c6e241
Merge pull request #4589 from senky/ticket/14929
[ticket/14929] Add error to core.posting_modify_message_text
2017-02-11 22:03:57 +01:00
Marc Alexander
30c8e40b9b
Merge branch '3.2.x' 2017-02-11 21:48:42 +01:00
Marc Alexander
f27cdad73e
Merge branch '3.1.x' into 3.2.x 2017-02-11 21:48:20 +01:00
Marc Alexander
45199adebd
Merge pull request #4523 from senky/ticket/13429
[ticket/13429] Replace @change with @changed in event docblocks
2017-02-11 15:19:47 +01:00
David Colón
46a0cde544 [ticket/15058] Force browser to redownload stylesheets 2017-02-10 15:17:06 -05:00
Tristan Darricau
f11fd2b726
Merge branch '3.2.x'
* 3.2.x:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:28 +01:00
Tristan Darricau
59ad9401d9
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:22 +01:00
Tristan Darricau
1470985ff2
Merge pull request #4660 from marc1706/ticket/13250
[ticket/13250] Replace slashes in cache file names

* marc1706/ticket/13250:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:16 +01:00
Tristan Darricau
95ad20c994
Merge branch '3.2.x'
* 3.2.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:06:04 +01:00
Tristan Darricau
4eb72a4e7b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:59 +01:00
Tristan Darricau
c3896c8b5d
Merge pull request #4673 from senky/ticket/13601
[ticket/13601] Add core.acl_clear_prefetch_after event

* senky/ticket/13601:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:53 +01:00
Tristan Darricau
608cf8a38b
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15059] Preserve code line breaks and scroll overflow
2017-02-05 17:53:30 +01:00
Tristan Darricau
c45323863b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15059] Preserve code line breaks and scroll overflow
2017-02-05 17:51:53 +01:00
Tristan Darricau
c006479274
Merge pull request #4681 from VSEphpbb/ticket/15059
[ticket/15059] Preserve code line breaks and scroll overflow

* VSEphpbb/ticket/15059:
  [ticket/15059] Preserve code line breaks and scroll overflow
2017-02-05 17:50:35 +01:00
Tristan Darricau
bb132cceb3
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15062] Update to Rhea version the CSS files
2017-02-05 17:38:16 +01:00
Tristan Darricau
316de4b891
Merge pull request #4682 from vinny/ticket/15062
[ticket/15062] Update to Rhea version the CSS files

* vinny/ticket/15062:
  [ticket/15062] Update to Rhea version the CSS files
2017-02-05 17:37:53 +01:00
Vinny
80ecad5cf9 [ticket/15062] Update to Rhea version the CSS files
PHPBB3-15062
2017-02-01 02:34:01 -03:00
Matt Friedman
35b7e95098 [ticket/15059] Preserve code line breaks and scroll overflow
PHPBB3-15059
2017-01-30 08:48:42 -08:00
Saeed Hubaishan
f47d244151 [ticket/14975] add missing .rtl
[ticket/14975] add missing .rtl and resolve conflict

[PHPBB3-14975]
2017-01-30 07:39:25 +03:00
Máté Bartus
e906b2c609 Merge branch '3.2.x' 2017-01-29 14:43:15 +01:00
Máté Bartus
16e79d00d1 Merge pull request #4675 from marc1706/ticket/15044
[ticket/15044] Create search index during installation
2017-01-29 14:42:41 +01:00