Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-15 05:33:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
7284 commits 3 branches 64 tags 246 MiB
Commit graph

2151 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
Fabio Comuni
60e5dda1b5 template proc: first optimization 2012-03-02 12:24:35 +01:00
Michael
52ea842e87 html2bbcode: don't convert sizes and fonts. 2012-03-02 10:33:39 +01:00
friendica
f1bf6dcdfb expand multiple heart smilies e.g. <3333 2012-03-02 01:24:20 -08:00
fabrixxm
3a609adfb7 Merge pull request #55 from fabrixxm/master 
Some minor and one majior mod in templates
 2012-03-02 00:00:03 -08:00
friendica
8207272fbc Merge branch 'pull' 2012-03-01 18:54:50 -08:00
friendica
58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
Alexander Kampmann
dd9432903d Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
Fabio Comuni
b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni
ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Alexander Kampmann
e0c659b34b Enabled automated doc building. Changes: 
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
 2012-03-01 11:44:33 +01:00
Fabio Comuni
c462ed9fc5 template proc: avoid a notice and allow template name to include to be passed with a variable value 2012-03-01 11:32:49 +01:00
friendica
bd2c8c92f1 yet more work on notifications 2012-02-29 19:23:01 -08:00
friendica
bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica
21803e0cd3 call time pass by reference deprecated 2012-02-28 14:54:17 -08:00
friendica
4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl
5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Tobias Hößl
3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
Tobias Hößl
1204210c69 wasn't actually changed before 2012-02-28 13:01:58 +00:00
Tobias Hößl
e55d13c2b4 Avoid a notice 2012-02-28 12:56:16 +00:00
friendica
6c0fa7a166 Merge branch 'pull' 2012-02-27 17:18:53 -08:00
friendica
d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Tobias Hößl
e33c2b8f89 Avoid a Notice 2012-02-27 22:08:00 +00:00
Tobias Hößl
35128ef2c9 Avoid a Notice 2012-02-27 22:01:17 +00:00
Fabio Comuni
42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica
153e7beb19 add plugin hooks to enotify 2012-02-26 23:54:04 -08:00
friendica
a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
friendica
89560edde2 Merge pull request #50 from annando/master 
massive changes in mail and design updates in "vier"
 2012-02-26 15:07:34 -08:00
friendica
6ddd444afd Merge pull request #49 from CatoTH/master 
Bugfix for del_config
 2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
friendica
bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
Michael
437e18d7a7 Merge remote branch 'upstream/master' 2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538 Avoid some notices 2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf Bugfix 2012-02-26 20:43:35 +00:00
Tobias Hößl
cbc6ca642a 1 Bugfix (missing $ character) and avoid some notices 2012-02-26 20:41:41 +00:00
root
aa92901b11 Wrong variable name 2012-02-26 14:29:17 +00:00
friendica
5f7858a688 show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr
f3a225437b Comment notifications by e-mail now are threaded 2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f include/items.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
Michael
1cf1870512 poller.php: Test for moving to archive, vier-style: notifications fixed 2012-02-25 19:40:05 +01:00
Michael
dccefb3c36 "vier": The contacts are now working again. Line break before closing bbcodes removed. 2012-02-25 11:00:35 +01:00
friendica
18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica
9441ff5142 string update for 2.38 2012-02-24 22:47:43 -08:00
friendica
a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica
f5c5da742d attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
Michael
01301a6169 Bug fixed where mails where nearly empty. HTML mails can now be received. 2012-02-25 02:37:39 +01:00
Michael
a74b0746b1 multipart messages complete, message-id conversion done. 2012-02-25 01:10:45 +01:00
Michael
0ba45eb745 Sending mail as multipart/alternative (html and plain text) (very basic by now) 2012-02-24 08:50:42 +01:00
Michael
f6320f3319 Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact. 2012-02-24 07:11:26 +01:00
Michael
484a442f2b GIT problems ... 2012-02-23 20:59:34 +01:00
Michael
0409b5cdba Merge remote branch 'upstream/master' 
Conflicts:
	include/bbcode.php
 2012-02-23 20:53:22 +01:00
Michael
311e35731c bbcode.php: A list or quote at the beginning wasn't detected 2012-02-23 20:51:44 +01:00
Tobias Diekershoff
85d09f48d0 fix img tag with size attribute 2012-02-23 11:12:36 +01:00
friendica
d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica
fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
friendica
41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
Michael Vogel
9f92bbb04c Removed the export of markdown articles. That was for testing purposes only. 2012-02-23 07:53:45 +01:00
friendica
808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica
3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
friendica
d75d49a4c1 restore poller normal operation 2012-02-22 20:31:33 -08:00
friendica
58a9c652de Merge pull request #45 from annando/master 
New HTML to BBCode converter, changes to BBCode, nginx support, ...
 2012-02-22 20:21:05 -08:00
friendica
f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica
390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica
a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica
91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica
3f2497ad20 add full email link to notification 2012-02-21 18:10:15 -08:00
friendica
f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
Fabio Comuni
01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica
5910fbf420 fill in notify msg with redirect link after we get the id 2012-02-21 00:02:42 -08:00
friendica
32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -08:00
friendica
b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica
6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica
11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr
3ef6344d41 include/nav.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
fed6330ea6 include/api.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
19fea9c2ce poller.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
7ed1e3f177 acl_selectors.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr
0bca36109a Scrape.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Michael
e2f276881e Some testing stuff 2012-02-20 11:15:22 +01:00
friendica
15e9933ddf include item links in web notification messages 2012-02-19 20:27:32 -08:00
Michael
0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
root
b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael
064c843119 Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes. 2012-02-19 21:07:45 +01:00
Michael
31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
Simon L'nu
49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to / 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-02-19 05:17:26 -05:00
friendica
5734d5f357 change notify messages for web 2012-02-18 03:18:20 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
Fabio Comuni
7bd43613fa oembed: revert changes from 48f5bd492d 2012-02-17 15:34:05 +01:00
friendica
48f5bd492d naked link with no protocol being passed from Diaspora 2012-02-16 23:14:36 -08:00
friendica
2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica
7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica
1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica
ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -08:00
friendica
b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica
d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
fabrixxm
16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni
fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica
134fdda75f refactor smilie code to allow for extensions and generation of a table of the entire list 2012-02-14 15:31:08 -08:00
Vasudev Kamath
e4b1c07727 cry, foot in mouth, cool, undecided and embarassed smiley's are mapped 2012-02-14 23:10:11 +05:30
friendica
803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica
23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica
dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
Fabio Comuni
850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
friendica
85c831bcbf finish translation of 'xxxxx wrote:' 2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr
9697e82331 Merge branch 'master' into bbcode 2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr
135005571f Added [th] bbcode tag support. 2012-02-12 17:27:08 -08:00
friendica
3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr
e575a3a02c Fixed bbcode [li] and [*] handling. 2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr
10e66d293d Added [quote=Name] bbcode support. 2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr
3a07973ffa Added [center] bbcode support. 2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr
74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px). 
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
 2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr
92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. 2012-02-12 14:35:29 -08:00
friendica
330a876d81 bug #281 2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr
6a17a3a8e2 Added support for [ol] standard ordered list bbcode. 2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr
5479142efc Added support for [ul] standard unordered list bbcode. 2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr
5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes 2012-02-12 06:13:49 -08:00
Vasudev Kamath
495d0fb80f Merge branch 'master' of git://github.com/friendica/friendica 2012-02-12 15:06:41 +05:30
Vasudev Kamath
cbf53beec1 ;) :D and :-O are also enabled for wink laugh and surprised smiley's 2012-02-12 15:06:12 +05:30
friendica
8b101c6cb8 do not display contact_block if config for num shown is 0 2012-02-11 23:49:05 -08:00
friendica
bb19c8ba4e kissing smilie may need escaping (thanks - Abinoam) 2012-02-11 21:46:48 -08:00
friendica
75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
friendica
d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
Fabio Comuni
ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica
b346f4464c send notify emails to community pages as well as people 2012-02-10 00:08:23 -08:00
friendica
2f2e331c33 bug #274 2012-02-09 22:44:59 -08:00
friendica
ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica
5859f9dcf6 add render_location hook to both sets of conversations 2012-02-09 18:09:28 -08:00
friendica
7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica
ec26f88be9 render_location hook 2012-02-09 15:02:59 -08:00
friendica
171249966e add tag notifications to enotify 2012-02-09 14:06:17 -08:00
friendica
c506bb42a9 :coffee extended smilie 2012-02-07 17:03:09 -08:00
friendica
8a3c1f7930 beer smilie 2012-02-07 15:41:06 -08:00
friendica
a869bd2fe5 don't link tags enclosed inside Diaspora links 2012-02-07 02:16:28 -08:00
friendica
2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica
3d099bd99a beer 2012-02-06 01:08:00 -08:00
friendica
4cf6bd5469 do an optimise after an expunge 2012-02-02 18:02:08 -08:00
friendica
9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica
86c0eac27d transport for email contacts phase II 2012-01-31 20:03:46 -08:00
friendica
4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica
c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica
d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica
5161be67e9 logging of manage identities 2012-01-27 12:56:36 -08:00
friendica
94b9e9ce6d for people whose DB's are not updating 2012-01-26 23:08:51 -08:00
friendica
3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica
8fe5168259 restore diaspora test mode 2012-01-26 20:46:42 -08:00
friendica
167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica
10f768630b D* event formatting 2012-01-25 15:16:43 -08:00
friendica
e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica
dae0c1ded2 more robust cache api handling (was throwing errors on occasion) 2012-01-24 17:04:49 -08:00
friendica
8ff2bb4cd3 backtrace errant input to base64url_decode 2012-01-24 16:45:58 -08:00
friendica
3a1a4d62d9 bug #254 2012-01-24 16:23:30 -08:00
friendica
a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
friendica
1f074cb44c shaka, slackr theme 2012-01-23 15:07:40 -08:00
Fabio Comuni
9047840ec2 nav: fix "See all notifications" 2012-01-23 09:23:37 +01:00
friendica
11aa83742e more logging of D* photo transactions 2012-01-22 15:25:29 -08:00
Fabio Comuni
30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01:00
friendica
b5ec475906 bug #253 use MSQLI_ASSOC, not MYSQL_ASSOC 2012-01-21 14:07:28 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
d840943621 use reltoabs - primarily for github activity feeds 2012-01-17 16:30:32 -08:00
friendica
e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica
4b6990e1ff modularise successful authentication 2012-01-12 15:46:39 -08:00
friendica
aa1c28cf39 fine tuning diaspora markdown to bbcode 2012-01-11 22:49:17 -08:00
friendica
6573c94d6c modified item_photo_menu hook 2012-01-11 17:34:02 -08:00
friendica
c5f41d8b6c fix D* links+text smushed together 2012-01-11 14:03:27 -08:00
friendica
cf7008e575 post preview to loozah 2012-01-10 17:47:11 -08:00
friendica
7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica
a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica
3bdcb52471 markdown bug is Diaspora's. We can't fix it. 2012-01-08 17:20:03 -08:00
friendica
df0f7ef560 make network_to_name extensible 2012-01-08 02:08:20 -08:00
friendica
977a49ad93 fix images with links going to diaspora, the D* markdown processor changed and these are no longer working. 2012-01-08 00:57:36 -08:00
friendica
358b2a46f5 fix photo top view in testbubble, extend network_to_name 2012-01-07 13:00:06 -08:00
fabrixxm
ad02af4e8f Merge pull request #23 from fabrixxm/master 
Theme works
 2012-01-06 00:42:06 -08:00
friendica
cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
Fabio Comuni
f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni
efe308b5ac Use html5 placeholder for title text input 2012-01-06 09:11:25 +01:00
Fabio Comuni
a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
5b809328af send diaspora share notification back to originator for auto friending 2012-01-05 13:25:43 -08:00
friendica
47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica
d0b743529d support auto-friend page types for Diaspora 2012-01-04 14:30:25 -08:00
friendica
c1cf6e48c2 Allow Diaspora to post to forums 2012-01-04 13:50:12 -08:00
friendica
48a5a2484e new smiley 2012-01-04 00:04:19 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
friendica
c583d16209 fix reference variable effects on sorting 2012-01-03 14:27:00 -08:00
Fabio Comuni
93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica
184230e068 check count before foreach 2012-01-02 22:58:09 -08:00
friendica
f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica
4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
Fabio Comuni
1fbffc76b1 text: "turn off" logger() if module is "install" 2012-01-02 20:11:06 +01:00
Fabio Comuni
85fbdb00ac dba: leave unconnected if $server and $user are not defined 2012-01-02 20:10:23 +01:00
Fabio Comuni
f35109827b datetime: new field_timezone() function, new template field_select_raw.tpl 
returns a timezone select like select_timezone() but using template field_select_raw.tpl.
field_select_raw get options html as forth argument, instead of array value=>label like field_select
 2012-01-02 20:09:25 +01:00
Fabio Comuni
be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica
0afb636e46 change default ostatus poll interval 2012-01-01 11:45:56 -08:00
friendica
3e162bcf8f function not defined 2011-12-30 20:48:49 -08:00
friendica
a76be1934a migrate more notifications 2011-12-29 22:32:30 -08:00
friendica
da21473c34 add notifications to d* private messages 2011-12-27 15:49:47 -08:00
friendica
0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica
5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica
356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica
bb40e54dec new notification module working for "email message received" 2011-12-25 23:00:19 -08:00
friendica
170b841834 more enotify 2011-12-25 16:20:53 -08:00
friendica
bef8f95ef3 more enotify 2011-12-24 22:36:17 -08:00
friendica
0b598dedd0 more work on enotify 2011-12-23 23:07:05 -08:00
friendica
949d3f0ff1 preparation for 3rd generation email contacts 2011-12-23 01:38:06 -08:00
friendica
95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni
0dce36bdbc Merge remote-tracking branch 'friendica/master' 2011-12-22 16:35:58 +01:00
Fabio Comuni
0b4535e6da quattro: more on editor 2011-12-22 11:24:34 +01:00
friendica
dacbbfaafb bug #188 diaspora_signed_retraction not removing post 2011-12-21 14:42:12 -08:00
Fabio Comuni
7f2070ca91 Merge remote-tracking branch 'friendica/master' 2011-12-21 17:37:35 +01:00
friendica
7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
Fabio Comuni
ba732c97c1 Merge remote-tracking branch 'friendica/master' 2011-12-20 17:18:19 +01:00
Fabio Comuni
f3b499f119 quattro: more on editor 2011-12-20 17:17:17 +01:00
friendica
63f66a5a93 bug 244 multiple birthday reminders from Diaspora if profile changed repeatedly 2011-12-19 19:06:25 -08:00
friendica
79f3bbbf2b more data checking, cleans up some infrequent php errors 2011-12-19 16:51:57 -08:00
friendica
7c6bc5a93d invalid thread-id in "nouveau" mode of conversation, bug 245 2011-12-19 13:51:55 -08:00
Fabio Comuni
2a3f94e452 Merge remote-tracking branch 'friendica/master' 2011-12-19 18:04:04 +01:00
Fabio Comuni
a6f3b58293 config: set/get arrays with pconfig 2011-12-19 18:01:38 +01:00
friendica
ad54a91d4d poco_load aborting after debug statement 2011-12-19 00:40:00 -08:00
friendica
dc46a01cd4 suggest query for no friends messed up 2011-12-18 13:03:20 -08:00
friendica
e6b538c046 add webfinger addr to gcontact for friend "connect" links 2011-12-18 00:50:17 -08:00
friendica
22d59350e9 improve the email regex a bit more 2011-12-16 14:31:39 -08:00
friendica
690b3f57b7 bug 241 - valid emails may contain + on lhs 2011-12-16 14:06:50 -08:00
friendica
193435e980 default suggestions not being collected properly 2011-12-15 13:52:52 -08:00
friendica
cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica
50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica
834639ebab \o/ smiley 2011-12-11 16:58:36 -08:00
friendica
5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica
3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica
7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica
0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica
be8e9d3616 d* pm 2011-12-06 00:16:13 -08:00
friendica
adbc84c48e maintain backward compatibility with old PMs 2011-12-05 14:06:41 -08:00
friendica
c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica
116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica
6fc9eae9de more d* PM stuff 2011-12-04 17:26:55 -08:00
friendica
fb01d8bec5 fix incorrect default author 2011-12-04 03:54:40 -08:00
friendica
fb437a874e typo 2011-12-04 03:50:26 -08:00
friendica
f6dd834284 fix author-name when missing on comments 2011-12-04 03:45:09 -08:00
friendica
513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
friendica
ac3df5fece dynamic group edit buttons 2011-12-01 16:33:53 -08:00
friendica
29b5d398fd everybody group gets id 0 2011-11-30 23:01:42 -08:00
friendica
37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica
8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica
aa73d38845 begininning d* conversation mode 2011-11-29 01:19:09 -08:00
friendica
034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica
ccef899577 start of d* private mail, dba without mysqli 2011-11-27 17:41:23 -08:00
friendica
d9e1ebfc48 wrong length in image extractor 2011-11-27 14:03:49 -08:00
friendica
1055ef3eea more readable private image extraction for bypassing preg limits 2011-11-27 13:44:45 -08:00
friendica
cf7568efd7 extract private images before bbcode translation since preg has issues with large data sizes. 2011-11-27 04:09:14 -08:00
friendica
0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica
4b95e8ebe8 rework the liveupdate fixes - what a mess 2011-11-24 18:26:06 -08:00
friendica
9e8053e3bd fixing conversation updates 2011-11-24 16:42:12 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
335c0cddcf diaspora reshared lists rendering as html 2011-11-23 01:44:07 -08:00
friendica
53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00
friendica
c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni
cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni
a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica
aaedac8f57 community forums cleanup 2011-11-19 13:45:20 -08:00
friendica
191a9b048f forum cleanup 2011-11-19 03:13:46 -08:00
friendica
72dd6457b0 first forum test 2011-11-19 03:06:15 -08:00
friendica
6463543832 new approach to secondary delivery fork 2011-11-18 22:20:08 -08:00
friendica
fd4fe24406 Merge branch 'master' into groups 2011-11-18 22:04:41 -08:00
friendica
6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
Fabio Comuni
590f1d2b25 log less in expire items 2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146 expire settings for items, notes and photos. 
show default privacy acl in popup
 2011-11-17 15:53:59 +01:00
Fabio Comuni
844a36e2b6 Merge remote-tracking branch 'friendica/master' 2011-11-17 13:40:27 +01:00
Fabio Comuni
02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
friendica
c9846b745d allow dup tag names with different urls 2011-11-16 17:09:58 -08:00
fabrixxm
d0bf9d371c Merge pull request #6 from fabrixxm/master 
small fix
 2011-11-16 02:30:38 -08:00
Fabio Comuni
ef8b5bc682 fix localize item tag 2011-11-16 11:27:20 +01:00
friendica
7b58de743a add a few more sql indexes 2011-11-15 23:12:56 -08:00
friendica
485f97b3d8 tgroup relays 2011-11-15 20:30:34 -08:00
Fabio Comuni
962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
friendica
973620a9e6 translate vimeo and youtube bbcode to naked links so D* will oembed them again 2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
friendica
02b11c5d59 several little nits in the hcard template output which could affect parsers 2011-11-12 12:28:21 -08:00
Friendika
58ba7c3969 Merge branch 'pull' 2011-11-12 04:12:03 -08:00
Friendika
cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
friendica
ab6bf767df Merge pull request #3 from fabrixxm/master 
fix for #191 and some other
 2011-11-12 04:06:14 -08:00
Friendika
d23867f5a0 incorrect total use for get_feedtags 2011-11-12 02:53:53 -08:00
Fabio Comuni
1ff8cddeb6 oembed: replace base64 url for iframe with url site/oembed/url_encoded 
fix http://bugs.friendika.com/view.php?id=191
 2011-11-11 17:33:32 +01:00
Friendika
02f21fb74c some testbubble fixes 2011-11-10 19:53:13 -08:00
Friendika
199da623ff testbubble showing post jot-tools on edit page - these are not changed so should not be visible 2011-11-10 18:20:25 -08:00
Friendika
83e55cf9f4 bbcode list styles 2011-11-09 19:32:54 -08:00
Friendika
15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika
05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
Friendika
20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika
02a1fdacd7 strip duplicate code blocks bb2d* 2011-11-08 15:38:06 -08:00
fabrixxm
eeec29c6be Merge pull request #2 from fabrixxm/master 
Oauth1 support in API
 2011-11-08 00:18:37 -08:00
Friendika
9fabdbf2c9 D* scaled images not containing link to original size 2011-11-07 20:41:12 -08:00
Friendika
99a548d4ac fix friend suggest link in testbubble 2011-11-07 17:25:40 -08:00
Fabio Comuni
00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni
41cbd84a74 api: login with oauth 2011-11-07 17:36:58 +01:00
Fabio Comuni
10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika
327105a4ea try and fix diaspora multiple items queued issue 2011-11-06 16:48:13 -08:00
Friendika
f07c0b2cfb implement signed_retractions 2011-11-05 14:45:29 -07:00
Friendika
a203820efe reduce polling load 2011-11-04 15:21:46 -07:00
Friendika
0130052b2c bbcode lists 2011-11-03 21:30:01 -07:00
Friendika
014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika
bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Fabio Comuni
69e41f7703 oauth: authorize view, wrong verifier. 2011-11-02 09:54:07 +01:00
Friendika
e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika
158028a0ac first cut friend suggestions 2011-11-01 20:29:55 -07:00
Friendika
3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika
0975ea8610 add attachments to Diaspora posts 2011-11-01 17:30:52 -07:00
Friendika
573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika
ae7425dadb don't send diaspora profile updates in batch mode 2011-11-01 14:24:56 -07:00
Friendika
05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika
f4518c646a fixes to diaspora profiles, batch mode duplicates, social graph table name 2011-11-01 00:50:41 -07:00
Friendika
e28b143fb6 perform poco_load 2011-10-31 20:54:24 -07:00
Friendika
d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika
e4dd2a5a9a begin the name change 2011-10-28 17:29:13 -07:00
Friendika
b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika
2914ffb396 log scale_diaspora_image 2011-10-28 04:35:10 -07:00
Friendika
e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika
e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika
ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Friendika
abe96155b4 hmmm - why won't poco xml work 2011-10-27 01:54:52 -07:00
Fabio Comuni
ff7fc68382 oauthapi: authorize app 2011-10-26 17:15:36 +02:00
Fabio Comuni
dc212de960 Merge remote-tracking branch 'friendika/master' 2011-10-26 12:15:38 +02:00
Friendika
6d6136cdb5 fix diaspora cache 2011-10-25 20:30:01 -07:00
Friendika
d9f64deda0 sql error 2011-10-25 20:05:21 -07:00
Friendika
72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Fabio Comuni
afce790e56 oembed: wrap in iframe only html from remote service 2011-10-25 14:59:31 +02:00
Friendika
ae12074337 fix tag import for tag owner 2011-10-24 23:55:29 -07:00
Friendika
318f179408 D* formatting updates [code/blockquote] 2011-10-24 21:29:57 -07:00
Friendika
b20afbc9e4 @ tags becoming # tags during atom transit 2011-10-24 20:33:54 -07:00
Friendika
1a7badb405 use iframe for oembed - untrusted content 2011-10-24 20:10:46 -07:00
Friendika
790c4a4e1a tag display with item 2011-10-24 17:25:49 -07:00
Friendika
4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika
ea9d3b06f6 Merge pull request #35 from fabrixxm/master 
Use oembed if possible without the addon

Awesome!
 2011-10-24 15:49:28 -07:00
Friendika
3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni
2905df527f fix oembed video thumb display ratio 2011-10-24 17:31:14 +02:00
Fabio Comuni
40ea48bdab fix vimeo oembed bbcode regexp 2011-10-24 17:28:48 +02:00
Fabio Comuni
75d4f33233 move html for oembeded videos in template. fix oembed discovery 2011-10-24 17:28:28 +02:00
Fabio Comuni
ac474cf53c try to use oembed on vimeo tag 2011-10-24 14:39:39 +02:00
Fabio Comuni
a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika
f48fd5aa16 more tagging 2011-10-24 04:17:46 -07:00
Fabio Comuni
306036c626 cache api 2011-10-24 13:02:38 +02:00
Friendika
fe2c8a1845 Merge branch 'master' into tag 2011-10-23 19:06:04 -07:00
Friendika
3512adda33 never enough comments 2011-10-23 19:05:32 -07:00
Friendika
6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika
0b2c5bf8f5 fix queue_fns 2011-10-23 01:54:51 -07:00
Friendika
7cbb69d87f tagging 2011-10-23 00:24:37 -07:00
Friendika
0ada550a02 queue indexes 2011-10-22 01:29:26 -07:00
fabrixxm
a06c9768be Merge pull request #34 from fabrixxm/master 
fixs to oembed
 2011-10-21 07:32:12 -07:00
Fabio Comuni
6769436f3b oembed. fix html2bbcode when oembed html contains span and utf8 chars 2011-10-21 16:26:29 +02:00
Friendika
6e76c86ad2 queue api + queue limits 2011-10-21 03:33:34 -07:00
Friendika
d1833cabf6 fix hex2bin for empty input 2011-10-20 19:11:34 -07:00
Friendika
01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Fabio Comuni
b06588ffa1 Initial work adding oauth to api 2011-10-20 15:57:35 +02:00
Friendika
da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika
96c0598737 diaspora_reshare - even more logging 2011-10-20 03:56:10 -07:00
Friendika
796056f810 provide link to missing d* images 2011-10-20 02:21:57 -07:00
Friendika
852ece39f4 more reshare logging to see what's going on 2011-10-20 02:07:38 -07:00
Friendika
33af8b0e20 diaspora_reshare - another try 2011-10-20 01:16:03 -07:00
Friendika
df996a8b5e fix for errant top-level posts from feeds 2011-10-19 21:54:33 -07:00
Friendika
c4179d989f more debug reshare 2011-10-19 21:34:48 -07:00
Friendika
10b2661176 suppress blank diaspora messages which are awaiting a photo that hasn't arrived 2011-10-19 15:18:41 -07:00
Friendika
19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika
1148cbab22 fix img link format diaspora share/asphoto 2011-10-19 00:29:43 -07:00
Friendika
9043e704f8 diaspora reshares 2011-10-18 15:56:35 -07:00
Friendika
32808a934d string update 2011-10-18 04:28:36 -07:00
Friendika
fb5bddb98f a few issues with diaspora_profile 2011-10-18 01:12:51 -07:00
Friendika
42a9817350 "cubbi.es" 2011-10-17 17:39:25 -07:00
Friendika
f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07:00
Friendika
278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Fabio Comuni
de44072172 works on login form 2011-10-17 16:53:59 +02:00
Fabio Comuni
2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Friendika
5dcc10a5d9 working on long-term solution to relay issue 2011-10-15 03:26:37 -07:00
Friendika
af6ab38100 diaspora birthday notifications 2011-10-14 00:20:37 -07:00
Friendika
05e26e4895 handle diaspora profile update message 2011-10-13 18:32:02 -07:00
Friendika
89c771a26e remove queued items for contact when removing contact 2011-10-13 15:39:05 -07:00
Friendika
4eae1e5d8a don't propagate deletions for other people's stuff 2011-10-13 15:32:43 -07:00
Friendika
2911bf9434 sql issue item_store 2011-10-13 01:00:06 -07:00
Friendika
3db43d5a39 storage race condition 2011-10-12 02:21:18 -07:00
Friendika
3ef7dcac4b solve intro/notify naming issue by providing both or either, theme decides what to do 2011-10-11 20:38:09 -07:00
Friendika
2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget 
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
 2011-10-11 19:27:58 -07:00
Friendika
557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Fabio Comuni
e9eb15373f Remove full profile html from php and add new template 'profile_advanced.tpl' 2011-10-10 16:48:38 +02:00
Friendika
3174847de8 bug #177 - birthday month on profile incorrect if October or later and no year 2011-10-10 01:03:34 -07:00
Friendika
1d05c564d4 missing arg to diaspora_transmit from share/unshare 2011-10-07 15:49:41 -07:00
Devlon Duthie
f5fc8dabe5 Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme 2011-10-07 01:25:08 -05:00
Friendika
2802c142cb local_deliver testing 2011-10-06 19:10:57 -07:00
Friendika
53efeb8d1f local deliver 1 2011-10-06 17:27:37 -07:00
Friendika
ce11d231b8 use strpos instead of strstr, faster 2011-10-05 21:04:53 -07:00
Friendika
d0bef869db ensure D* photos only attached once 2011-10-05 21:02:00 -07:00
Friendika
4c0ee7f41f bug 173 2011-10-05 20:48:00 -07:00
Friendika
7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika
7df6cb850e Merge branch 'pull' 2011-10-05 15:37:17 -07:00
Friendika
b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Tobias Diekershoff
feaba3d300 point Diaspora* to the foundation homepage instead of joindiaspora.com 2011-10-05 21:01:48 +02:00
Friendika
924d419378 added prepare_body hooks 2011-10-05 02:35:25 -07:00
Friendika
6c521017f5 document backward compat issue 2011-10-04 22:03:57 -07:00
Friendika
ab50521971 yikes 2011-10-04 22:00:45 -07:00
Friendika
7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
Friendika
aeb83fa063 document multi-pass mode on consume_feed 2011-10-04 04:38:58 -07:00
Friendika
07b09300a9 improve feed import performance 2011-10-04 03:06:34 -07:00
Friendika
c6ac438735 item_store: prevent storing a duplicate item with same uri+uid 2011-10-03 06:04:17 -07:00
Fabio Comuni
4d5580ab77 fix typo 2011-10-03 09:38:58 +02:00
Fabio Comuni
2465b3274a Merge remote-tracking branch 'friendika/master' 2011-10-03 08:13:40 +02:00
Friendika
8f9656da92 basic support for AS friend requests 2011-10-02 16:18:01 -07:00
Friendika
7c1968907d attack of the zombie orphans 2011-10-02 05:32:05 -07:00
Fabio Comuni
60e0f79b9f Merge remote-tracking branch 'friendika/master' 2011-09-30 14:31:20 +02:00
Fabio Comuni
dfb3ee6e29 fix star icon viewing profile page as unlogged user 2011-09-30 14:31:01 +02:00
Friendika
52557b011d possible sql errors 2011-09-29 21:56:44 -07:00
Friendika
097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Friendika
c1221cc052 add display_item hook to 'search|new' message display 2011-09-29 15:52:31 -07:00
Friendika
ffa3b67365 fix nav-selected duepuntozero 2011-09-28 23:10:23 -07:00
Friendika
a1786cbf61 fixes for statusnet/identi.ca empty vcard page - which appears to be deprecated. Scrape the feed for everything we used to get from the vcard. 2011-09-28 04:35:44 -07:00
Fabio Comuni
41617ee987 fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme 2011-09-28 10:30:32 +02:00
Fabio Comuni
c120cc8ea9 added missing "delete selected items" link 2011-09-28 09:32:53 +02:00
Fabio Comuni
dccd2da356 Merge remote-tracking branch 'friendika/master' 2011-09-28 09:27:59 +02:00
Friendika
4f9c072d66 requeue deliveries on 503 errors which have 'retry-after' headers 2011-09-27 19:27:47 -07:00
Fabio Comuni
e986fc3e30 quattro: actions in wall_item 
less html in conversation.php
removed unused tpls
fixed old themes
 2011-09-27 16:54:33 +02:00
Friendika
25ac93f44d Merge pull request #3 from fabrixxm/master 
Works on UI
 2011-09-27 01:04:54 -07:00
Friendika
8d3910c78c sql error diaspora re-queue 2011-09-27 00:58:59 -07:00
Fabio Comuni
e9638b6980 Adds theme info file to define 'parent' theme from where load tpl files 2011-09-27 09:32:20 +02:00
Fabio Comuni
939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Friendika
e04d9b8646 bug #165 2011-09-26 23:39:47 -07:00
Friendika
ec16525c86 expire expired accounts from poller 2011-09-26 05:43:22 -07:00
Fabio Comuni
8d93eefea8 remove global $lang var in templates. can't work as intended 2011-09-26 12:18:39 +02:00
Fabio Comuni
968e7bb3b1 Fixes for testbubble 2011-09-26 11:48:02 +02:00
Fabio Comuni
5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika
116fc7fcf2 zot endpoint 2011-09-26 02:25:43 -07:00
Devlon Duthie
3426ce5f94 Merge remote-tracking branch 'upstream/master' 2011-09-25 13:30:55 -05:00
Devlon Duthie
cb1c6dd1e3 really commiting files this time, still getting the hang of git. 
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
 2011-09-25 13:20:19 -05:00
Friendika
6a9e22550d . 2011-09-24 05:45:34 -07:00
Friendika
3a2bf8ab7c w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator 2011-09-23 03:12:31 -07:00
Friendika
d6b446d63f starting the big delivery shakeup 2011-09-22 04:11:39 -07:00
Friendika
542aa22eb9 provide ability to unset session language 2011-09-21 16:00:17 -07:00
Friendika
030e1e82c3 finish up ability to switch languages without function collision 2011-09-21 15:37:16 -07:00
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Friendika
11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika
9115e9c90b no need to scrape Twitter profile photo from page - it's no longer there. 2011-09-20 18:07:33 -07:00
Friendika
8294dde936 typo in Twitter probe update 2011-09-20 17:59:18 -07:00
Friendika
38444aedd7 improvements to Twitter probe 2011-09-20 17:56:44 -07:00
Friendika
1c8e89bd03 social bookmark API, oexchange enhancements 2011-09-20 16:31:45 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika
9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika
c2ccb78869 template escapes 2011-09-19 19:51:14 -07:00
Friendika
63277b57fc template escapes 2011-09-19 19:46:18 -07:00
Friendika
97deaa3118 resume strict verification of Diaspora messages 2011-09-19 03:36:41 -07:00
Friendika
fd18b42a5a Check all keys before use 2011-09-19 03:30:59 -07:00
Friendika
2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika
48ee3fa3b9 build diaspora public (batch) message 2011-09-18 20:17:44 -07:00
Friendika
5b3f645939 account expiration structures 2011-09-18 19:53:45 -07:00
Friendika
8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika
e2e29b2dea only header encode if necessary 2011-09-18 17:16:02 -07:00
Friendika
5899c9f406 bug #157 - allow deleted group to be revived, but warn of side effects 2011-09-18 06:20:18 -07:00
Friendika
da05ef2ae4 rfc2047 encode notification email headers 2011-09-18 04:34:17 -07:00
Friendika
309df84172 again fix bbcode image sizes 2011-09-18 00:19:19 -07:00
Friendika
5f4ab62fe3 fix bbcode image size 2011-09-18 00:16:18 -07:00
Friendika
ce77c7287e show real profile link location on hover 2011-09-16 15:40:34 -07:00
Friendika
6c4ad7df3a public D* post fix 2011-09-16 14:57:41 -07:00
Friendika
d7243be2ea log the D* publc messages 2011-09-16 14:51:25 -07:00
Friendika
5a6a3cab8e may fix diaspora send 2011-09-16 14:46:04 -07:00
Friendika
9b5d5eca07 Merge branch 'friday' 2011-09-16 06:51:33 -07:00
Friendika
9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Fabio Comuni
6b6f45f9f1 quattro: initial style of conversations 2011-09-16 12:51:14 +02:00
Fabio Comuni
9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika
80f94bb12b federation friday update 2011-09-15 17:47:16 -07:00
Fabio Comuni
d9bce6b852 Fix issue 151 2011-09-15 11:05:09 +02:00
Friendika
cdf2fe859f don't escape underscore within links going to diaspora 2011-09-14 21:35:13 -07:00
Friendika
1778e4a315 bloody ampersands 2011-09-14 20:47:49 -07:00
Friendika
5c0e135fe9 diaspora protocol changes 2011-09-14 19:33:42 -07:00
Friendika
1248a561e1 group_public_members sql query typo 2011-09-13 15:26:47 -07:00
Friendika
43da1429cc import image sizes from html source 2011-09-13 04:53:17 -07:00
Friendika
08fc3e91b6 bug #148 email subscription issue 2011-09-12 22:24:36 -07:00
Friendika
ff572487a3 smilie hook 2011-09-12 03:21:39 -07:00
Friendika
17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika
7a06c7c3bf bug #146 - br HTML tags showing up in events 2011-09-11 15:44:07 -07:00
Friendika
0e441fe196 bug #147 comments not working on private notes page 2011-09-11 15:09:57 -07:00
Friendika
0c0a604396 block imap function from spitting out errors to the page 2011-09-10 03:14:00 -07:00
Friendika
ebb9af8946 One day we'll have ignored all purely numeric hashtags like #33. Found yet another edge case. 2011-09-09 17:35:26 -07:00
Friendika
d7a2ab9c1f send profile visits to 'redir' window 2011-09-09 16:22:32 -07:00
Friendika
f5c9de19d5 network insecure warnings on feeds 2011-09-09 01:37:46 -07:00
Friendika
1e8b3278b0 share not available in display module, as no editor window to paste into 2011-09-08 22:07:16 -07:00
Friendika
3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni
49ffd30e1c global lang array in templates 2011-09-08 14:09:45 +02:00
Friendika
fdd372a798 speed up friend requests and avoid parse errors by using hcard address instead of profile url 2011-09-07 22:49:58 -07:00
Friendika
a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni
20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni
0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika
e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika
260d652168 scrape_url - use feed url if no name can be found 2011-09-04 05:07:25 -07:00
Friendika
1d01b3a088 Merge branch 'pull' 2011-09-04 00:51:42 -07:00
Friendika
9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika
c0a2cc3e98 diaspora has no timezone - use UTC for events 2011-09-03 07:40:05 -07:00
Friendika
59a6a04e26 format events for diaspora 2011-09-03 07:13:12 -07:00
Friendika
c8f61ef890 no plink on imported D* posts 2011-09-03 05:23:36 -07:00
Friendika
b026dcb860 match bbcode multiline 2011-09-03 04:36:45 -07:00
Friendika
93b9d71377 completely enclose ~f hashtags so they don't get hijacked by D* 2011-09-02 05:13:38 -07:00
Friendika
1621630b06 login_hook 2011-09-01 06:29:29 -07:00
Friendika
0cfc8570d2 save plink for diaspora items so likes will point to right post 2011-08-31 21:46:37 -07:00
Fabio Comuni
8b615133d5 remove html from profile vcard code 2011-08-31 17:31:44 +02:00
Fabio Comuni
5ce6f893a6 Apps popup menu in navbar 2011-08-31 16:18:03 +02:00
Friendika
c60d45752d translate D* images (markdown) before links, they overlap and conflict 2011-08-30 23:24:45 -07:00
Friendika
f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika
b11a0efff1 This *might* fix Diaspora @ tags - or it might not. 2011-08-30 20:20:17 -07:00
Friendika
f0a4a6af61 relayed likes did not verify 2011-08-30 19:20:56 -07:00
Friendika
f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Fabio Comuni
d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika
0f1bc6e957 log every possible diaspora return for posts and comments 2011-08-29 22:50:41 -07:00
Friendika
454882812e wrong time format string, 24hr clock 2011-08-29 18:01:59 -07:00
Friendika
7e79b140f0 don't deliver on first pass if already queued 2011-08-29 17:52:31 -07:00
Friendika
177e0e15d7 allow zero delivery interval on dedicated servers 2011-08-29 00:59:44 -07:00
Friendika
391330d95f better handling of relayed Diaspora comments 2011-08-29 00:51:08 -07:00
Friendika
bfc708e07b logging on notifier 2011-08-28 23:05:06 -07:00
Friendika
88e6e4699a Merge branch 'pull' 2011-08-28 23:01:42 -07:00
Friendika
51615f57ac flag top level post 2011-08-28 23:00:45 -07:00
Friendika
b61d535f81 remove item from queue 2011-08-28 22:59:49 -07:00
Friendika
846c4cea7c implement delivery queue in case notifier gets killed 2011-08-28 21:41:42 -07:00
Friendika
f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika
030dcbd467 Merge branch 'pull' 2011-08-28 05:05:32 -07:00
Friendika
4572f32603 cleanup 2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b allow comment relaying for comments which were never Diaspora signed 2011-08-28 05:00:30 -07:00
Friendika
ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
fabrixxm
3bbdbee87c Merge pull request #163 from fabrixxm/master 
API and IT translation: smal fixes
 2011-08-27 00:10:25 -07:00
