aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Andreas Fischer2015-06-211-1/+1
|\ | | | | | | | | * 3.1.x: [ticket/13948] Correctly forwarding to the RIR for whois feature
| * Merge pull request #3722 from rxu/ticket/13948Andreas Fischer2015-06-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | [ticket/13948] Correctly forwarding to the RIR for whois feature * rxu/ticket/13948: [ticket/13948] Correctly forwarding to the RIR for whois feature
| | * [ticket/13948] Correctly forwarding to the RIR for whois featurerxu2015-06-211-1/+1
| |/ | | | | | | | | | | Allow any space count in the ReferralServer string for whois services response. PHPBB3-13948
* | Merge branch '3.1.x'Marc Alexander2015-06-191-1/+1
|\ \ | |/
| * Merge pull request #3715 from marc1706/ticket/13949Marc Alexander2015-06-191-1/+1
| |\ | | | | | | | | | [ticket/13949] Replace colon with colon lang key in memberlist search page
| | * [ticket/13949] Replace colon with colon lang key in memberlist search pageRaphaël M2015-06-191-1/+1
| |/ | | | | | | | | | | | | [ticket/13949] Replace colon with colon lang key in memberlist search page PHPBB3-13949
* | Merge branch '3.1.x'Marc Alexander2015-06-173-16/+12
|\ \ | |/
| * Merge pull request #3649 from callumacrae/ticket/13879Marc Alexander2015-06-173-16/+12
| |\ | | | | | | | | | [ticket/13879] Replaced px with em where appropriate.
| | * [ticket/13879] Replaced px with em where appropriate.Callum Macrae2015-05-283-16/+12
| | | | | | | | | | | | | | | | | | We're using ems basically everywhere else so ¯\_(ツ)_/¯ PHPBB3-13879
* | | Merge branch '3.1.x'Marc Alexander2015-06-171-4/+6
|\ \ \ | |/ /
| * | Merge pull request #3712 from VSEphpbb/ticket/13882Marc Alexander2015-06-171-4/+6
| |\ \ | | | | | | | | | | | | [ticket/13882] Add lazy load avatars to phpbb avatar wrappers
| | * | [ticket/13882] Add lazy load avatars to phpbb wrappersMatt Friedman2015-06-161-4/+6
| |/ / | | | | | | | | | PHPBB3-13882
* | | Merge pull request #3708 from s9e/ticket/13946Marc Alexander2015-06-171-4/+3
|\ \ \ | | | | | | | | | | | | [ticket/13946] Increase the CSS margin around [code] and [list]
| * | | [ticket/13946] Changed [list] margin to match [code]JoshyPHP2015-06-161-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13946
| * | | [ticket/13946] Increase the CSS margin around [code] and [list]JoshyPHP2015-06-141-4/+3
| | | | | | | | | | | | | | | | PHPBB3-13946
* | | | Merge pull request #3661 from marc1706/ticket/6466Tristan Darricau2015-06-175-187/+216
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
| * | | | [ticket/6466] Support form reset and do not loose role upon resubmitMarc Alexander2015-05-303-5/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Remove createElement function from tooltip.jsMarc Alexander2015-05-301-29/+32
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Minor documentation changesMarc Alexander2015-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Rename variables and remove unused onesMarc Alexander2015-05-291-13/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Improve code in tooltip.jsMarc Alexander2015-05-291-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Rename functions and clean up codeMarc Alexander2015-05-291-29/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Get rid of useless variables and functions in tooltip.jsMarc Alexander2015-05-292-27/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Remove double semicolonMarc Alexander2015-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Removed link tooltipMarc Alexander2015-05-291-56/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't being used anymore and didn't work anymore. PHPBB3-6466
| * | | | [ticket/6466] Improved code in tooltip.jsMarc Alexander2015-05-291-13/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Remove remnants of old codeMarc Alexander2015-05-292-23/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Improve behavior of select and properly save roleMarc Alexander2015-05-292-4/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltipsMarc Alexander2015-05-295-71/+119
| | | | | | | | | | | | | | | | | | | | PHPBB3-6466
* | | | | Merge branch '3.1.x'Andreas Fischer2015-06-161-2/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13903] Replacing regexp path naming for container by md5. Conflicts: phpBB/phpbb/di/container_builder.php
| * | | | Merge pull request #3711 from bantu/ticket/13903Andreas Fischer2015-06-161-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13903] Replacing regexp path naming for container by md5. * bantu/ticket/13903: [ticket/13903] Replacing regexp path naming for container by md5.
| | * | | | [ticket/13903] Replacing regexp path naming for container by md5.Wardormeur2015-06-161-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement of the path creation based on a blacklist by a md5 filename to support broader configurations PHPBB3-13903
* | | | | Merge pull request #3675 from s9e/ticket/13906Andreas Fischer2015-06-162-8/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13906] Fixed old signatures in post preview * s9e/ticket/13906: [ticket/13906] Renamed test [ticket/13906] Added test [ticket/13906] Fixed old signatures in post preview
| * | | | | [ticket/13906] Renamed testJoshyPHP2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13906
| * | | | | [ticket/13906] Added testJoshyPHP2015-06-021-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13906
| * | | | | [ticket/13906] Fixed old signatures in post previewJoshyPHP2015-06-011-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13906
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-161-28/+28
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13931] Wrong order in docs/events.md Conflicts: phpBB/docs/events.md
| * | | | | Merge pull request #3695 from javiexin/ticket/13931Andreas Fischer2015-06-161-32/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13931] Wrong order in docs/events.md * javiexin/ticket/13931: [ticket/13931] Wrong order in docs/events.md Conflicts: phpBB/docs/events.md
| | * | | | | [ticket/13931] Wrong order in docs/events.mdjaviexin2015-06-081-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reordered alphabetically (mcp before memberlist). PHPBB3-13931
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-161-10/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/12952] Check obvious errors before status in functional tests
| * | | | | | Merge pull request #3710 from marc1706/ticket/12952Andreas Fischer2015-06-161-10/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12952] Check obvious errors before status in functional tests * marc1706/ticket/12952: [ticket/12952] Check obvious errors before status in functional tests
| | * | | | | | [ticket/12952] Check obvious errors before status in functional testsMarc Alexander2015-06-161-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will change the output from just saying that the status did not match the expected one to actually showing any errors before complaining about a possible difference in the status code. PHPBB3-12952
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-1613-15/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php
| * | | | | | | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-1613-15/+54
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.
| | * | | | | | [ticket/13882] Added tiny docblock to lazyLoadAvatarsCallum Macrae2015-05-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882
| | * | | | | | [ticket/13882] no more egyptian brackets /o/Callum Macrae2015-05-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13882
| | * | | | | | [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-2813-15/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | | | | | | Merge branch '3.1.x'CHItA2015-06-161-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'nickvergessen/ticket/13947' into 3.1.xCHItA2015-06-161-0/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/13947] Add CHItA to the list of developersJoas Schilling2015-06-161-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13947