Merge branch 'issue-430' into develop
Merge branch 'develop', remote-tracking branch 'origin/develop' into develop
Merge branch 'hotfixes' into develop
Merge branch 'hotfixes' into develop
fixes old styles from previous version
Merge branch 'issue-427' into develop
added IP field to t_item table; fixes #432
Merge branch 'feature-add-item-ip' into develop
added pre_item_contact_post hook, pass the $item var; fixes #433
Merge branch 'feature-433' into develop
added two new hooks: pre_contact_post, pre_item_send_friend_post
wip issue 234
finished one part of the #234 issue, added the list manager inside the user's profile
Added DEMO check, osc_deleteResource
issue #234 .
I didn't made the list of alerts, since I don't see the use of it. Also even the alerts are in JSON format, it's not possible to recover them and display in a easy and understable way (lot of unwanted information is also stored with them). Maybe in a future with some hard work would it will possible to do it.
Merge branch '234' into develop
git fix alerts stats
wip alerts
using mailBeauty in the subject of the email alert validation; fixes #436
Merge branch 'issue-github-437' into develop