Commit Graph

2797 Commits

Author SHA1 Message Date
Friendika e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
fabrixxm 2f5a34ad17 Merge branch 'newui' of github.com:fabrixxm/friendika into newui 2011-09-05 21:05:24 +02:00
Fabio Comuni 08e54234e3 profiles popup menu in sidebar 2011-09-05 16:55:40 +02:00
Fabio Comuni c7a9b1ae32 add *~ to gitignore 2011-09-05 14:03:38 +02:00
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni 14125ce67b Add tipTip js tooltips 2011-09-05 11:32:40 +02:00
Fabio Comuni 9ab9c28b01 fix profile edit link and d* photo urls 2011-09-05 11:32:07 +02:00
Fabio Comuni 2c1aca7ffe fix aside contact block, add edit profiles icon 2011-09-05 11:16:08 +02:00
Fabio Comuni 20ca451200 move js to js folder 2011-09-05 11:15:30 +02:00
Fabio Comuni ab5bda526e move icons style in new file 2011-09-05 11:14:43 +02:00
Fabio Comuni c308ac49af More icons 2011-09-05 11:13:42 +02:00
Fabio Comuni 0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika 7e8100d2cd custom attags 2011-09-04 22:40:36 -07:00
Friendika 82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika 481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika f6a43afb8d set max height of acl names to avoid wrap 2011-09-04 06:18:26 -07:00
Friendika e440353013 truncate overflow text on acl selector items (3 themes) 2011-09-04 05:41:11 -07:00
Friendika 260d652168 scrape_url - use feed url if no name can be found 2011-09-04 05:07:25 -07:00
Friendika 1d01b3a088 Merge branch 'pull' 2011-09-04 00:51:42 -07:00
Friendika 9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika c0a2cc3e98 diaspora has no timezone - use UTC for events 2011-09-03 07:40:05 -07:00
Friendika 59a6a04e26 format events for diaspora 2011-09-03 07:13:12 -07:00
Friendika c8f61ef890 no plink on imported D* posts 2011-09-03 05:23:36 -07:00
Friendika b026dcb860 match bbcode multiline 2011-09-03 04:36:45 -07:00
Friendika c8dbf25f51 provide option to block Facebook wall but still allow social stream 2011-09-03 00:52:26 -07:00
Friendika 7c140c5885 Merge branch 'pull' 2011-09-02 22:21:18 -07:00
Friendika d49895a8a1 Merge pull request #169 from michal-s/master
minor changes of czech translations
2011-09-02 22:20:47 -07:00
Michal Supler 7813f1798f minor changes of czech translations 2011-09-03 02:01:15 -03:00
Friendika 574470bf1c Merge branch 'pull' 2011-09-02 19:28:06 -07:00
Friendika f186863523 revup 2011-09-02 19:27:32 -07:00
Friendika 887d06cf5e Merge pull request #168 from Erkan-Yilmaz/master
typo in German page: admin > log
2011-09-02 19:27:21 -07:00
Erkan Yilmaz 508a13da00 inital info for Facebook + CC by licence
further info here:
http://groups.google.com/group/friendika/browse_thread/thread/7562e0b22f815a79
2011-09-03 04:01:24 +02:00
Erkan Yilmaz 652d43955b Merge remote branch 'upstream/master' 2011-09-03 03:58:40 +02:00
Friendika 9e9b6a3dd1 zot: dealing with foreign messages 2011-09-02 05:46:00 -07:00
Friendika 93b9d71377 completely enclose ~f hashtags so they don't get hijacked by D* 2011-09-02 05:13:38 -07:00
Friendika 7bee0bff0d protocol update, require a recipient encrypted envelope or it cannot be
decrypted.
2011-09-02 01:56:02 -07:00
Erkan Yilmaz 463a136c15 typo in German admin log page 2011-09-02 10:17:17 +02:00
Friendika ada2384fbb Merge pull request #167 from Erkan-Yilmaz/master
typos, adapt to identi.ca situation
2011-09-01 23:30:36 -07:00
Erkan Yilmaz 0401130246 typos + adapt 2011-09-02 08:15:36 +02:00
fabrixxm 00e1759a54 Merge pull request #166 from Erkan-Yilmaz/master
typo in widget plugin text
2011-09-01 23:10:38 -07:00
Erkan Yilmaz ecd2fe4592 typos in README files of plugins: impressum + statusnet 2011-09-02 07:48:07 +02:00
Erkan Yilmaz 55e138a7c0 typo in widget plugin text 2011-09-02 07:37:09 +02:00
Friendika 16c24b13a0 Merge pull request #165 from Erkan-Yilmaz/master
update twitter plugin README: typos + new menu structure
2011-09-01 22:15:48 -07:00
Erkan Yilmaz 5a7934012c fix README for twitter plugin: typos + change to new menu structure 2011-09-02 07:07:03 +02:00
Friendika 71f71ecf46 error viewing logfiles over 2Gb 2011-09-01 21:54:04 -07:00
Friendika a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Friendika ef1b99aa44 Merge branch 'pull' 2011-09-01 06:30:38 -07:00
Friendika 1621630b06 login_hook 2011-09-01 06:29:29 -07:00
Fabio Comuni 058e329dfb Fix profile vcard and style 2011-09-01 12:37:30 +02:00
fabrixxm af62c81b8b Merge pull request #164 from fabrixxm/master
small fix to IT strings
2011-09-01 03:36:47 -07:00