Commit graph

  • 6bb8f677c2 Merge branch 'fabrixxm-master' Friendika 2011-02-04 04:46:05 -0800
  • 2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition Friendika 2011-02-04 04:25:53 -0800
  • ebbdb7b301 Upload profile photo page it title Fabio Comuni 2011-02-04 10:32:29 +0100
  • fb7959cfc0 Add a link to user photos in Upload Profile Photo page Fabio Comuni 2011-02-04 10:30:56 +0100
  • d72f248b3c Allow to set a photo from albums as profile photo Fabio Comuni 2011-02-04 10:18:28 +0100
  • cc6a5f59b4 Merge branch 'master' of https://github.com/friendika/friendika.git Fabio Comuni 2011-02-04 08:44:17 +0100
  • 5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos Friendika 2011-02-03 23:25:33 -0800
  • 9cf04b6110 small fix to IT strings fabrixxm 2011-02-04 07:36:57 +0100
  • 1eef647edb warn folks that changing your domain name after making friends is not supported at this time. Friendika 2011-02-03 20:55:55 -0800
  • ac3cbe380f found the issue - remove the extra tracing stuff Friendika 2011-02-03 19:39:04 -0800
  • c6b00f7230 allow parentless items from SN - add more tracing on notify failures Friendika 2011-02-03 17:40:04 -0800
  • e2c8bedfe5 allow changing album name in photo edit page Friendika 2011-02-03 15:13:38 -0800
  • b5c3fb1545 remove an erroneously pasted line fabrixxm 2011-02-03 19:42:32 +0100
  • c15c550a06 Fix tabs Fabio Comuni 2011-02-03 17:25:10 +0100
  • bed0391e6f Show lock info on photos Fabio Comuni 2011-02-03 17:24:58 +0100
  • 9b3131861f Extend lockview to show info on items, photos and events Fabio Comuni 2011-02-03 17:20:40 +0100
  • 01cd7cc9f2 don't parse garbage in phase2 of dfrn_deliver either Friendika 2011-02-03 04:19:05 -0800
  • a4cbdc2414 remove self Friendika 2011-02-03 03:58:47 -0800
  • 01c83f0e93 Merge branch 'tobiasd-master' Friendika 2011-02-02 23:55:16 -0800
  • 5e73f9da86 double $ in de/strings.php corrected Tobias Diekershoff 2011-02-03 08:35:23 +0100
  • 1558cd8085 Merge branch 'tobiasd-master' Friendika 2011-02-02 23:27:12 -0800
  • 33b2490a91 Merge branch 'fabrixxm-master' Friendika 2011-02-02 23:24:04 -0800
  • 73c2ccbc78 updates to the German strings.php file Tobias Diekershoff 2011-02-03 08:17:07 +0100
  • 2a4d1fa858 append jotplugin tools to current toolbar row Friendika 2011-02-02 23:07:01 -0800
  • 2f6ef7b5eb IT string update fabrixxm 2011-02-03 07:42:40 +0100
  • 97bb80c00f Merge branch 'friendika-master' fabrixxm 2011-02-03 07:24:58 +0100
  • 0a32370e32 silence php notices about $manual_id not being defined Friendika 2011-02-02 19:56:27 -0800
  • a8cea3f30c don't try to parse non-xml in dfrn_deliver Friendika 2011-02-02 19:28:40 -0800
  • 25c2640c17 be more forgiving about the order of link parameters in html->bb Friendika 2011-02-02 18:09:27 -0800
  • 1a18f4bcde get media-rss thumbnail if available and nothing else was found (e.g. github). Friendika 2011-02-02 17:32:25 -0800
  • 46c37fc779 string update, allow js_upload file selection text to be localised Friendika 2011-02-02 16:51:55 -0800
  • ee45dee932 suppress some scraping errors when confronted with hybrid/strange feeds that provide insufficient content-type and choke the html parser. Friendika 2011-02-02 14:48:27 -0800
  • a3fd84661f Merge branch 'friendika-master' fabrixxm 2011-02-02 08:00:50 +0100
  • fce9988f73 backward compatibility Friendika 2011-02-01 22:45:46 -0800
  • a347d040f0 protocol reversal, roll dfrn_version to 2.1 Friendika 2011-02-01 21:21:47 -0800
  • 777c47aaa6 silence a few notice warnings Friendika 2011-02-01 20:23:58 -0800
  • 22acba2460 trying to solve the double encoding issue Friendika 2011-02-01 18:20:25 -0800
  • bafae56b39 make sure content is unaltered Friendika 2011-02-01 17:50:49 -0800
  • 968e8bb9c4 typo Friendika 2011-02-01 17:05:17 -0800
  • 6a4ae2e845 get correct article timestamp for feeds with no 'published' and with non-utc stamps Friendika 2011-02-01 16:50:19 -0800
  • 8c5c07b265 don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) Friendika 2011-02-01 14:55:29 -0800
  • b4f2aac7e7 truncate long names Friendika 2011-02-01 14:09:47 -0800
  • 670dba6666 update jot-headers fabrixxm 2011-02-01 18:52:16 +0100
  • 9065270694 Merge branch 'friendika-master' fabrixxm 2011-02-01 18:46:31 +0100
  • 58e0129433 Merge branch 'master' of github.com:fabrixxm/friendika fabrixxm 2011-02-01 18:46:28 +0100
  • 8acc76a3c6 provide ability to survive transport mangling when travelling through html networks Friendika 2011-02-01 05:10:04 -0800
  • 042aa2e169 Merge remote branch 'friendika-master/master' Fabio Comuni 2011-02-01 10:17:27 +0100
  • 1151124fee Merge branch 'master' of github.com:fabrixxm/friendika Fabio Comuni 2011-02-01 10:17:19 +0100
  • 89313235d2 it's a bbcode editor, not an html editor Friendika 2011-01-31 23:23:37 -0800
  • 9d561d4471 oembed contsant name, fix dfrnpubdeliver, add 'code' editor button Friendika 2011-01-31 23:06:45 -0800
  • 0bec0fc5fb Merge branch 'friendika-master' fabrixxm 2011-02-01 07:18:23 +0100
  • 7dbdf8e6fa let there be purple! ;-) Friendika 2011-01-31 20:52:23 -0800
  • 2cd1da5462 readjust name length limits - acl selector Friendika 2011-01-31 19:53:40 -0800
  • e2544abd50 truncate names in acl selector Friendika 2011-01-31 19:49:56 -0800
  • 837cce8a75 email cc recipients (front end) Friendika 2011-01-31 19:07:13 -0800
  • 8965db24cc post to email recips (backend) Friendika 2011-01-31 18:18:28 -0800
  • 082909fe1a Merge branch 'fabrixxm-oembed' Friendika 2011-01-31 15:26:02 -0800
  • fc20fb17c2 force text paste in editor Friendika 2011-01-31 14:21:23 -0800
  • 1908c7ad82 deliver up to 150 contacts per person using dfrn - in case hub is whacked Friendika 2011-01-31 14:01:38 -0800
  • bdbbfe17b0 cache oembed request Fabio Comuni 2011-01-31 17:23:55 +0100
  • 3dbca2a804 delete old cache in poller.php Fabio Comuni 2011-01-31 17:16:35 +0100
  • 6efc78e0e4 add cache table Fabio Comuni 2011-01-31 17:10:36 +0100
  • 49ea05b8ff use microformat to mark html from [embed] tag, convert html with oembed microformat to [embed] tag Fabio Comuni 2011-01-31 16:45:58 +0100
  • 6ea87223d3 Add 'system''no_oembed' config option Fabio Comuni 2011-01-31 11:00:35 +0100
  • 23d1b994cc Move [embed] bbtag from oembed plugin to core Fabio Comuni 2011-01-31 10:38:49 +0100
  • e962561f8d Merge remote branch 'friendika-master/master' Fabio Comuni 2011-01-31 09:54:08 +0100
  • d8877b88d6 limit privacy ACL's to networks which can handle privacy Friendika 2011-01-30 22:45:02 -0800
  • 6935d34e76 disable "take me home" hotkey, different on FF (shift-home), IE ($). Friendika 2011-01-30 19:49:26 -0800
  • 3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors Friendika 2011-01-30 19:38:03 -0800
  • a598f17e6d wrong ref in ssl policy Friendika 2011-01-30 18:25:41 -0800
  • e8d52d879b more debugging to see if the google push hub is even trying to publish our content. Friendika 2011-01-30 15:28:50 -0800
  • c012843282 identify email-only contacts Friendika 2011-01-29 23:47:40 -0800
  • 8673b08c1c even more cleanup prior to push Friendika 2011-01-29 22:41:01 -0800
  • a362dc46e3 cleanup ssl_policy implementation Friendika 2011-01-29 22:38:58 -0800
  • f970d9ab4d implement SSL redirection policy (none, full, selfsign) Friendika 2011-01-29 22:35:11 -0800
  • 45bbf1cd3f document poormancron as alternative in INSTALL.txt Friendika 2011-01-29 01:25:46 -0800
  • e7d87e4ab3 Merge branch 'master' of github.com:fabrixxm/friendika fabrixxm 2011-01-29 10:14:14 +0100
  • 5b35ceefb9 Merge branch 'friendika-master' fabrixxm 2011-01-29 09:39:38 +0100
  • 26cc2e02fe Merge branch 'fabrixxm-master' Friendika 2011-01-28 18:50:20 -0800
  • 302acda089 updated poormancron plugin Fabio Comuni 2011-01-28 14:04:40 +0100
  • ef33ca6750 modded scripts to be runned in cli so they can be included and executed in main program Fabio Comuni 2011-01-28 14:04:18 +0100
  • 517d6812da cal proc_run hook before string escape Fabio Comuni 2011-01-28 14:01:50 +0100
  • bf8dadb970 Merge remote branch 'friendika-master/master' Fabio Comuni 2011-01-28 10:08:39 +0100
  • 8257b1b684 Merge branch 'friendika-master' fabrixxm 2011-01-28 07:26:57 +0100
  • 5d77bd9489 tag finder tweak Friendika 2011-01-27 21:24:21 -0800
  • 33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. Friendika 2011-01-27 18:45:19 -0800
  • ebba294189 remote links Friendika 2011-01-27 14:34:11 -0800
  • 58309829a1 Merge branch 'omigeot-master' Friendika 2011-01-27 13:10:43 -0800
  • 1d9f677438 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master Friendika 2011-01-27 13:09:58 -0800
  • bfe6380d90 More translation olivierm 2011-01-27 16:50:39 +0100
  • 8c6319394c Done head.tpl olivierm 2011-01-27 16:48:54 +0100
  • e93385a355 French translation : Done strings.php, started template files. olivierm 2011-01-27 16:44:55 +0100
  • 620aae5b50 still not quite ready for the big photos rollover Friendika 2011-01-27 03:55:40 -0800
  • 076c25e103 Revert "Revert "roll version - now in alpha 2.1"" Friendika 2011-01-27 03:52:18 -0800
  • e8a3166fa9 Revert "roll version - now in alpha 2.1" Friendika 2011-01-27 03:50:56 -0800
  • df4f77dadd roll version - now in alpha 2.1 Friendika 2011-01-27 03:46:09 -0800
  • 444d82a532 Merge branch 'friendika-master' fabrixxm 2011-01-27 07:14:55 +0100
  • d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. Friendika 2011-01-26 20:29:32 -0800
  • b4642ca650 search icons (?) Friendika 2011-01-26 14:25:36 -0800
  • 05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed Friendika 2011-01-26 13:59:20 -0800