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
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
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
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
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
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
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
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
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
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
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
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
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
16e79d00d1
Merge pull request #4675 from marc1706/ticket/15044
...
[ticket/15044] Create search index during installation
2017-01-29 14:42:41 +01:00
Máté Bartus
cd4ceb2487
Merge pull request #4677 from marc1706/ticket/15050
...
[ticket/15050] Use new file when new file already exists
2017-01-29 14:40:02 +01:00
Máté Bartus
3bfeca4601
Merge branch '3.1.x' into 3.2.x
2017-01-29 14:30:56 +01:00
Máté Bartus
5cf1fc62db
Merge pull request #4679 from marc1706/ticket/14998
...
[ticket/14998] Point only to install dir from acp_update
2017-01-29 14:29:44 +01:00
javiexin
849fd9df7d
[ticket/14944] Add possibility to search for template loop indexes by key
...
Adds a new function to the template interface, and implements it in the
context class. The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors. Added tests.
Remove default parameter value.
PHPBB3-14944
2017-01-28 21:34:08 +01:00
Marc Alexander
b859559c8f
Merge pull request #4678 from DavidIQ/ticket/15047
...
[ticket/15047] Various db tools fixes for MSSQL
2017-01-28 11:09:26 +01:00
Marc Alexander
d81df55963
[ticket/14998] Point only to install dir from acp_update
...
PHPBB3-14998
2017-01-28 09:16:49 +01:00
Marc Alexander
2b67536cd0
Merge pull request #4661 from hanakin/ticket/15037
...
[ticket/15037] Make imagesets retina
2017-01-27 18:44:38 +01:00
Marc Alexander
b5ed02d03c
[ticket/15050] Remove extra whitespace
...
PHPBB3-15050
2017-01-27 08:40:35 +01:00
David Colón
2416a743f5
[ticket/15047] Reinstate length check for MSSQL 2000
2017-01-26 18:44:18 -05:00
David Colón
fae78b4c01
[ticket/15047] Do not set default for identity cols
2017-01-26 08:43:39 -05:00
David Colón
c53054f2b7
[ticket/15047] Use brackets due to keyword usage
2017-01-26 08:43:39 -05:00
David Colón
b52ee87df8
[ticket/15047] Don't attempt to drop primary keys
2017-01-26 08:43:39 -05:00
David Colón
66b0fe3b5d
[ticket/15047] No index name length check for mssql
2017-01-26 08:43:06 -05:00
Marc Alexander
f66594bf93
[ticket/15050] Use new file when new file already exists
...
Instead of trying to diff the new file against a pre-existing file,
we're just going to use the new file. It's impossible to know whether
the pre-existing file is newer or older than the new file. As the
system will rely on the files being in the "new" state it's better
to simply use the file in "new" state.
PHPBB3-15050
2017-01-25 22:18:29 +01:00
Marc Alexander
903d6be3bb
Merge remote-tracking branch 'origin/ticket/15045' into 3.2.x
2017-01-25 10:06:00 +01:00
hanakin
f069e521db
[ticket/15037] Optimize what can be
...
PHPBB3-15037
2017-01-24 17:15:41 -05:00
Marc Alexander
e8f41a0dcc
[ticket/15045] Fix user object instantiation in version_test
...
PHPBB3-15045
2017-01-24 22:50:10 +01:00
hanakin
f2bc4a9977
[ticket/15037] Update topic icons to retina
...
PHPBB3-15037
2017-01-24 16:35:30 -05:00
