Commit graph

10815 commits

Author SHA1 Message Date
fabrixxm
d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
fabrixxm
2fabf8d218 Merge branch 'newui' of github.com:fabrixxm/friendika into newui 2011-09-08 20:12:17 +02:00
fabrixxm
68c23f6c86 Merge pull request #171 from fabrixxm/master
fix to network page conversations sort
2011-09-08 05:37:14 -07:00
Fabio Comuni
ad7c111c7c deal with messages without comments or likes 2011-09-08 14:39:53 +02:00
fabrixxm
0bd10ae01a Merge pull request #170 from fabrixxm/master
Show conversations in network default view ordered by activity
2011-09-08 05:11:06 -07:00
Fabio Comuni
49ffd30e1c global lang array in templates 2011-09-08 14:09:45 +02:00
Fabio Comuni
694e74d54d Show conversations in network default view ordered by activity 2011-09-08 11:18:44 +02:00
Fabio Comuni
dbc5ecfe57 light notifications menu icon on new notifs 2011-09-08 10:12:20 +02:00
Fabio Comuni
2f93a4d70d style vcard infos 2011-09-08 10:11:57 +02:00
Friendika
fdd372a798 speed up friend requests and avoid parse errors by using hcard address instead of profile url 2011-09-07 22:49:58 -07:00
Friendika
c8f6493008 typo fb connector 2011-09-07 14:29:15 -07:00
Friendika
f17d91844f part of bug #143 2011-09-07 02:23:17 -07:00
Friendika
65d5d0b0cb clarification of signature details for foreign messages, 2011-09-06 18:51:24 -07:00
Friendika
a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika
18315a1377 Russian translation (80% complete) 2011-09-06 01:52:45 -07:00
Friendika
eeecb412aa view bookmarks 2011-09-06 00:55:24 -07:00
Friendika
6eb6b8f969 updated documentation 2011-09-05 19:19:58 -07:00
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