aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-232-31/+169
|\
| * Merge pull request #4605 from javiexin/ticket/14943Marc Alexander2017-02-232-31/+169
| |\ | | | | | | | | | [ticket/14943] Fix template loop access by index
| | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-121-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allows inserting elements in a loop specified as 'outer[3].inner'. This was coded, but malfunctioning. Name incorrectly set on insert. If block was empty, the insertion process should create it. Checking for out of bounds indexes. PHPBB3-14943
| | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Allows inserting elements in a loop specified as 'outer[3].inner'. This was coded, but malfunctioning. Name incorrectly set on insert. Added more tests. PHPBB3-14943
| | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-071-2/+119
| | | | | | | | | | | | | | | | | | | | | | | | Allows inserting elements in a loop specified as 'outer[3].inner'. This was coded, but malfunctioning. Name incorrectly set on insert. Added tests. PHPBB3-14943
| | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-011-1/+3
| | | | | | | | | | | | | | | | | | | | | Allows inserting elements in a loop specified as 'outer[3].inner'. This was coded, but malfunctioning. Name incorrectly set on insert. PHPBB3-14943
* | | Merge pull request #4629 from hubaishan/ticket/14975Marc Alexander2017-02-224-8/+19
|\ \ \ | | | | | | | | | | | | [ticket/14975] Correct RTL style css
| * | | [ticket/14975] Changes requested by hanakinSaeed Hubaishan2017-02-221-6/+3
| | | | | | | | | | | | | | | | | | | | [ticket/14975] Changes requested by hanakin [PHPBB3-14975]
| * | | [ticket/14975] add missing .rtlSaeed Hubaishan2017-01-301-7/+2
| | | | | | | | | | | | | | | | | | | | [ticket/14975] add missing .rtl and resolve conflict [PHPBB3-14975]
| * | | [ticket/14975] Correct RTL style csshubaishan2017-01-104-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display_options.html corrected to move (display and sorting option) to right jumpbox.html corrected to change arrow direction to left in RTL pagination.html corrected to change arrows direction on RTL bidi.css more edittions to correct remain style mistakes PHPBB3-14975
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-221-4/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/ticket/14927' into 3.1.xMarc Alexander2017-02-221-4/+6
| |\ \ \
| | * | | [ticket/14927] Put vars on one lineMarc Alexander2017-02-211-5/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14927
| | * | | [ticket/14927] Corrected order in docblock of event & target versiondavid632017-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14927
| | * | | [ticket/14927] Add items to core.user_add_modify_datadavid632017-02-211-4/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-14927
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-212-2/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4636 from javiexin/ticket/14995Marc Alexander2017-02-212-2/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14995] Add ACP template events acp_ext_list_*_name_after
| | * | | | [ticket/14995] Add ACP template events acp_ext_list_*_name_afterjaviexin2017-01-122-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14995
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-211-6/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4604 from rxu/ticket/13344Marc Alexander2017-02-211-6/+21
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13344] Add core event to acp/info/acp_logs.php
| | * | | | [ticket/13344] Add core event to acp/info/acp_logs.phprxu2017-01-011-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13344
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-194-0/+145
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4598 from javiexin/ticket/14944Marc Alexander2017-02-194-0/+145
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14944] Add search for template loop indexes by key
| | * | | | | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2017-01-284-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2017-01-082-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. PHPBB3-14944
| | * | | | | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2016-12-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. PHPBB3-14944
| | * | | | | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2016-12-283-0/+96
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. PHPBB3-14944
* | | | | | Merge pull request #4691 from DavidIQ/ticket/15058Marc Alexander2017-02-191-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15058] Force browser to redownload stylesheets
| * | | | | | [ticket/15058] Force browser to redownload stylesheetsDavid Colón2017-02-101-12/+12
| | | | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-111-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4589 from senky/ticket/14929Marc Alexander2017-02-111-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14929] Add error to core.posting_modify_message_text
| | * | | | | | [ticket/14929] Add error to core.posting_modify_message_textJakub Senko2016-12-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14929
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-1115-33/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge pull request #4523 from senky/ticket/13429Marc Alexander2017-02-1112-27/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13429] Replace @change with @changed in event docblocks
| | * | | | | | [ticket/13429] Replace @change with @changedJakub Senko2017-01-2321-60/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13429
| | * | | | | | [ticket/13429] Fix @change tags without descriptionJakub Senko2016-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13429
| | * | | | | | [ticket/13429] Replace @changed with @change in event docblocksJakub Senko2016-11-2012-36/+36
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13429
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-02-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13250] Use faster str_replace() instead of preg_replace() [ticket/13250] Replace slashes in cache file names
| * | | | | | Merge pull request #4660 from marc1706/ticket/13250Tristan Darricau2017-02-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | | [ticket/13250] Use faster str_replace() instead of preg_replace()Marc Alexander2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13250
| | * | | | | | [ticket/13250] Replace slashes in cache file namesMarc Alexander2017-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13250
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-02-051-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13601] Add core.acl_clear_prefetch_after event
| * | | | | | | Merge pull request #4673 from senky/ticket/13601Tristan Darricau2017-02-051-1/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13601] Add core.acl_clear_prefetch_after event * senky/ticket/13601: [ticket/13601] Add core.acl_clear_prefetch_after event
| | * | | | | | | [ticket/13601] Add core.acl_clear_prefetch_after eventJakub Senko2017-01-231-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13601
* | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-02-051-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15059] Preserve code line breaks and scroll overflow
| * | | | | | | | Merge pull request #4681 from VSEphpbb/ticket/15059Tristan Darricau2017-02-051-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15059] Preserve code line breaks and scroll overflow * VSEphpbb/ticket/15059: [ticket/15059] Preserve code line breaks and scroll overflow
| | * | | | | | | | [ticket/15059] Preserve code line breaks and scroll overflowMatt Friedman2017-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15059
* | | | | | | | | | Merge pull request #4682 from vinny/ticket/15062Tristan Darricau2017-02-052-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15062] Update to Rhea version the CSS files * vinny/ticket/15062: [ticket/15062] Update to Rhea version the CSS files
| * | | | | | | | | | [ticket/15062] Update to Rhea version the CSS filesVinny2017-02-012-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15062
* | | | | | | | | | Merge pull request #4675 from marc1706/ticket/15044Máté Bartus2017-01-294-4/+149
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15044] Create search index during installation