aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/11157' into developAndreas Fischer2012-10-306-15/+16
|\
| * [ticket/11157] static public is the currently approved order.Oleg Pudeyev2012-10-295-11/+11
| * [ticket/11157] Fix remaining captcha spam.Oleg Pudeyev2012-10-295-14/+14
| * [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
* | Merge remote-tracking branch 'p/ticket/11159-develop' into developAndreas Fischer2012-10-305-5/+5
|\ \
| * | [ticket/11159] static public is the currently approved order.Oleg Pudeyev2012-10-295-5/+5
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-291-1/+1
|\ \ | |/ |/|
| * [ticket/11158] Require acl_u_sig for ucp signature module.Oleg Pudeyev2012-10-291-1/+1
* | Merge PR #971 branch 'nickvergessen/ticket/11018' into developOleg Pudeyev2012-10-2217-34/+71
|\ \
| * | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-1717-26/+24
| * | [ticket/11014] Restore template vars for next/previous linksJoas Schilling2012-10-171-0/+39
| * | [ticket/11018] Swap prev/next links on pagination to the old orderJoas Schilling2012-10-171-8/+8
* | | Merge remote-tracking branch 'EXreaction/ticket/8796' into developAndreas Fischer2012-10-182-23/+52
|\ \ \
| * | | [ticket/8796] Prevent setting post_time greater than time() in markreadNathan Guse2012-09-301-30/+30
| * | | [ticket/8796] Fix a few issues with the previous commitsNathaniel Guse2012-09-032-5/+5
| * | | [ticket/8796] Mark read links updated to include time() in urlNathaniel Guse2012-09-031-3/+3
| * | | [ticket/8796] Revert changes to $user->data['lastmark']Nathaniel Guse2012-09-031-6/+2
| * | | [ticket/8796] Make function markread obey the $post_time argumentNathaniel Guse2012-09-031-19/+52
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-181-0/+30
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'p/ticket/10848' into develop-olympusAndreas Fischer2012-10-181-0/+30
| |\ \ \
| | * | | [ticket/10848] Add phpbb_ prefix.Oleg Pudeyev2012-10-171-1/+1
| | * | | [ticket/10848] Redirect from adm to installer correctly.Oleg Pudeyev2012-10-171-0/+30
* | | | | Merge PR #918 branch 'develop-olympus' into developOleg Pudeyev2012-10-171-1/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge PR #918 branch 'Senky/ticket/10568' into develop-olympusOleg Pudeyev2012-10-171-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pmSenky2012-08-021-1/+2
* | | | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-2/+4
|\ \ \ \ | |/ / /
| * | | Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ \
| | * | | [ticket/8743] Include poster“s name in mail notificationsJoas Schilling2012-03-151-2/+4
* | | | | Merge PR #917 branch 'develop-olympus' into developOleg Pudeyev2012-10-161-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge PR #917 branch 'Senky/ticket/10967' into develop-olympusOleg Pudeyev2012-10-161-2/+4
| |\ \ \ \
| | * | | | [ticket/10967] adding $root_path to posting_get_topic_iconsSenky2012-10-111-2/+4
| | | |/ / | | |/| |
* | | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-104-12/+132
|\ \ \ \ \
| * | | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| * | | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-041-0/+10
| * | | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
* | | | | | Merge PR #990 branch 'bantu/ticket/11100' into developOleg Pudeyev2012-10-101-4/+4
|\ \ \ \ \ \
| * | | | | | [ticket/11100] Mark can_use_ssl() and can_use_tls() as static.Andreas Fischer2012-09-081-4/+4
* | | | | | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-108-58/+140
|\ \ \ \ \ \ \
| * | | | | | | [ticket/8713] Update untrimmed_variable() doc block.Andreas Fischer2012-09-091-3/+3
| * | | | | | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-093-7/+7
| * | | | | | | [ticket/8713] Trim password in auth_db to keep compatibility.Andreas Fischer2012-09-081-0/+4
| * | | | | | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| * | | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-086-14/+14
| * | | | | | | [ticket/8713] DRY: variable() and untrimed_variable() into a protected method.Andreas Fischer2012-09-081-80/+64
| * | | | | | | [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc.Andreas Fischer2012-09-081-4/+4
| * | | | | | | [ticket/8713] Always trim array keys.Andreas Fischer2012-09-081-1/+1
| * | | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-037-19/+92
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-011-2/+2