Commit graph

3665 commits

Author SHA1 Message Date
Friendika
030dcbd467 Merge branch 'pull' 2011-08-28 05:05:32 -07:00
Friendika
4572f32603 cleanup 2011-08-28 05:04:49 -07:00
Friendika
41b00a6f3b allow comment relaying for comments which were never Diaspora signed 2011-08-28 05:00:30 -07:00
Friendika
ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
fabrixxm
3bbdbee87c Merge pull request #163 from fabrixxm/master
API and IT translation: smal fixes
2011-08-27 00:10:25 -07:00
Friendika
e3dbb63393 fix any update issues that may arise from update 1081 2011-08-26 21:51:12 -07:00
Friendika
f48a758a1e typo in update script 2011-08-26 21:37:00 -07:00
Friendika
721db93e84 check for existing diaspora comment before accepting, add 'Diaspora' app to item, use html_entity_decode so quotes don't get messed up 2011-08-26 17:52:24 -07:00
Friendika
144f241c5d fix bad embeds 2011-08-26 15:21:21 -07:00
fabrixxm
8438da7d70 Small fix to IT strings 2011-08-26 16:36:02 +02:00
fabrixxm
fcf45db075 API: fix friends profile, statuses etc 2011-08-26 16:35:51 +02:00
Friendika
506853adcd break up delivery into per-person processes 2011-08-26 07:29:22 -07:00
fabrixxm
5ec4a4e6de Merge remote-tracking branch 'friendika/master' into newui 2011-08-26 14:44:24 +02:00
Friendika
1861dc1fae don't allow fullscreen for youtube iframe - this makes it hard to visit the network page when they throw an error 2011-08-26 01:32:22 -07:00
Friendika
a4739aef91 more logging diaspora pubdeliver 2011-08-25 20:35:55 -07:00
Friendika
c15c53d307 one more little tweak to linkificator 2011-08-25 20:12:56 -07:00
Friendika
5eb08d43b6 tweak to bbcode linkificator 2011-08-25 20:09:32 -07:00
Friendika
99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
1b33ba6587 third attempt to get rid of this stupid warning 2011-08-25 06:01:40 -07:00
Friendika
83605cf3dc theme settings for contact photo menu 2011-08-25 05:15:05 -07:00
Friendika
71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika
74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Friendika
8f6ae2b660 missing salmon key? report it. 2011-08-24 20:40:08 -07:00
Friendika
96adbb6457 Merge branch 'pull' 2011-08-24 15:55:59 -07:00
Friendika
d51d42b7d4 revup 2011-08-24 15:55:27 -07:00
Olivier Migeot
1548449586 Small fix 2011-08-24 18:04:16 +02:00
tobiasd
a2a3b75b6d Merge pull request #162 from omigeot/master
French translation
2011-08-24 08:58:07 -07:00
Olivier Migeot
1f5a67c81f French translation up to date. 2011-08-24 17:47:21 +02:00
Friendika
d6f9e0e2a4 change the way public feeds work just to fix statusnet's bug, because they won't 2011-08-24 05:58:31 -07:00
Friendika
a775474dff cleaned up the conditions on when to and when not to relay. 2011-08-24 04:42:28 -07:00
Friendika
b6fdd3c76b turn off notifier - runaway 2011-08-24 01:55:34 -07:00
Friendika
0883a614a2 don't accept pubsub from diaspora 2011-08-24 01:41:27 -07:00
Friendika
0e1f868237 Merge branch 'pull' 2011-08-24 01:29:07 -07:00
Friendika
2aa23843e4 D* queue 2011-08-24 01:21:24 -07:00
tobiasd
9cba9d33b9 Merge pull request #161 from tobiasd/master
fix for DE strings.php
2011-08-23 22:47:45 -07:00
Tobias Diekershoff
56c29a527d Merge github.com:tobiasd/friendika 2011-08-24 07:38:05 +02:00
Friendika
2cfdcee29a author and owner sign exactly the same string - apparently 2011-08-23 19:54:35 -07:00
Friendika
b57a01dc14 that was ugly - let's do better 2011-08-23 19:42:45 -07:00
Friendika
838d89a110 fix for public posts to D* 2011-08-23 19:40:50 -07:00
Friendika
6a052c3586 correct time in photo msg 2011-08-23 19:01:08 -07:00
Friendika
c1acea330c photo fixes 2011-08-23 18:50:18 -07:00
Friendika
3b4da00495 fix it again 2011-08-23 18:28:17 -07:00
Friendika
b41592f556 fix group public members 2011-08-23 18:22:15 -07:00
Friendika
56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
fabrixxm
97806544bc don't add notification details on new posts 2011-08-23 14:02:04 +02:00
fabrixxm
89c5733ca5 add more notification messages 2011-08-23 13:52:20 +02:00
Friendika
91de9edecd retractions - precedence issue 2011-08-23 04:02:29 -07:00
Friendika
99681e33af testing retractions 2011-08-23 03:49:38 -07:00
Friendika
0739ae315b typo 2011-08-23 03:07:26 -07:00