Commit graph

1195 commits

Author SHA1 Message Date
Tobias Diekershoff 98db8bc015 Merge branch 'master' of git://github.com/friendika/friendika 2011-02-08 13:00:53 +01:00
Friendika d280184b87 fix del_pconfig 2011-02-08 02:45:55 -08:00
Friendika e06cd399b7 close tag on favicon link missing 2011-02-07 23:28:41 -08:00
Friendika d37ee1b399 at least one server is giving CURL a second set of headers (and it isn't a 100 continue which we've already accounted for) 2011-02-07 23:20:38 -08:00
Friendika 9f5d3000c7 don't change photo visibility if only album name was changed 2011-02-07 21:16:39 -08:00
Friendika 18c5d1ff90 feed cleanup 2011-02-07 17:06:04 -08:00
Friendika 7dd56fa14c one less paren 2011-02-06 23:06:50 -08:00
Friendika 118f1d7e0a don't show logout link on 'home' link if remote_user 2011-02-06 23:04:10 -08:00
Tobias Diekershoff fbb635462a Merge github.com:tobiasd/friendika 2011-02-07 08:03:29 +01:00
Friendika 0d9ed48738 functionise birthday 2011-02-06 22:41:07 -08:00
Friendika b96d6c015b fix contact photo updates - a result of baseurl being wrong for cmdline processes 2011-02-06 19:15:20 -08:00
Friendika 147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
2011-02-06 15:50:50 -08:00
Friendika 8e988341d0 Merge branch 'fabrixxm-master' 2011-02-06 13:27:52 -08:00
Friendika 3f97344560 Merge branch 'master' of https://github.com/fabrixxm/friendika into fabrixxm-master 2011-02-06 13:27:37 -08:00
fabrixxm 64be33a3ff fixed missing close parenthesis 2011-02-06 21:24:41 +01:00
Tobias Diekershoff 695e084956 deleted another item from the Twitter addon ToDo list 2011-02-06 18:18:54 +01:00
Tobias Diekershoff a175027fc1 deleted an item from the ToDo list 2011-02-06 17:37:04 +01:00
Tobias Diekershoff fd6116296e Post to Twitter plugin
With this plugin a user can choose to post every _public_ message that
s/he posts on Friendika also on Twitter. The message will be shortened
to if longer then 140 characters in length. If shortened a link to the
original posting will be append to the Twitter posting.
2011-02-06 17:27:16 +01:00
Tobias Diekershoff 339a92fe1b added Slinky library by Beau Lebens for shortening the post url 2011-02-06 17:22:15 +01:00
Friendika ac3f3a6e9f kill orphans 2011-02-06 02:33:02 -08:00
Friendika 073f3720ac Merge branch 'tobiasd-master' 2011-02-06 02:21:45 -08:00
Friendika 4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly 2011-02-06 01:08:12 -08:00
Tobias Diekershoff 09af200bcc german choose existing pic for the avatar 2011-02-06 08:51:10 +01:00
Tobias Diekershoff dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika 2011-02-06 08:48:07 +01:00
Friendika d322bb4613 Merge branch 'fabrixxm-master' 2011-02-05 13:06:20 -08:00
Friendika 8a55168d4f Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master 2011-02-05 13:05:57 -08:00
Friendika c26463b65b Merge branch 'omigeot-master'
Conflicts:
	view/fr/strings.php
2011-02-05 13:01:28 -08:00
Friendika c4ddee005e Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-02-05 12:59:04 -08:00
olivierm 4e913d59ea Fixed some typo (prevented Friendika to load with french locale) 2011-02-05 15:19:28 +01:00
Tobias Diekershoff 0c83fb4d80 Merge branch 'master' of git://github.com/friendika/friendika 2011-02-05 09:19:03 +01:00
Friendika 8cced061bb found it - typo 2011-02-04 13:40:51 -08:00
Friendika 1d0d765344 more error checking on posts 2011-02-04 13:37:04 -08:00
Tobias Diekershoff acd5f49d43 wording 2011-02-04 21:56:43 +01:00
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