aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15243] Check permissions before installing with SQLiteRubén Calvo2017-06-151-0/+9
| | | | PHPBB3-15243
* Merge pull request #4799 from marc1706/ticket/15179Marc Alexander2017-06-113-3/+12
|\ | | | | | | [ticket/15179] Update dependencies and fix compatibility with newer twig
| * [ticket/15179] Replace spaces with a tabMarc Alexander2017-06-031-1/+1
| | | | | | | | PHPBB3-15179
| * Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-312-2/+11
| |\
* | \ Merge pull request #4826 from marc1706/ticket/15219-rheaTristan Darricau2017-06-063-0/+280
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15219] Update hashes to bcrypt with cron -- Rhea * github.com:phpbb/phpbb: [ticket/15219] Add console command for updating hashes to bcrypt [ticket/15219] Add missing space [ticket/15219] Update hashes to bcrypt with cron
| * \ \ Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-06-031-0/+117
| |\ \ \
| | * | | [ticket/15219] Add console command for updating hashes to bcryptMarc Alexander2017-06-031-0/+117
| | | | | | | | | | | | | | | | | | | | PHPBB3-15219
| * | | | Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-05-051-1/+1
| |\ \ \ \ | | |/ / /
| | * | | [ticket/15219] Add missing spaceMarc Alexander2017-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15219
| * | | | Merge branch 'ticket/15219' into ticket/15219-rheaMarc Alexander2017-05-052-0/+163
| |\ \ \ \ | | |/ / /
| | * | | [ticket/15219] Update hashes to bcrypt with cronMarc Alexander2017-05-052-0/+163
| | | | | | | | | | | | | | | | | | | | PHPBB3-15219
* | | | | Merge pull request #4833 from javiexin/ticket/15227Marc Alexander2017-06-052-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15227] Check PHP version and remove old unused code
| * | | | | [ticket/15227] Remove STRIP, as always falsejaviexin2017-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15227
* | | | | | Merge pull request #4811 from rxu/ticket/15200Marc Alexander2017-06-051-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15200] Allow extensions using custom templates for help/faq controllers
| * | | | | | [ticket/15200] Allow extensions using custom templates for help/faq controllersrxu2017-04-271-1/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-15200
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-051-0/+32
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-051-0/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration options
| | * | | | | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-301-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
* | | | | | | Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.xMarc Alexander2017-05-293-0/+126
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '3.2.x' into ticket/15068javiexin2017-03-09428-6852/+41420
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-03-092-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add possibility to retrieve full block of vars PHPBB3-15068
| * | | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-02-053-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15068
* | | | | | | | | [ticket/14992] Add temp index migration for removing duplicatesDavid Colón2017-05-254-3/+54
| | | | | | | | |
* | | | | | | | | Merge pull request #4701 from DavidIQ/ticket/14992Marc Alexander2017-05-257-13/+335
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Improve user_notifications table performance
| * | | | | | | | | [ticket/14992] Reduce notification table col sizesDavid Colón2017-05-252-1/+49
| | | | | | | | | |
| * | | | | | | | | [ticket/14992] 'method' is needed for the unique indexDavid Colón2017-05-241-1/+1
| | | | | | | | | |
| * | | | | | | | | [ticket/14992] Remove temp index migrationDavid Colón2017-05-233-52/+1
| | | | | | | | | |
| * | | | | | | | | [ticket/14992] Make unit tests run more verboseMarc Alexander2017-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | | | [ticket/14992] Correctly remove table name and prefix from keysMarc Alexander2017-05-211-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | | | [ticket/14992] Shorten index name for user_id and item_idMarc Alexander2017-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | | | [ticket/14992] Check index name length in a more proper wayDavid Colón2017-03-017-17/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Add indexes to user_notifications table
| * | | | | | | | | [ticket/14992] Add indexes to user_notifications tableDavid Colón2017-03-014-8/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Change how index length is checked [ticket/14992] Remove duplicates from user_notifications table [ticket/14992] Add unique index to user_notifications table [ticket/14992] Shorten unique index name [ticket/14992] Shorten another index for user notifications
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-05-121-0/+51
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | * 3.1.x: [ticket/15226] Add index for latest topics to topics table
| * | | | | | | | [ticket/15226] Add index for latest topics to topics tableMarc Alexander2017-05-111-0/+51
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-15226
* | | | | | | | [ticket/15202] To disable, an extension must be enabledjaviexin2017-04-281-2/+2
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-15202
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15146] Date profile field validation incorrect
| * | | | | | Merge pull request #4763 from javiexin/ticket/15146Tristan Darricau2017-04-191-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15146] Date profile field validation incorrect * github.com:phpbb/phpbb: [ticket/15146] Date profile field validation incorrect
| | * | | | | | [ticket/15146] Date profile field validation incorrectjaviexin2017-03-241-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix by changing select input field options to match validation range PHPBB3-15146
* | | | | | | [ticket/15163] Escape curly braces in smilies HTML attributesJoshyPHP2017-04-181-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15163
* | | | | | | Merge pull request #4692 from rubencm/ticket/15084Tristan Darricau2017-04-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15084] Fix wrong order of breadcrumbs in module management * github.com:phpbb/phpbb: [ticket/15084] fix wrong order of breadcrumbs on module management
| * | | | | | | [ticket/15084] fix wrong order of breadcrumbs on module managementRubén Calvo2017-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15084
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-181-6/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15108] Remove duplicate code in request->context
| * | | | | | | Merge pull request #4718 from javiexin/ticket/15108Tristan Darricau2017-04-181-6/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15108] Remove duplicate code in request->overwrite * github.com:phpbb/phpbb: [ticket/15108] Remove duplicate code in request->context
| | * | | | | | [ticket/15108] Remove duplicate code in request->contextjaviexin2017-03-021-6/+0
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-15108
* | | | | | | [ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITIONTristan Darricau2017-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15180
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-171-17/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4689 from javiexin/ticket/15080Marc Alexander2017-04-171-45/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15080] Save unneeded file loads for extension metadata
| | * | | | | | [ticket/15080] Save unneeded file loads for extension metadatajaviexin2017-02-091-45/+15
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-15080
| * | | | | | Merge pull request #4592 from javiexin/ticket/14938Marc Alexander2017-04-162-21/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_available
| | * | | | | | [ticket/14938] Inconsistency in ext_mgr all_available vs is_availablejaviexin2017-02-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made is_available much more strict, in line with the checks in all_available Refactor all_available to use is_available, saving duplicate code. Further simplify is_available by using metadata_manager. Make optional the template object on metadata_manager creation. PHPBB3-14938