aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge PR #890 branch 'nickvergessen/ticket/10982' into developOleg Pudeyev2012-10-162-5/+5
|\
| * [ticket/10982] Correctly check, whether data-overlay is setJoas Schilling2012-07-111-1/+1
| * [ticket/10982] Remove overlay on first up/down move of forums in ACPJoas Schilling2012-07-111-4/+4
| * [ticket/10982] Allow setting dimming control overlay also as data-overlayJoas Schilling2012-07-111-1/+1
* | Merge PR #624 branch 'develop-olympus' into developOleg Pudeyev2012-10-164-5/+7
|\ \
| * \ Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympusOleg Pudeyev2012-10-164-5/+7
| |\ \
| | * | [ticket/8743] Include poster“s name in mail notificationsJoas Schilling2012-03-154-5/+7
* | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-10-161-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/russellwwest/11093' into develop-olympusAndreas Fischer2012-10-161-1/+2
| |\ \ \ \
| | * | | | [ticket/11093] acp_users_overview.html has a wrongly placed </dd>westr2012-10-161-1/+2
| |/ / / /
* | | | | Merge remote-tracking branch 'mvinny/ticket/11139' into developAndreas Fischer2012-10-151-1/+3
|\ \ \ \ \
| * | | | | [ticket/11139] Adding the $phpbb_admin_path variableVinny2012-10-151-0/+2
| * | | | | [ticket/11139] Fix fatal error on colour swatch windowVinny2012-10-091-1/+1
* | | | | | Merge PR #956 branch 'dhruvgoel92/ticket/11051' into developOleg Pudeyev2012-10-105-18/+148
|\ \ \ \ \ \
| * | | | | | [ticket/11051] fix spacesDhruv2012-10-081-3/+3
| * | | | | | [ticket/11051] add common_words variableDhruv2012-10-041-2/+4
| * | | | | | [ticket/11051] remove unnecessary commentDhruv2012-10-041-1/+0
| * | | | | | [ticket/11051] add get_word_len() in sphinx searchDhruv2012-10-042-1/+18
| * | | | | | [ticket/11051] use get_word_length in search backendDhruv2012-08-171-1/+3
| * | | | | | [ticket/11051] use get_common_words in search backendDhruv2012-08-161-2/+2
| * | | | | | [ticket/11051] function instead of accessing property in searchDhruv2012-08-161-3/+3
| * | | | | | [ticket/11051] add public functions for public propertiesDhruv2012-08-154-12/+122
* | | | | | | Merge PR #973 branch 'develop-olympus' into developOleg Pudeyev2012-10-101-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge PR #973 branch 'bantu/ticket/11069' into develop-olympusOleg Pudeyev2012-10-101-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/11069] Add closing span back to credit line in subsilver2 simple footerAndreas Fischer2012-08-261-1/+1
* | | | | | | | 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-1010-60/+176
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [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-082-5/+40
| * | | | | | | | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-087-16/+16
| * | | | | | | | | [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] Add simple (non-nested) test case for untrimmed set_var().Andreas Fischer2012-09-081-0/+10
| * | | | | | | | | [ticket/8713] Use \t in double quotes instead of tabs.Andreas Fischer2012-09-081-2/+2
| * | | | | | | | | [ticket/8713] Use correct parameter for nested data.Andreas Fischer2012-09-081-1/+1
| * | | | | | | | | [ticket/8713] Adjust test method name to other recursive_set_var() tests.Andreas Fischer2012-09-081-1/+1
| * | | | | | | | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-039-21/+104
* | | | | | | | | | Merge PR #1008 branch 'EXreaction/ticket/11140' into developOleg Pudeyev2012-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge PR #1004 branch 'develop-olympus' into developOleg Pudeyev2012-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympusOleg Pudeyev2012-10-091-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [ticket/11131] Correctly use indefinite article for "warning".Andreas Fischer2012-10-021-1/+1
* | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-10-0610-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | |