aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Cesar G2015-05-312-2/+6
|\ | | | | | | | | * 3.1.x: [ticket/13905] Don't load loading.gif until needed.
| * Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.xCesar G2015-05-312-2/+6
| |\ | | | | | | | | | | | | * callumacrae/ticket/13905: [ticket/13905] Don't load loading.gif until needed.
| | * [ticket/13905] Don't load loading.gif until needed.Callum Macrae2015-05-312-2/+6
| | | | | | | | | | | | PHPBB3-13905
* | | Merge branch '3.1.x'Marc Alexander2015-05-314-96/+116
|\ \ \ | |/ /
| * | [ticket/13898] Moved jshint and jscs rcs to correct dir.Callum Macrae2015-05-312-102/+0
| | | | | | | | | | | | PHPBB3-13898
| * | [ticket/13898] Fixed all the forum_fn.js violations I understoodCallum Macrae2015-05-301-25/+37
| | | | | | | | | | | | PHPBB3-13898
| * | [ticket/13898] Allow underscores :(Callum Macrae2015-05-302-4/+3
| | | | | | | | | | | | PHPBB3-13898
| * | [ticket/13898] 4 spaces, not 2Callum Macrae2015-05-301-1/+1
| | | | | | | | | | | | PHPBB3-13898
| * | [ticket/13898] js coding standaaardsCallum Macrae2015-05-305-70/+181
| |/ | | | | | | PHPBB3-13898
* | Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-302-7/+125
|\ \ | | | | | | [ticket/13388] Integrate routing and di parameters resolution
| * | [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| | | | | | | | | | | | PHPBB3-13388
| * | [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| | | | | | | | | | | | PHPBB3-13388
| * | [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| | | | | | | | | | | | PHPBB3-13388
| * | [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| | | | | | | | | | | | PHPBB3-13388
| * | [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-292-7/+124
| | | | | | | | | | | | PHPBB3-13388
* | | Merge branch '3.1.x'Marc Alexander2015-05-304-261/+199
|\ \ \ | | |/ | |/| | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | Merge pull request #3658 from callumacrae/js-refactoring-againMarc Alexander2015-05-305-262/+200
| |\ \ | | | | | | | | | | | | JS Refactoring
| | * | [ticket/13887] Made readable code DRYCallum Macrae2015-05-291-16/+13
| | | | | | | | | | | | | | | | PHPBB3-13887
| | * | [ticket/13887] Made unreadable code readableCallum Macrae2015-05-291-14/+12
| | | | | | | | | | | | | | | | PHPBB3-13887
| | * | [ticket/13887] Minor JS refactoringCallum Macrae2015-05-295-58/+63
| | | | | | | | | | | | | | | | PHPBB3-13887
| | * | [ticket/13887] Use correct JSDoc syntaxCallum Macrae2015-05-293-190/+128
| | | | | | | | | | | | | | | | PHPBB3-13887
* | | | [ticket/13896] Fix coding styleTristan Darricau2015-05-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13896
* | | | Merge branch '3.1.x'Marc Alexander2015-05-301-2/+9
|\ \ \ \ | |/ / /
| * | | Merge pull request #3545 from VSEphpbb/ticket/13771Marc Alexander2015-05-301-2/+9
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13771] Allow AJAX errors to support exceptions messages
| | * | | [ticket/13771] Only handle valid JQHXR response objectsMatt Friedman2015-05-041-4/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-13771
| | * | | [ticket/13771] Allow AJAX errors to support exceptions messagesMatt Friedman2015-04-211-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13771
* | | | | Merge branch '3.1.x'Nils Adermann2015-05-3019-235/+207
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3020-50/+34
| |\ \ \ | | |_|/ | |/| | [ticket/13790] Update phpcs
| | * | [ticket/13790] Update phpcsTristan Darricau2015-05-1920-50/+34
| | | | | | | | | | | | | | | | PHPBB3-13790
* | | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/10922] Added support for body and subject in email BBCode
| * | | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922
| * | | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10922
* | | | | Merge pull request #3383 from nickvergessen/ticket/9109Tristan Darricau2015-05-293-15/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/9109 Properly document and calculate the group settings with value 0
| * | | | | [ticket/9109] Improve docblock and fix spelling errorsMarc Alexander2015-02-082-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109
| * | | | | [ticket/9109] Only query database once in phpbb_get_max_setting_from_groupMarc Alexander2015-02-081-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More test cases have been added, too. PHPBB3-9109
| * | | | | [ticket/9109] Properly document and calculate the group settings with value 0Joas Schilling2015-02-083-15/+48
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9109
* | | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-2919-32/+1069
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | | | [ticket/13844] Add eventsJoas Schilling2015-05-203-14/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] Fix language file so the tests passJoas Schilling2015-05-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-1612-19/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-165-0/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] Add new versions of the old help_* filesJoas Schilling2015-05-162-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | | [ticket/13844] Add a little develop script to migrate the filesJoas Schilling2015-05-161-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-294-3/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils
| * | | | | | | [ticket/13847] Updated ucp_pm_compose to use utils when forwardingJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847
| * | | | | | | [ticket/13847] Updated ucp_pm_compose to use the utils serviceJoshyPHP2015-05-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...when quoting a post PHPBB3-13847
| * | | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will enclose attribute values in single- or double- quotes depending on whichever requires the least escaping. Characters that need to be escaped are always escaped regardless. PHPBB3-13847
| * | | | | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-253-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847
* | | | | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-291-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13860] Fixed array-to-string conversion