friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
3,056 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

974 Commits

Author SHA1 Message Date
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
Friendika 2cfdcee29a author and owner sign exactly the same string - apparently 2011-08-23 19:54:35 -07:00
Friendika b57a01dc14 that was ugly - let's do better 2011-08-23 19:42:45 -07:00
Friendika 838d89a110 fix for public posts to D* 2011-08-23 19:40:50 -07:00
Friendika 6a052c3586 correct time in photo msg 2011-08-23 19:01:08 -07:00
Friendika c1acea330c photo fixes 2011-08-23 18:50:18 -07:00
Friendika 3b4da00495 fix it again 2011-08-23 18:28:17 -07:00
Friendika b41592f556 fix group public members 2011-08-23 18:22:15 -07:00
Friendika 56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
Friendika 91de9edecd retractions - precedence issue 2011-08-23 04:02:29 -07:00
Friendika 99681e33af testing retractions 2011-08-23 03:49:38 -07:00
Friendika 0739ae315b typo 2011-08-23 03:07:26 -07:00
Friendika afbc46c00f don't process diaspora communications if no pubkey 2011-08-23 03:06:08 -07:00
Friendika 8cfbe2c432 include bb2diaspora at top level 2011-08-23 03:02:31 -07:00
Friendika 92504b5df7 more testing with images 2011-08-23 01:55:46 -07:00
Friendika c55d24b451 second try 2011-08-23 01:52:59 -07:00
Friendika 124881903e forget about the image link we have it in the wrapper 2011-08-23 01:51:37 -07:00
Friendika 508f22f859 photos a bit messed up on d* 2011-08-23 01:47:42 -07:00
Friendika c1a1b2ab60 updates bb2md 2011-08-23 01:33:58 -07:00
Friendika 561051e805 convert bbcode to markdown for diaspora (first try, will need tweaking) 2011-08-23 01:00:29 -07:00
Friendika 56ea11a561 bad param in like function 2011-08-22 23:18:22 -07:00
Friendika 58651f7eb8 public posts ~f to D* 2011-08-22 21:15:31 -07:00
Friendika b9e4668f68 d* retractions 2011-08-22 20:35:34 -07:00
Friendika b0211499c1 invoke notifier 2011-08-22 19:27:40 -07:00
Friendika eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Friendika 564ade0685 store key with contact record 2011-08-22 04:55:09 -07:00
Friendika 812222fb17 correct the diaspora_like signable string format 2011-08-22 01:57:52 -07:00
Friendika 4ec706cfc7 log the friend request - it's important 2011-08-21 17:48:42 -07:00
Friendika 213f832443 add trailing slash to diaspora notify url on send 2011-08-21 17:24:50 -07:00
Friendika e3eb4c131f D* likes not verifying, ignore result until we figure out the signable_string exactly 2011-08-21 04:18:39 -07:00
Friendika c97652a044 php error when no aliases 2011-08-21 00:13:44 -07:00
Friendika a3eb73ed11 diaspora sign/verify requires SHA0 hash algorithm 2011-08-20 20:54:03 -07:00
Friendika c6f0d997e6 set author/owner on likes 2011-08-20 18:14:19 -07:00
Friendika c6cab2cfa8 get_app for diaspora_like 2011-08-20 18:08:43 -07:00
Friendika f5c0443b91 sql syntax 2011-08-20 18:05:05 -07:00
Friendika c6a05443f7 stricmp does not exist - strcasecmp does 2011-08-20 17:50:39 -07:00
Friendika 349ea8d475 don't generate guid if one provided wirth msg 2011-08-20 17:46:33 -07:00
Friendika 8fa6f49242 until algorithm is sorted, ignore D* verification failures so we can debug the rest 2011-08-20 15:09:09 -07:00
Friendika 0d9d576aa6 move encryption functions to crypto file 2011-08-20 04:53:11 -07:00
Friendika 6aa633efc8 Merge branch 'pull' 2011-08-19 14:36:08 -07:00
Friendika 8e24db3ef5 incorrect iv length for blocksize 2011-08-19 14:34:28 -07:00
fabrixxm a66f063e68 Merge pull request #159 from fabrixxm/master 
Some works on API 2
 2011-08-19 11:37:29 -07:00
fabrixxm 46dd2535df API work. Identicurse compatiblity 2011-08-19 20:33:34 +02:00
fabrixxm b465d1f30b Merge pull request #158 from fabrixxm/master 
Some works on API
 2011-08-19 08:03:20 -07:00
fabrixxm 5c78872940 API: private messages (only json) 2011-08-19 16:55:43 +02:00
fabrixxm 43040faf22 move send private message code out of view code 2011-08-19 16:54:41 +02:00
fabrixxm fc9c73da49 API: missing template and small fix for hotot 2011-08-19 15:09:10 +02:00
fabrixxm 62e939de52 API: add pagination in timelines and add statuses/friends and followers 2011-08-19 14:57:54 +02:00
Friendika 9a52b15271 don't allow removal of self contact 2011-08-19 05:20:30 -07:00
Friendika b49175ec5d more logging 2011-08-19 04:48:54 -07:00
Friendika 68c237f79f typo on d* path 2011-08-19 04:11:06 -07:00
Friendika 16129a4b8c better reporting when d* parent not found 2011-08-19 02:53:44 -07:00
Friendika 395faae0b2 double url encode diaspora communications 2011-08-19 02:24:30 -07:00
Friendika 4cef4ec918 fix d* intros 2011-08-18 22:03:58 -07:00
Friendika 0a0c5013ce debug 2011-08-18 22:01:35 -07:00
Friendika 9167b2057b diaspora share - blocked specified twice 2011-08-18 21:50:41 -07:00
Friendika c05c20aa56 set writable (e.g. writeable) flag for Diaspora contacts 2011-08-18 21:31:34 -07:00
Friendika d2c6c21a88 lots more diaspora communications - can see light at the end 2011-08-18 21:09:44 -07:00
Friendika 457f8c3e95 use mb_strlen when iterating utf8 2011-08-18 19:14:13 -07:00
Friendika 2df7251b34 notifier issue 2011-08-18 17:30:06 -07:00
Friendika bc5935061b dfrn friendship issue 2011-08-18 16:47:45 -07:00
Friendika 012e039dae store signature data if applicable for relaying 2011-08-18 05:08:39 -07:00
Friendika c534dd2969 fill and expire fcontact cache 2011-08-18 04:20:30 -07:00
Friendika 69b7c2f0be documentation 2011-08-17 23:10:55 -07:00
Friendika 9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
Friendika 37fc7324b7 fix largest_photo mixup in probe_url 2011-08-17 21:14:21 -07:00
fabrixxm 07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika db03b1ab17 diaspora continued... 2011-08-17 04:24:26 -07:00
Friendika 673e114bbd D* like and start of relay code 2011-08-16 22:31:14 -07:00
Friendika fafcab70e1 fill in framework for d* outgoing 2011-08-16 20:43:34 -07:00
Friendika b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika 98cdf5d315 fix API time - wrong format string 2011-08-16 04:55:38 -07:00
Friendika 2c0404fdc8 cleanup after refactor 2011-08-16 00:52:34 -07:00
Friendika c7197b99f9 refactor the diaspora contact logic 2011-08-15 23:19:17 -07:00
Friendika 0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika 3d45f9f133 remove disable oembed 2011-08-15 21:46:52 -07:00
Friendika d0c8f11dff typos 2011-08-15 21:01:44 -07:00
Friendika 9634bb514f doh! add body to the item 2011-08-15 19:46:47 -07:00
Friendika a93b6757b1 set parent-uri for top level posts 2011-08-15 19:39:49 -07:00
Friendika 44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika 805770521e errant debug statement 2011-08-15 06:27:17 -07:00
Friendika 5d6155a968 fixes share from diaspora 2011-08-15 05:27:24 -07:00
Friendika 9cd77b56ab temporarily disable oembed 2011-08-15 01:29:58 -07:00
Friendika 5b24050875 split off facebook and other cron hooks from poller 2011-08-14 22:59:34 -07:00
Friendika d723ff4770 diaspora top level status posts, string update 2011-08-14 21:23:02 -07:00
Friendika 0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika 7952961222 diaspora probe/scrape changes 2011-08-14 18:13:52 -07:00
Friendika 025485ea69 partially fill in diaspora stub functions for comments and likes - these both need lots more work 2011-08-13 19:03:59 -07:00
Friendika 4b4ff75b72 basic post message from diaspora (untested) 2011-08-13 16:39:59 -07:00
Friendika 88f94325a4 incoming diaspora share notification turned into Friendika friend request 2011-08-13 06:52:33 -07:00
Friendika e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika 04b59ac49a enhanced email privacy 2011-08-11 01:52:31 -07:00
Friendika 3f61f9f2c5 comment box premature close due to race condition with liveupdate 2011-08-10 22:20:59 -07:00
Friendika ac4ce27e88 keep private emails out of any offsite feeds 2011-08-10 21:46:19 -07:00
Friendika 684ebd2ed8 enhance random_string, block public email replies 2011-08-10 21:06:35 -07:00
Friendika 06408664db Diaspora logo 2011-08-10 05:28:39 -07:00
Friendika 72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika ee6806d82b never enough comments 2011-08-10 01:19:27 -07:00
Friendika cbfb40c43f use mailto: to specify a new email contact and over-rider webfinger 2011-08-09 22:11:01 -07:00
Friendika 1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika 49be394182 diaspora - remove debugging code on encrypt/decrypt 2011-08-09 06:40:28 -07:00
Friendika 70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika 07c48191b6 AES_256_CBC 2011-08-08 21:51:56 -07:00
Friendika df3062c612 basic diaspora encryption 2011-08-08 21:44:29 -07:00
Friendika 6be5da67b1 reparenting imported item was only partially reparenting. 2011-08-08 19:10:36 -07:00
Friendika 8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika 1eec10329a guid functions 2011-08-07 16:56:26 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika aa3a14ec36 bug #117, use realname for screen_name in API if nickname missing 2011-08-05 21:30:12 -07:00
Friendika 8ae0a8a94c fix statusnet_html timelines on api 2011-08-05 07:26:54 -07:00
Friendika 112fc59e31 more api tweaks 2011-08-05 05:17:18 -07:00
Friendika b8592dba8a integer values don't show up in xml api results 2011-08-05 01:02:12 -07:00
Friendika 2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika 12d5482fc1 some fields in API timeline JSON must be int 2011-08-04 19:47:45 -07:00
Friendika d45a66e700 allow custom avatar sizes - needed for Diaspora hcard/vcard 2011-08-03 21:05:39 -07:00
Friendika ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika e22e823e93 allow group selection from contact edit page 2011-08-02 22:39:35 -07:00
Friendika 6bf800c6c8 Provide a way to lie about textlimit as far as API is concerned. 2011-08-02 20:08:40 -07:00
Friendika 1aaded10b4 api compatibility fixes 2011-08-02 20:02:07 -07:00
Friendika 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika 8b31ff15f5 breaking up boot file (part of zot refactor) 2011-08-01 16:51:01 -07:00
Friendika e76990ae7b bug #111 - don't parse an @ address as a feed 2011-08-01 16:15:37 -07:00
Friendika 326a873082 merge diaspora/friendika vcard formats - not yet complete 2011-08-01 05:13:59 -07:00
Friendika 823d7ba42a api/friends/ids, api/followers/ids 2011-07-31 22:22:34 -07:00
Friendika 996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika 0c9f033505 some api enhancements 2011-07-31 16:35:53 -07:00
Friendika b96b7d4608 get attribution correct in api items 2011-07-31 00:53:46 -07:00
Friendika 149d52da8b show correct self profile in api 2011-07-30 20:48:55 -07:00
Friendika 60caffcd77 convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field 2011-07-30 01:03:24 -07:00
Friendika dbc3283681 api/statusnet/version 2011-07-29 18:21:54 -07:00
Friendika 829dc24464 api/statusnet/config does not require login 2011-07-29 17:01:57 -07:00
Fabio Comuni ac6945eed1 Merge remote-tracking branch 'friendika/master' 2011-07-29 17:23:09 +02:00
Fabio Comuni b1e766dadb allow GET or POST data in statuses/update 2011-07-29 17:21:02 +02:00
Fabio Comuni d12e2cbfe9 Fix nav template and add missing strings 2011-07-29 16:23:47 +02:00
Friendika f47d582736 api/statusnet/config.xml 2011-07-28 21:56:56 -07:00
Friendika 41c7d71e3b make profile-jot-desc track lock state changes 2011-07-28 20:44:35 -07:00
Friendika a45b94033e issue with remote mentions 2011-07-28 19:08:38 -07:00
Friendika 8042f874f3 more progress on key conversion functions 2011-07-28 18:16:57 -07:00
Friendika b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika e6c5afdf4f privacy issue introduced yesterday 2011-07-26 22:57:48 -07:00
Friendika c17890ab62 privacy settings on event item not propagated correctly 2011-07-26 22:40:11 -07:00
Friendika 454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Friendika ec52010e16 helper functions for Diaspora cert mangling 2011-07-25 19:57:17 -07:00
Friendika c0749f18d6 event ownership issues 2011-07-25 18:41:48 -07:00
Fabio Comuni 23d6339a41 change to some nav ids, notice in empty notifications popup 2011-07-25 17:12:42 +02:00
Fabio Comuni 99ab06bad3 js to open close popup nav menu and to populate notification menu via ping. 
Update mod/ping to return details about messages and intros
 2011-07-25 16:54:39 +02:00
