Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add IP address to failed login log message | friendica | 2012-03-19 | 1 | -1/+2 |
| | |||||
* | Merge pull request #152 from ↵ | friendica | 2012-03-19 | 1 | -24/+2 |
|\ | | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal | ||||
| * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | | | | | | | Stupid bug fixed | ||||
| * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -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/master | friendica | 2012-03-19 | 1 | -1/+1 |
|\ \ | | | | | | | Add "logging_out" hook | ||||
| * \ | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 20 | -141/+640 |
| |\ \ | |||||
| * | | | add 'loggin_out' hook | Fabio Comuni | 2012-03-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | refactor openid logins/registrations | friendica | 2012-03-19 | 1 | -25/+4 |
| |_|/ |/| | | |||||
* | | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 1 | -0/+3 |
| |/ |/| | |||||
* | | support "no_smilies" | friendica | 2012-03-19 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #149 from CatoTH/master | Simon | 2012-03-19 | 1 | -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ößl | 2012-03-19 | 1 | -8/+12 |
| | | | | | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier | ||||
* | | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 5 | -17/+47 |
|/ / | |||||
* | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵ | Tobias Hößl | 2012-03-18 | 1 | -0/+6 |
| | | | | | | | | group, adding/removing members from it) | ||||
* | | replace split() by explode(); split is deprecated | Tobias Hößl | 2012-03-18 | 2 | -2/+2 |
| | | |||||
* | | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 3 | -4/+4 |
| | | |||||
* | | queue optimisation - back off delivery attempts to once per hour after the ↵ | friendica | 2012-03-17 | 1 | -3/+8 |
| | | | | | | | | first 12 hours. | ||||
* | | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 1 | -1/+1 |
| | | |||||
* | | add "send pm" link to photo dropdown for Diaspora contacts | friendica | 2012-03-16 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'pull' | friendica | 2012-03-16 | 1 | -6/+8 |
|\ \ | |||||
| * \ | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 1 | -6/+8 |
| |\ \ | | | | | | | | | Private messages - tabindex | ||||
| | * | | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 1 | -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 notifications | friendica | 2012-03-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | whitespace | friendica | 2012-03-16 | 1 | -0/+1 |
| | | | |||||
* | | | notification for disapora comments | friendica | 2012-03-16 | 1 | -0/+42 |
|/ / | |||||
* | | Merge branch 'pull' | friendica | 2012-03-15 | 7 | -63/+305 |
|\ \ | |||||
| * | | html2bbcode: Disabled size conversion | Michael Vogel | 2012-03-15 | 1 | -9/+9 |
| | | | |||||
| * | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-15 | 9 | -44/+263 |
| |\ \ | |||||
| * | | | Mail: Subject are now with working "Re:" | Michael Vogel | 2012-03-12 | 2 | -43/+14 |
| | | | | |||||
| * | | | Removing test exports | Michael Vogel | 2012-03-11 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl | ||||
| * | | | | Item cache now is one day. | Michael Vogel | 2012-03-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Cache: item cache now has an autodelete of old files. The pages plugin now ↵ | Michael Vogel | 2012-03-11 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | sets a link via redirection. So posting works. | ||||
| * | | | | Caching improved. | Michael Vogel | 2012-03-10 | 1 | -13/+11 |
| | | | | | |||||
| * | | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 1 | -1/+16 |
| | | | | | |||||
| * | | | | New config options if ostatus polling should use the priority in the contacts | Michael Vogel | 2012-03-10 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Mail: Removing signatures, gpg, unnecessary line breaks | Michael Vogel | 2012-03-10 | 3 | -2/+240 |
| | | | | | |||||
| * | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-09 | 11 | -213/+421 |
| |\ \ \ \ | |||||
| * | | | | | html2bbcode: don't convert sizes and fonts. | Michael | 2012-03-02 | 1 | -3/+7 |
| | | | | | | |||||
* | | | | | | track whether contact is a community page or not | friendica | 2012-03-15 | 1 | -0/+5 |
| |_|_|/ / |/| | | | | |||||
* | | | | | basic ssl_policy for important modules | friendica | 2012-03-14 | 2 | -20/+28 |
| | | | | | |||||
* | | | | | ssl_policy stuff | friendica | 2012-03-14 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | more work on filer, comment level and file tag removal | friendica | 2012-03-13 | 3 | -20/+28 |
| | | | | | |||||
* | | | | | file as widget and basic filing implementation for duepuntozero,slackr | friendica | 2012-03-13 | 3 | -1/+32 |
| | | | | | | | | | | | | | | | | | | | | much more work needed - this is just for test/evaluation currently | ||||
* | | | | | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 6 | -9/+64 |
|\ \ \ \ \ | | | | | | | | | | | | | CSRF-Protection and minor changes | ||||
| * | | | | | Some security against XSRF-attacks | Tobias Hößl | 2012-03-12 | 1 | -0/+46 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 1 | -0/+73 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 1 | -3/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 11 | -206/+405 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | |