aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* add IP address to failed login log messagefriendica2012-03-191-1/+2
|
* Merge pull request #152 from ↵friendica2012-03-191-24/+2
|\ | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal
| * modified: include/text.phpThomas2012-03-191-3/+2
| | | | | | | | Stupid bug fixed
| * modified: include/text.phpThomas2012-03-191-21/+0
| | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out.
* | Merge pull request #150 from fabrixxm/masterfriendica2012-03-191-1/+1
|\ \ | | | | | | Add "logging_out" hook
| * \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-1920-141/+640
| |\ \
| * | | add 'loggin_out' hookFabio Comuni2012-03-121-1/+1
| | | |
* | | | refactor openid logins/registrationsfriendica2012-03-191-25/+4
| |_|/ |/| |
* | | some openid fixes, use identity url from openid server and normalise it.friendica2012-03-191-0/+3
| |/ |/|
* | support "no_smilies"friendica2012-03-191-0/+5
| |
* | Merge pull request #149 from CatoTH/masterSimon2012-03-191-8/+12
|\ \ | | | | | | Add a missing security token [Using photos as profile photos]
| * | Existing photos could not be used as profile photos anymore - should be ↵Tobias Hößl2012-03-191-8/+12
| | | | | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier
* | | community discovery cont., cleanup of DB debuggingfriendica2012-03-185-17/+47
|/ /
* | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵Tobias Hößl2012-03-181-0/+6
| | | | | | | | group, adding/removing members from it)
* | replace split() by explode(); split is deprecatedTobias Hößl2012-03-182-2/+2
| |
* | bug #337, call template_unescape() only at the end of template processingfriendica2012-03-173-4/+4
| |
* | queue optimisation - back off delivery attempts to once per hour after the ↵friendica2012-03-171-3/+8
| | | | | | | | first 12 hours.
* | template processor broken with foreach k=>v and k is integer 0friendica2012-03-171-1/+1
| |
* | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| |
* | Merge branch 'pull'friendica2012-03-161-6/+8
|\ \
| * \ Merge pull request #141 from CatoTH/masterSimon2012-03-161-6/+8
| |\ \ | | | | | | | | Private messages - tabindex
| | * | Use tabindex to enable easy navigation in the dialog to write private mails; ↵Tobias Hößl2012-03-161-6/+8
| | | | | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
* | | | wrong link in d* comment notificationsfriendica2012-03-161-1/+1
|/ / /
* | | bug #335 network search broken after new ssl policy settingsfriendica2012-03-161-1/+1
| | |
* | | whitespacefriendica2012-03-161-0/+1
| | |
* | | notification for disapora commentsfriendica2012-03-161-0/+42
|/ /
* | Merge branch 'pull'friendica2012-03-157-63/+305
|\ \
| * | html2bbcode: Disabled size conversionMichael Vogel2012-03-151-9/+9
| | |
| * | Merge commit 'upstream/master'Michael Vogel2012-03-159-44/+263
| |\ \
| * | | Mail: Subject are now with working "Re:"Michael Vogel2012-03-122-43/+14
| | | |
| * | | Removing test exportsMichael Vogel2012-03-112-4/+4
| | | |
| * | | Merge commit 'upstream/master'Michael Vogel2012-03-111-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
| * | | | Item cache now is one day.Michael Vogel2012-03-111-1/+1
| | | | |
| * | | | Cache: item cache now has an autodelete of old files. The pages plugin now ↵Michael Vogel2012-03-112-1/+14
| | | | | | | | | | | | | | | | | | | | sets a link via redirection. So posting works.
| * | | | Caching improved.Michael Vogel2012-03-101-13/+11
| | | | |
| * | | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-101-1/+16
| | | | |
| * | | | New config options if ostatus polling should use the priority in the contactsMichael Vogel2012-03-101-1/+4
| | | | |
| * | | | Mail: Removing signatures, gpg, unnecessary line breaksMichael Vogel2012-03-103-2/+240
| | | | |
| * | | | Merge commit 'upstream/master'Michael Vogel2012-03-0911-213/+421
| |\ \ \ \
| * | | | | html2bbcode: don't convert sizes and fonts.Michael2012-03-021-3/+7
| | | | | |
* | | | | | track whether contact is a community page or notfriendica2012-03-151-0/+5
| |_|_|/ / |/| | | |
* | | | | basic ssl_policy for important modulesfriendica2012-03-142-20/+28
| | | | |
* | | | | ssl_policy stufffriendica2012-03-141-0/+17
| | | | |
* | | | | more work on filer, comment level and file tag removalfriendica2012-03-133-20/+28
| | | | |
* | | | | file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-133-1/+32
| | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently
* | | | | Merge pull request #129 from CatoTH/masterfriendica2012-03-136-9/+64
|\ \ \ \ \ | | | | | | | | | | | | CSRF-Protection and minor changes
| * | | | | Some security against XSRF-attacksTobias Hößl2012-03-121-0/+46
| | | | | |
| * | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-121-0/+73
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-111-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-0911-206/+405
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |