Commit graph

1303 commits

Author SHA1 Message Date
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