Commit graph

1601 commits

Author SHA1 Message Date
Michael Vogel cb4c7cdb3e API: API is now enhanced. mentions, repeat and destroy now works. 2012-04-08 00:02:25 +02:00
Michael Vogel cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
friendica 1440786c31 ignore utf8 offset error for unit tests 2012-04-07 02:31:41 -07:00
friendica 3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica ecabe1d505 ignore removed plugins 2012-04-06 05:21:42 -07:00
friendica 13dfb40128 fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -07:00
friendica 665b2c8107 revert config changes, we're getting duplicate keys 2012-04-06 03:10:46 -07:00
friendica 4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica 221726392e pass autoname(0) test 2012-04-05 18:44:36 -07:00
Michael Vogel 34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
Alexander Kampmann cbf4544887 added index to config and pconfig table
changed config.php to use REPLACE instead of INSERT, 
this removes one db hit.
2012-04-05 13:27:09 +02:00
friendica 37801dd6ed also block outbound 2012-04-04 20:48:35 -07:00
friendica 0c7710681c log disabled requests 2012-04-04 18:49:39 -07:00
friendica 71671e5b9a fix config storage of booleans 2012-04-04 17:51:59 -07:00
friendica 62c60fd53d bug: diaspora_enabled setting turns it on but doesn't fully turn it off. 2012-04-04 14:13:34 -07:00
friendica 5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
Michael Vogel 3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
friendica 62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
friendica 1f74bd1b78 catch a couple more Oo smilies 2012-04-01 22:57:50 -07:00
friendica 5d35f0d54a add title to D* posts 2012-04-01 19:16:13 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica 00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
Michael Vogel 5409825fe7 New script that checks if a script is running 2012-04-01 20:56:27 +02:00
Michael Vogel 4cf1e5aa21 poller: An optional lockfile is used to check if the poller is already running 2012-04-01 20:52:33 +02:00
friendica 9b4bef8ac4 that didn't quite work out 2012-04-01 06:46:12 -07:00
Michael Vogel 7d23149a61 Merge commit 'upstream/master' 2012-04-01 14:11:37 +02:00
friendica f0b8d01615 try slightly better detection of html in feeds 2012-04-01 03:19:37 -07:00
friendica ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00
friendica 5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
Simon e97d90820d line 86: s/Friendika/Friendica/ 2012-04-01 04:52:45 -03:00
friendica e6fd6bfd89 more error handling 2012-03-31 17:44:34 -07:00
friendica 53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica 0cf2e051bb escape % in file_tag_query as it is ultimately embedded in a sprintf 2012-03-31 14:48:35 -07:00
Michael Vogel 59b45f7fc1 Several improvements 2012-03-31 16:28:39 +02:00
friendica 8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
Tobias Diekershoff 17c908973f catch OpenID login errors in cases when the OpenID server does not answers 2012-03-30 15:19:17 +02:00
friendica bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica 87539dbec4 bug #352 - qcomment plugin disabled, qcomments still allowed 2012-03-30 02:22:57 -07:00
friendica e2c295c01f another silly mistake 2012-03-29 21:44:30 -07:00
friendica 9332312ce9 silly mistake 2012-03-29 21:18:47 -07:00
friendica 168cf3b9d4 zrl on mentions 2012-03-29 21:08:10 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 5921dc6f16 typo in function name 2012-03-29 16:01:44 -07:00
friendica 4e4f7ac79f some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
friendica a946b7cea3 Merge branch 'pull' 2012-03-28 19:57:28 -07:00
friendica 7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
Michael Vogel bdd2754740 Merge commit 'upstream/master' 2012-03-28 19:52:30 +02:00
Fabio Comuni 7aec2fd68d filer: info() on item filed 2012-03-28 10:45:16 +02:00
friendica 0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica 20f9733250 don't expire filed items 2012-03-27 00:54:34 -07:00
friendica 4c585f759f theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
friendica b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica b240b8489a language issues in enotify 2012-03-26 01:43:26 -07:00
friendica 021c647673 don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. 2012-03-25 21:43:17 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
friendica 873a55e918 enotify plugin hook 2012-03-25 05:06:11 -07:00
friendica 5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
friendica 6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica d06ddeb1cc bug #346 - add oembed maxwidth to oembed request 2012-03-24 21:26:50 -07:00
friendica 3ae43c2448 prevent duplicate friend suggestions 2012-03-24 15:53:53 -07:00
friendica 3aacc119a1 block filed items from deletion 2012-03-24 04:16:27 -07:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
friendica d81256d7b0 support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
Michael Vogel 792edfe9c8 New parameter in html2plain for plain text exports. More compatibility in API 2012-03-21 10:08:40 +01:00
friendica 6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
friendica 810e69ef0a more friend suggestions 2012-03-20 19:06:26 -07:00
friendica 894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica 5a5aadb743 add IP address to failed login log message 2012-03-19 21:58:21 -07:00
friendica f7e380cdc6 Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27
Smiley removal
2012-03-19 15:56:16 -07:00
Thomas 84f8e2eaa8 modified: include/text.php
Stupid bug fixed
2012-03-19 22:32:19 +00:00
friendica a156ce196e Merge pull request #150 from fabrixxm/master
Add "logging_out" hook
2012-03-19 15:29:32 -07:00
friendica 9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
Thomas e9b33a6f1f modified: include/text.php
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.
2012-03-19 21:59:06 +00:00
friendica 139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
Fabio Comuni ea4be0db89 Merge remote-tracking branch 'friendica/master' 2012-03-19 12:24:40 +01:00
friendica 2349852b4a support "no_smilies" 2012-03-19 03:18:39 -07:00
Simon 283bc51acf Merge pull request #149 from CatoTH/master
Add a missing security token [Using photos as profile photos]
2012-03-19 00:40:51 -07:00
Tobias Hößl 0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00
friendica cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
Michael Vogel 3393d80ac1 API: added max_id 2012-03-18 19:00:24 +01:00
Michael Vogel 77e77027b4 API: Now threading seems to work 2012-03-18 18:21:51 +01:00
Michael Vogel 6f10142b2e API: Seesmic is now working. Optimizing text export. 2012-03-18 17:52:51 +01:00
Tobias Hößl 453b5b46a3 CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) 2012-03-18 15:44:33 +00:00
Tobias Hößl 72894b0e91 replace split() by explode(); split is deprecated 2012-03-18 10:36:49 +00:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
Michael Vogel f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
friendica 94fac6d767 queue optimisation - back off delivery attempts to once per hour after the first 12 hours. 2012-03-17 03:43:02 -07:00
Michael Vogel 8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
friendica 949c6d47b5 add "send pm" link to photo dropdown for Diaspora contacts 2012-03-16 15:19:38 -07:00
friendica 141ae076ad Merge branch 'pull' 2012-03-16 15:08:32 -07:00
friendica 58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -07:00
Simon 1246a40ec2 Merge pull request #141 from CatoTH/master
Private messages - tabindex
2012-03-16 10:54:20 -07:00
Tobias Hößl 75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica 224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica 805087af67 whitespace 2012-03-16 05:41:29 -07:00
friendica be1bd9ff4e notification for disapora comments 2012-03-16 05:19:29 -07:00
friendica 41d595d5bc Merge branch 'pull' 2012-03-15 16:39:21 -07:00
friendica 7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
Michael Vogel b5120888cf html2bbcode: Disabled size conversion 2012-03-15 21:17:51 +01:00
Michael Vogel 9243c9fc14 Merge commit 'upstream/master' 2012-03-15 21:11:58 +01:00
friendica 110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica 5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
Tobias Hößl 59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
Tobias Hößl 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
Fabio Comuni c30342e2f7 add 'loggin_out' hook 2012-03-12 15:58:59 +01:00
friendica 3bc990f718 more save to file backend 2012-03-11 21:32:11 -07:00
friendica 93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
Michael Vogel 6e7a190e91 Mail: Subject are now with working "Re:" 2012-03-12 00:22:12 +01:00
Michael Vogel 2ed6b3531e Removing test exports 2012-03-11 23:29:59 +01:00
Michael Vogel d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
Michael Vogel 9ca5de8c28 Item cache now is one day. 2012-03-11 19:45:28 +01:00
Michael Vogel 9f76d96d46 Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works. 2012-03-11 19:11:25 +01:00
Tobias Hößl 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica 5915325367 bug #328 2012-03-10 18:52:50 -08:00
Michael Vogel 670b571c8a Caching improved. 2012-03-10 18:19:00 +01:00
Michael Vogel 74b3e9f273 Enabled Caching for items. Changed color of tags in diabook. 2012-03-10 15:50:35 +01:00
Michael Vogel e098147c24 New config options if ostatus polling should use the priority in the contacts 2012-03-10 11:29:40 +01:00
Michael Vogel 15916a2cb7 Mail: Removing signatures, gpg, unnecessary line breaks 2012-03-10 09:52:20 +01:00
Michael Vogel 11c29e0cba Merge commit 'upstream/master' 2012-03-09 11:41:23 +01:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica 312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -08:00
friendica 2050f886cc keep tony from talking to himself 2012-03-08 21:14:41 -08:00
friendica 395a9530dc still getting parent relays on remote systems 2012-03-07 18:23:55 -08:00
friendica dd3b3c2454 revup 2012-03-07 15:54:37 -08:00
friendica 7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
friendica 1224e256b1 Merge branch 'pull' 2012-03-06 17:22:13 -08:00
friendica 88cd5800cf [privacy] rework latest fix 2012-03-06 17:21:14 -08:00
Simon L'nu 415ca107fd Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix html reshares when editplain in use

