Michael Vogel
|
4196b6a96c
|
Merge remote-tracking branch 'upstream/master'
|
2012-11-08 21:44:17 +01:00 |
|
friendica
|
776552226b
|
Merge https://github.com/friendica/friendica into pull
|
2012-11-06 01:10:36 -08:00 |
|
friendica
|
fd4d35b16c
|
set writable for ostatus followers
|
2012-11-06 01:10:12 -08:00 |
|
Fabrixxm
|
5b4944fe8e
|
Merge remote-tracking branch 'remotes/friendica/master' into moveme
|
2012-11-05 09:37:58 +01:00 |
|
Michael
|
2b6498b2a2
|
Merge remote-tracking branch 'upstream/master'
|
2012-11-03 22:27:34 +01:00 |
|
Zach Prezkuta
|
6effdd570c
|
add a confirm dialog and a busy rotator for delete selected
|
2012-11-01 17:42:40 -06:00 |
|
Fabrixxm
|
1a3a5ee8d9
|
moveme: first successful relocated user
|
2012-10-31 17:13:45 +01:00 |
|
Fabrixxm
|
dbc6cbe024
|
moveme: send and receive DFRN "relocate" message (WIP)
|
2012-10-29 17:50:55 +01:00 |
|
friendica
|
02251f23df
|
undefined fn: init_groups_visitor in mod_profile, rev update
|
2012-10-21 14:41:10 -07:00 |
|
Michael Vogel
|
ea6ced8359
|
Merge remote branch 'upstream/master'
|
2012-09-29 08:35:17 +02:00 |
|
friendica
|
25773b41cb
|
add "tagged" hook (bots and such)
|
2012-09-26 18:24:19 -07:00 |
|
Michael Vogel
|
4c389eb73b
|
Merge remote branch 'upstream/master'
|
2012-09-20 08:32:33 +02:00 |
|
friendica
|
f4e3f335ef
|
don't allow followers to get a post through unless it's a tag deliver
|
2012-09-12 18:53:20 -07:00 |
|
friendica
|
db09724aec
|
use local photo for tag notifications if available
|
2012-09-12 17:19:26 -07:00 |
|
Michael Vogel
|
5cfb068c25
|
Merge remote branch 'upstream/master'
|
2012-09-10 23:28:07 +02:00 |
|
Domovoy
|
bb68461c6d
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
include/conversation.php
|
2012-09-10 09:19:08 +02:00 |
|
friendica
|
5c0f0df59a
|
provide local_block - block_public as far as content but can connect with the grid.
|
2012-09-06 20:17:50 -07:00 |
|
friendica
|
4cd8233f61
|
remote_user can now support multiple contacts being logged in at once
|
2012-09-04 22:50:28 -07:00 |
|
Michael Vogel
|
f6818ab243
|
Merge remote branch 'upstream/master'
|
2012-09-02 17:50:25 +02:00 |
|
Michael Vogel
|
3c24a7ed3e
|
items: added some logging infos
|
2012-09-02 17:49:06 +02:00 |
|
Domovoy
|
17f9fcaec9
|
Checks done on topmost parent in local_delivery, closes #10
|
2012-08-18 17:17:33 +02:00 |
|
Michael Vogel
|
d40f25ae08
|
bbcode: Function for cleaning CSS commands (not yet in function)
items.php: The detection if a rss/atom-title is identically to the body is improved.
|
2012-08-17 07:59:21 +02:00 |
|
friendica
|
68d7a3ae01
|
put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do.
|
2012-08-15 17:14:29 -07:00 |
|
friendica
|
bfec28f1fe
|
threading messed up a bit of cross-site federation code
|
2012-08-12 18:42:43 -07:00 |
|
Zach Prezkuta
|
009ebc732a
|
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff
|
2012-08-10 08:13:17 -06:00 |
|
Domovoy
|
f3b1391501
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
|
2012-08-07 09:40:21 +02:00 |
|
friendica
|
5d7f9d3b4b
|
rev update
|
2012-08-05 21:43:20 -07:00 |
|
Domovoy
|
e247915f48
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
include/conversation.php
|
2012-08-05 13:43:53 +02:00 |
|
Domovoy
|
5d1eb37b9b
|
Remote items should be threaded now
|
2012-08-05 13:30:51 +02:00 |
|
friendica
|
9732f1fccf
|
expire issue
|
2012-08-04 23:29:52 -07:00 |
|
friendica
|
0c67649c08
|
put back notags
|
2012-08-03 18:36:45 -07:00 |
|
friendica
|
621e737826
|
fix angle char storage and transmission, rev update
|
2012-08-03 18:33:11 -07:00 |
|
friendica
|
982625db9c
|
update contact photos and names in local delivery - not just polled feeds
|
2012-07-23 20:00:00 -07:00 |
|
friendica
|
a54278649f
|
poke notifications
|
2012-07-19 20:13:40 -07:00 |
|
Michael Vogel
|
7aa10d1935
|
Merge remote branch 'upstream/master'
|
2012-07-15 17:26:00 +02:00 |
|
Michael Vogel
|
8d7d46ae7a
|
Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work
|
2012-07-14 19:54:27 +02:00 |
|
Michael Vogel
|
72f430ae58
|
parse_url: Problem when resizing images
|
2012-07-14 13:59:42 +02:00 |
|
friendica
|
8b6942c572
|
don't use language detection if < php 5.3
|
2012-07-13 15:38:02 -07:00 |
|
Michael Vogel
|
bfca7f47ef
|
Merge remote branch 'upstream/master'
Conflicts:
include/bb2diaspora.php
|
2012-07-13 23:39:51 +02:00 |
|
Michael Vogel
|
5f400c4a97
|
API: Now returns a real 404 when a function isn't implemented
parse_url: Image handling improved
|
2012-07-13 23:23:31 +02:00 |
|
Zach Prezkuta
|
f92338d79b
|
make likes on comments work with Diaspora, some small bugs
|
2012-07-12 23:14:39 -06:00 |
|
friendica
|
9a299920eb
|
language detection - result is stored in item['postopts']
|
2012-07-11 22:45:14 -07:00 |
|
Zach Prezkuta
|
fc6f7daf38
|
small cleanup
|
2012-07-10 19:28:38 -06:00 |
|
Zach Prezkuta
|
c8378260bc
|
check for posted dates based on month only
|
2012-07-08 08:46:46 -06:00 |
|
Zach Prezkuta
|
6d10374c17
|
cleanup
|
2012-07-07 18:50:46 -06:00 |
|
Zach Prezkuta
|
da2ccebed8
|
fix bugs
|
2012-07-07 18:50:33 -06:00 |
|
Zach Prezkuta
|
173b3a1b9a
|
allow more than one embedded private photo
|
2012-07-07 16:24:20 -06:00 |
|
Zach Prezkuta
|
57635e7684
|
add function to exclude embedded images when checking message length
|
2012-07-07 16:24:20 -06:00 |
|
Zach Prezkuta
|
5395cf5bd9
|
clear title and body of items on local delete
|
2012-07-05 20:07:01 -06:00 |
|
Michael Vogel
|
dafc84390d
|
Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...)
|
2012-07-05 23:36:00 +02:00 |
|