Fabio Comuni e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Fabio Comuni 93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00
Friendika 77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika f4b4f61f66 provide fake first arg to ajax updater 2011-07-21 17:55:15 -07:00
Friendika 1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Friendika 5307225682 ajax pause - any key to resume 2011-07-20 17:17:08 -07:00
Fabio Comuni 11d1d309c2 Recursive string replacement in template 2011-07-20 11:05:41 +02:00
Friendika 1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl 
New jot ACL selector
 2011-07-19 17:24:09 -07:00
Fabio Comuni 89eefbe46c Fix style and scrollbar 2011-07-19 16:34:27 +02:00
Fabio Comuni 9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika 7008bec045 improved code blocks 2011-07-18 19:17:16 -07:00
Friendika 1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 09f9e658e9 Merge branch 'pull' 2011-07-15 03:09:07 -07:00
Friendika 69f4db9e12 zot stuff 2011-07-15 03:08:43 -07:00
Friendika f35a61761a Merge pull request #139 from fabrixxm/update 
Experiment with on-line update
 2011-07-15 01:29:46 -07:00
Friendika c8d969e84c my -> your 2011-07-14 03:08:48 -07:00
Friendika 7534b8873b link tips on nav bar 2011-07-14 03:05:54 -07:00
Friendika 180c15cdf8 zot scraper 2011-07-11 18:28:13 -07:00
Fabio Comuni 4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika eccaa525cc 'dislike' is not part of activitystreams core schema - use symblic constants instead 2011-07-07 16:56:44 -07:00
Friendika 8cc6e69705 Merge pull request #138 from fabrixxm/master 
some minor tweaks
 2011-07-07 15:33:32 -07:00
Fabio Comuni 9dfd798368 Add post type "event" to like/unlike localizated text 2011-07-07 14:02:58 +02:00
Friendika 3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Fabio Comuni e7834e60f8 Update settings page to use field templates. 
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
 2011-07-06 12:10:00 +02:00
Friendika 40aa6f33b5 incorrect links for "view in context" on community page 2011-07-05 21:03:37 -07:00
Friendika c552248b7c item tags instead of feed 2011-07-05 20:32:43 -07:00
Friendika 8992c27fa6 better handling of feed photos (e,g, google+) 2011-07-05 20:29:26 -07:00