* master:
2012-03-06 18:38:44 -05:00
Simon 1fae778421 Merge pull request #94 from beardy-unixer/master
Documentation changes
2012-03-06 15:24:15 -08:00
Simon decc9e5798 Merge pull request #99 from tomtom84/master
fixes in theme diabook
2012-03-06 15:22:55 -08:00
tommy tomson 6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
friendica 8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
Thomas 67456bad06 Fixed...merged with mainline THEN added beards. 2012-03-06 20:50:38 +00:00
Thomas a265afe7eb added beard smileys 2012-03-06 20:44:53 +00:00
friendica eec4cff84b remove "smilie" expansion for Diaspora logo 2012-03-06 04:28:45 -08:00
friendica 23718bfc25 prevent duplicate likes 2012-03-06 02:17:55 -08:00
friendica c37ffd2999 can_write_wall documentation 2012-03-05 15:04:43 -08:00
friendica fba089012a correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode 2012-03-04 18:50:32 -08:00
friendica 4134fd3dce unused replacement variable displays %1 in all html2bbcode 'code' blocks 2012-03-04 16:26:16 -08:00
Fabio Comuni 685686b3e8 template proc: fix variables regexp 2012-03-03 00:00:38 +01:00
Fabio Comuni aef737f376 template proc: allow isolation of var name between [ and ]
$var.name -> $[var.name]
2012-03-02 15:53:48 +01:00
Fabio Comuni 0bf087c895 template proc: remove unused function and commented out code 2012-03-02 12:36:22 +01:00