Friendika
721db93e84 check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up 2011-08-26 17:52:24 -07:00
Friendika
144f241c5d fix bad embeds 2011-08-26 15:21:21 -07:00
fabrixxm
fcf45db075 API: fix friends profile, statuses etc 2011-08-26 16:35:51 +02:00
Friendika
506853adcd break up delivery into per-person processes 2011-08-26 07:29:22 -07:00
Friendika
1861dc1fae don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error 2011-08-26 01:32:22 -07:00
Friendika
a4739aef91 more logging diaspora pubdeliver 2011-08-25 20:35:55 -07:00
Friendika
c15c53d307 one more little tweak to linkificator 2011-08-25 20:12:56 -07:00
Friendika
5eb08d43b6 tweak to bbcode linkificator 2011-08-25 20:09:32 -07:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
1b33ba6587 third attempt to get rid of this stupid warning 2011-08-25 06:01:40 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Friendika
8f6ae2b660 missing salmon key? report it. 2011-08-24 20:40:08 -07:00
Friendika
d6f9e0e2a4 change the way public feeds work just to fix statusnet's bug, because they won't 2011-08-24 05:58:31 -07:00
Friendika
a775474dff cleaned up the conditions on when to and when not to relay. 2011-08-24 04:42:28 -07:00
Friendika
b6fdd3c76b turn off notifier - runaway 2011-08-24 01:55:34 -07:00
Friendika
2aa23843e4 D* queue 2011-08-24 01:21:24 -07:00