Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.1.x' | Marc Alexander | 2015-06-08 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch '3.0.x' into 3.1.x | Marc Alexander | 2015-06-08 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge pull request #3697 from Elsensee/ticket/13833-30x | Marc Alexander | 2015-06-08 | 2 | -2/+2 |
| | |\ | |||||
| * | \ | Merge pull request #3663 from Elsensee/ticket/13833 | Marc Alexander | 2015-06-08 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'ticket/13833-30x' into ticket/13833 | Oliver Schramm | 2015-06-08 | 2 | -2/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | [ticket/13833] Prevent flooding if type=submit doesn't exist | Oliver Schramm | 2015-06-08 | 2 | -2/+2 |
| | | |/ | |||||
* | | | | Merge pull request #3690 from s9e/ticket/13902 | Andreas Fischer | 2015-06-08 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | [ticket/13902] Increased CSS margin around quotes | JoshyPHP | 2015-06-07 | 1 | -2/+2 |
* | | | | | Merge branch '3.1.x' | Andreas Fischer | 2015-06-08 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #3691 from CHItA/ticket/13888 | Andreas Fischer | 2015-06-08 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | [ticket/13888] Fix sql_freeresult() error on author searches | CHItA | 2015-06-07 | 1 | -1/+1 |
* | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-07 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3693 from nickvergessen/ticket/13823 | Tristan Darricau | 2015-06-07 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | [ticket/13823] Remove the unnecessary brackets | Joas Schilling | 2015-06-07 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-07 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3692 from CHItA/ticket/sec-184 | Joas Schilling | 2015-06-07 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | [ticket/sec-184] Fix tests | CHItA | 2015-06-07 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-07 | 4 | -6/+29 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Merge pull request #22 from phpbb/ticket/sec-184 | Marc Alexander | 2015-06-07 | 4 | -6/+29 |
| |\ \ | |||||
| | * | | [ticket/sec-184] Do not output LDAP password to HTML | Joas Schilling | 2015-06-04 | 2 | -2/+10 |
| | * | | [ticket/sec-184] Do not output Jabber password to HTML | Joas Schilling | 2015-06-04 | 1 | -2/+5 |
| | * | | [ticket/sec-184] Do not output config passwords to the HTML page | Joas Schilling | 2015-06-04 | 2 | -2/+14 |
* | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-06 | 1 | -5/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #23 from phpbb/ticket/13913 | Tristan Darricau | 2015-06-06 | 1 | -5/+14 |
| |\ \ \ | |||||
| | * | | | [ticket/13913] Correctly check the forum_password and read permissions | Joas Schilling | 2015-06-04 | 1 | -5/+14 |
| | |/ / | |||||
* | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-06 | 1 | -1/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #3671 from marc1706/ticket/9563 | Tristan Darricau | 2015-06-06 | 1 | -1/+13 |
| |\ \ \ | |||||
| | * | | | [ticket/9563] Do not show empty categories on index | Marc Alexander | 2015-05-31 | 1 | -1/+13 |
* | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-06 | 1 | -2/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3680 from marc1706/ticket/13917 | Tristan Darricau | 2015-06-06 | 1 | -2/+14 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13917] Do not pass non-string variables to hash_equals() | Marc Alexander | 2015-06-04 | 1 | -2/+8 |
| | * | | | | [ticket/13917] Use hash_equals() if it's available | Marc Alexander | 2015-06-04 | 1 | -0/+6 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge branch '3.1.x' | Tristan Darricau | 2015-06-06 | 8 | -13/+13 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3681 from marc1706/ticket/13200 | Tristan Darricau | 2015-06-06 | 15 | -25/+25 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13200] Disable autocomplete for sensitive input fields | Marc Alexander | 2015-06-04 | 15 | -25/+25 |
| | |/ / / | |||||
* | | | | | Merge pull request #3682 from marc1706/ticket/13564 | Tristan Darricau | 2015-06-05 | 1 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/13564] Fix user_delete_test on master | Marc Alexander | 2015-06-04 | 1 | -4/+5 |
* | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-06-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge pull request #3684 from CHItA/ticket/13841 | Marc Alexander | 2015-06-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13841] Fix tests on 3.1 and master branch | CHItA | 2015-06-05 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-04 | 1 | -1/+22 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge pull request #3611 from Alf007/ticket/13841 | Joas Schilling | 2015-06-04 | 1 | -1/+22 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/13841] Add core event on functions_admin for topics move | alf007 | 2015-05-30 | 1 | -1/+22 |
| | * | | | | Merge pull request #1 from phpbb/develop-ascraeus | alf007 | 2015-05-25 | 256 | -885/+4741 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | Merge branch '3.1.x' | Joas Schilling | 2015-06-04 | 1 | -23/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3567 from javiexin/ticket/13795 | Joas Schilling | 2015-06-04 | 1 | -23/+28 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/13795] Modify core event in posting to include poll data | javiexin | 2015-05-28 | 1 | -1/+2 |
| | * | | | | | | [ticket/13795] Modify core event in posting to include poll data | javiexin | 2015-05-04 | 1 | -0/+2 |
| | * | | | | | | [ticket/13795] Modify core event in posting to include poll data | javiexin | 2015-04-29 | 1 | -23/+25 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch '3.1.x' | Joas Schilling | 2015-06-04 | 3 | -3/+53 |
|\ \ \ \ \ \ \ | |/ / / / / / |