Commit Graph

34762 Commits

Author SHA1 Message Date
Friendika 6bb8f677c2 Merge branch 'fabrixxm-master' 2011-02-04 04:46:05 -08:00
Friendika 2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition 2011-02-04 04:25:53 -08:00
Fabio Comuni ebbdb7b301 Upload profile photo page it title 2011-02-04 10:32:29 +01:00
Fabio Comuni fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
Fabio Comuni d72f248b3c Allow to set a photo from albums as profile photo 2011-02-04 10:18:28 +01:00
Fabio Comuni cc6a5f59b4 Merge branch 'master' of https://github.com/friendika/friendika.git 2011-02-04 08:44:17 +01:00
Friendika 5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos 2011-02-03 23:25:33 -08:00
fabrixxm 9cf04b6110 small fix to IT strings 2011-02-04 07:36:57 +01:00
Friendika 1eef647edb warn folks that changing your domain name after making friends is not supported at this time. 2011-02-03 20:55:55 -08:00
Friendika ac3cbe380f found the issue - remove the extra tracing stuff 2011-02-03 19:39:04 -08:00
Friendika c6b00f7230 allow parentless items from SN - add more tracing on notify failures 2011-02-03 17:40:04 -08:00
Friendika e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
fabrixxm b5c3fb1545 remove an erroneously pasted line 2011-02-03 19:42:32 +01:00
Fabio Comuni c15c550a06 Fix tabs 2011-02-03 17:25:10 +01:00
Fabio Comuni bed0391e6f Show lock info on photos 2011-02-03 17:24:58 +01:00
Fabio Comuni 9b3131861f Extend lockview to show info on items, photos and events 2011-02-03 17:20:40 +01:00
Friendika 01cd7cc9f2 don't parse garbage in phase2 of dfrn_deliver either 2011-02-03 04:19:05 -08:00
Friendika a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika 01c83f0e93 Merge branch 'tobiasd-master' 2011-02-02 23:55:16 -08:00
Tobias Diekershoff 5e73f9da86 double $ in de/strings.php corrected 2011-02-03 08:35:23 +01:00
Friendika 1558cd8085 Merge branch 'tobiasd-master' 2011-02-02 23:27:12 -08:00
Friendika 33b2490a91 Merge branch 'fabrixxm-master' 2011-02-02 23:24:04 -08:00
Tobias Diekershoff 73c2ccbc78 updates to the German strings.php file 2011-02-03 08:17:07 +01:00
Friendika 2a4d1fa858 append jotplugin tools to current toolbar row 2011-02-02 23:07:01 -08:00
fabrixxm 2f6ef7b5eb IT string update 2011-02-03 07:42:40 +01:00
fabrixxm 97bb80c00f Merge branch 'friendika-master' 2011-02-03 07:24:58 +01:00
Friendika 0a32370e32 silence php notices about $manual_id not being defined 2011-02-02 19:56:27 -08:00
Friendika a8cea3f30c don't try to parse non-xml in dfrn_deliver 2011-02-02 19:28:40 -08:00
Friendika 25c2640c17 be more forgiving about the order of link parameters in html->bb 2011-02-02 18:09:27 -08:00
Friendika 1a18f4bcde get media-rss thumbnail if available and nothing else was found (e.g. github). 2011-02-02 17:32:25 -08:00
Friendika 46c37fc779 string update, allow js_upload file selection text to be localised 2011-02-02 16:51:55 -08:00
Friendika ee45dee932 suppress some scraping errors when confronted with hybrid/strange
feeds that provide insufficient content-type and choke the html parser.
2011-02-02 14:48:27 -08:00
fabrixxm a3fd84661f Merge branch 'friendika-master' 2011-02-02 08:00:50 +01:00
Friendika fce9988f73 backward compatibility 2011-02-01 22:45:46 -08:00
Friendika a347d040f0 protocol reversal, roll dfrn_version to 2.1 2011-02-01 21:21:47 -08:00
Friendika 777c47aaa6 silence a few notice warnings 2011-02-01 20:23:58 -08:00
Friendika 22acba2460 trying to solve the double encoding issue 2011-02-01 18:20:25 -08:00
Friendika bafae56b39 make sure content is unaltered 2011-02-01 17:50:49 -08:00
Friendika 968e8bb9c4 typo 2011-02-01 17:05:17 -08:00
Friendika 6a4ae2e845 get correct article timestamp for feeds with no 'published' and with non-utc stamps 2011-02-01 16:50:19 -08:00
Friendika 8c5c07b265 don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) 2011-02-01 14:55:29 -08:00
Friendika b4f2aac7e7 truncate long names 2011-02-01 14:09:47 -08:00
fabrixxm 670dba6666 update jot-headers 2011-02-01 18:52:16 +01:00
fabrixxm 9065270694 Merge branch 'friendika-master' 2011-02-01 18:46:31 +01:00
fabrixxm 58e0129433 Merge branch 'master' of github.com:fabrixxm/friendika 2011-02-01 18:46:28 +01:00
Friendika 8acc76a3c6 provide ability to survive transport mangling when travelling through html networks 2011-02-01 05:10:04 -08:00
Fabio Comuni 042aa2e169 Merge remote branch 'friendika-master/master' 2011-02-01 10:17:27 +01:00
Fabio Comuni 1151124fee Merge branch 'master' of github.com:fabrixxm/friendika 2011-02-01 10:17:19 +01:00
Friendika 89313235d2 it's a bbcode editor, not an html editor 2011-01-31 23:23:37 -08:00
Friendika 9d561d4471 oembed contsant name, fix dfrnpubdeliver, add 'code' editor button 2011-01-31 23:06:45 -08:00