Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
friendica
00bbb9ad36
slight improvement in handling of plaintext feeds
2012-04-01 15:43:57 -07:00
friendica
9b4bef8ac4
that didn't quite work out
2012-04-01 06:46:12 -07:00
friendica
f0b8d01615
try slightly better detection of html in feeds
2012-04-01 03:19:37 -07:00
friendica
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
friendica
20f9733250
don't expire filed items
2012-03-27 00:54:34 -07:00
friendica
b5d0315d55
preparation for some possibly killer features
2012-03-26 17:57:27 -07:00
friendica
3ae43c2448
prevent duplicate friend suggestions
2012-03-24 15:53:53 -07:00
friendica
3aacc119a1
block filed items from deletion
2012-03-24 04:16:27 -07:00
friendica
528d795fb6
ability to change tags in edited posts
2012-03-22 16:17:10 -07:00
friendica
cca524495c
community discovery cont., cleanup of DB debugging
2012-03-18 22:12:36 -07:00
friendica
805087af67
whitespace
2012-03-16 05:41:29 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
Tobias Hößl
635958e11d
Merge branch 'master' of git://github.com/friendica/friendica
2012-03-09 10:00:12 +00:00
friendica
395a9530dc
still getting parent relays on remote systems
2012-03-07 18:23:55 -08:00
friendica
23718bfc25
prevent duplicate likes
2012-03-06 02:17:55 -08:00
friendica
fba089012a
correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode
2012-03-04 18:50:32 -08:00
friendica
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
friendica
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
Tobias Hößl
e55d13c2b4
Avoid a notice
2012-02-28 12:56:16 +00:00
Tobias Hößl
e33c2b8f89
Avoid a Notice
2012-02-27 22:08:00 +00:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
friendica
a3cf563b68
update author name across items if changed.
2012-02-24 20:40:09 -08:00
friendica
f5c5da742d
attribution issue - don't take author name from contact if available from item.
2012-02-24 20:03:13 -08:00
friendica
f03aaf554e
mark all notifications read
2012-02-21 16:59:57 -08:00
friendica
32d9008dd4
more cleanup of community followup detection. Remote worked well but local didn't.
2012-02-20 21:07:40 -08:00
friendica
b821399f00
email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes
2012-02-20 19:50:05 -08:00
friendica
11871195be
fix twitter title showing up occasionally
2012-02-20 18:06:43 -08:00
friendica
1b9c03f6fc
new notifications - implement storage
2012-02-18 02:57:42 -08:00
friendica
2abbd81ce1
a few fixes for offsite community members
2012-02-16 18:29:09 -08:00
friendica
d79c3351ea
db installation sync
2012-02-10 13:43:35 -08:00
friendica
b346f4464c
send notify emails to community pages as well as people
2012-02-10 00:08:23 -08:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
7b0a005441
edit post not working after plaintext editor fixes, missing some recent editor template changes
2012-02-09 15:58:26 -08:00
friendica
4993f4f1d6
allow plugin to abort message posting, fix half-duplex D* relationship
2012-01-30 20:49:54 -08:00
friendica
e2d0eb4a88
redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic
2012-01-24 18:59:55 -08:00
friendica
a76a497d92
implement "moderate" flag on items
2012-01-23 20:56:11 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
d840943621
use reltoabs - primarily for github activity feeds
2012-01-17 16:30:32 -08:00
friendica
c1cf6e48c2
Allow Diaspora to post to forums
2012-01-04 13:50:12 -08:00
friendica
fc7d0360bb
add verb and item to notifications to aid in localisation
2012-01-03 20:26:20 -08:00
friendica
969cd145ce
suggestion notifications
2012-01-03 17:29:07 -08:00
friendica
c583d16209
fix reference variable effects on sorting
2012-01-03 14:27:00 -08:00
friendica
3e162bcf8f
function not defined
2011-12-30 20:48:49 -08:00
friendica
a76be1934a
migrate more notifications
2011-12-29 22:32:30 -08:00
friendica
bb40e54dec
new notification module working for "email message received"
2011-12-25 23:00:19 -08:00
friendica
0b598dedd0
more work on enotify
2011-12-23 23:07:05 -08:00
friendica
3da3cd686c
notifications refactor
2011-12-08 01:28:27 -08:00
friendica
513c1c0d68
dynamic delete icons for saved-search on network page
2011-12-01 18:27:45 -08:00
friendica
b795ce4fe7
little stuff - name change, live updates, new network types
2011-11-23 23:17:26 -08:00
friendica
c568493f57
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
2011-11-21 19:01:05 -08:00
Fabio Comuni
cb05e677a9
Merge remote-tracking branch 'friendica/master'
2011-11-21 13:52:15 +01:00
friendica
aaedac8f57
community forums cleanup
2011-11-19 13:45:20 -08:00
friendica
191a9b048f
forum cleanup
2011-11-19 03:13:46 -08:00
friendica
72dd6457b0
first forum test
2011-11-19 03:06:15 -08:00
friendica
6463543832
new approach to secondary delivery fork
2011-11-18 22:20:08 -08:00
friendica
fd4fe24406
Merge branch 'master' into groups
2011-11-18 22:04:41 -08:00
Fabio Comuni
590f1d2b25
log less in expire items
2011-11-17 16:18:59 +01:00
Fabio Comuni
79603e3146
expire settings for items, notes and photos.
...
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
friendica
c9846b745d
allow dup tag names with different urls
2011-11-16 17:09:58 -08:00
friendica
485f97b3d8
tgroup relays
2011-11-15 20:30:34 -08:00
Friendika
d23867f5a0
incorrect total use for get_feedtags
2011-11-12 02:53:53 -08:00
Friendika
20ca93191f
cleanup and loose ends
2011-11-08 16:54:32 -08:00
Friendika
3d9a9614e2
common friends
2011-11-01 19:16:33 -07:00
Friendika
573670fa0c
more social graph stuff
2011-11-01 16:08:07 -07:00
Friendika
d9f64deda0
sql error
2011-10-25 20:05:21 -07:00
Friendika
ae12074337
fix tag import for tag owner
2011-10-24 23:55:29 -07:00
Friendika
b20afbc9e4
@ tags becoming # tags during atom transit
2011-10-24 20:33:54 -07:00
Friendika
f48fd5aa16
more tagging
2011-10-24 04:17:46 -07:00
Friendika
7cbb69d87f
tagging
2011-10-23 00:24:37 -07:00
Friendika
df996a8b5e
fix for errant top-level posts from feeds
2011-10-19 21:54:33 -07:00
Friendika
278433eac7
origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora
2011-10-17 14:52:03 -07:00
Friendika
5dcc10a5d9
working on long-term solution to relay issue
2011-10-15 03:26:37 -07:00
Friendika
2911bf9434
sql issue item_store
2011-10-13 01:00:06 -07:00
Friendika
3db43d5a39
storage race condition
2011-10-12 02:21:18 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika
2802c142cb
local_deliver testing
2011-10-06 19:10:57 -07:00
Friendika
53efeb8d1f
local deliver 1
2011-10-06 17:27:37 -07:00
Friendika
7b648e6da8
performance enhancements
2011-10-04 18:53:56 -07:00
Friendika
aeb83fa063
document multi-pass mode on consume_feed
2011-10-04 04:38:58 -07:00
Friendika
07b09300a9
improve feed import performance
2011-10-04 03:06:34 -07:00
Friendika
c6ac438735
item_store: prevent storing a duplicate item with same uri+uid
2011-10-03 06:04:17 -07:00
Friendika
8f9656da92
basic support for AS friend requests
2011-10-02 16:18:01 -07:00
Friendika
4f9c072d66
requeue deliveries on 503 errors which have 'retry-after' headers
2011-09-27 19:27:47 -07:00
Friendika
d6b446d63f
starting the big delivery shakeup
2011-09-22 04:11:39 -07:00
Friendika
8bf6a29d4e
optimise the commented date view
2011-09-18 19:04:11 -07:00
Friendika
9c3503a706
update timestamp on activity change (comment/like)
2011-09-16 06:49:24 -07:00
Friendika
82f7f33cf5
bookmarks + bug #140
2011-09-04 19:58:03 -07:00
Friendika
1621630b06
login_hook
2011-09-01 06:29:29 -07:00
Friendika
846c4cea7c
implement delivery queue in case notifier gets killed
2011-08-28 21:41:42 -07:00
Friendika
f29f228463
bring Diaspora message signing back to the source author - whether they like it or not.
2011-08-28 19:22:27 -07: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
349ea8d475
don't generate guid if one provided wirth msg
2011-08-20 17:46:33 -07:00
Friendika
0d9d576aa6
move encryption functions to crypto file
2011-08-20 04:53:11 -07:00
Friendika
457f8c3e95
use mb_strlen when iterating utf8
2011-08-18 19:14:13 -07:00
Friendika
e15e18e0d1
hopefully fix statusnet bug by altering our feed format slightly
2011-08-12 21:01:51 -07:00
Friendika
ac4ce27e88
keep private emails out of any offsite feeds
2011-08-10 21:46:19 -07:00
Friendika
6be5da67b1
reparenting imported item was only partially reparenting.
2011-08-08 19:10:36 -07:00
Friendika
8812b7f4ca
item guids
2011-08-07 17:29:26 -07:00
Friendika
48ffa880f0
cleanup
2011-08-07 16:15:54 -07:00
Friendika
d45a66e700
allow custom avatar sizes - needed for Diaspora hcard/vcard
2011-08-03 21:05:39 -07:00
Friendika
ad1e827169
several fixes for attachments
2011-08-03 19:18:58 -07:00
Friendika
0c9f033505
some api enhancements
2011-07-31 16:35:53 -07:00
Friendika
b721fabc3c
show lock icon on private events
2011-07-27 02:21:55 -07:00
Friendika
d7154a4606
ability to link contacts that are "really me, but on another system/network".
2011-07-05 19:55:09 -07:00
Friendika
9816f14d40
statusnet improvements
2011-07-01 17:39:16 -07:00
Friendika
d5855967a7
do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used.
2011-06-28 22:33:02 -07:00
Friendika
0b221e8945
bug #96 move libraries to library - better alignment of like rotator
2011-06-28 21:11:52 -07:00
Friendika
a15bd91d17
don't update an event that hasn't changed.
2011-06-23 18:25:33 -07:00
Friendika
38cf37d3c3
new item view, sort by received date - not posted date.
2011-06-23 17:56:59 -07:00
Friendika
5633430a19
don't allow tags in app source
2011-06-23 15:58:43 -07:00
Friendika
55112cfdd0
item source
2011-06-20 19:08:40 -07:00
Friendika
e5b54e74ba
delete selected items
2011-06-15 20:43:39 -07:00
Friendika
05eb9ceaba
avoid returning events from getting posted again
2011-06-13 20:42:37 -07:00
Friendika
d5fdd4287d
event sharing, cont.
2011-06-13 19:06:49 -07:00
Friendika
d66056af9d
reduce visibility of lang-select flag (duepuntozero)
2011-06-10 20:39:46 -07:00
Friendika
7c60701efc
fixed a few feed problems affecting activity objects/targets
2011-06-10 01:51:14 -07:00
Friendika
e2f1540f25
events, continued. Also better regex matching accounting for empty elements
2011-06-07 22:13:07 -07:00
Friendika
656d861b3e
on rare occasions posts do not get a parent. The only thing which could cause it is if we can't find our new post. So we'll check for this and try one more time before failing.
2011-05-29 22:50:36 -07:00
Friendika
44a22c2915
more improvements in twitter handling, reduce duplicates from FB when double friended
2011-05-22 18:40:00 -07:00
Friendika
ccbdc9b2fc
regex stuffed up
2011-05-21 01:17:07 -07:00
Friendika
0abf2f11c6
patches for youtube's change in link and embed formats, please test
2011-05-20 15:46:41 -07:00
Friendika
45b9bd96ba
wrong author came from feed, not from FB
2011-05-14 06:16:21 -07:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Friendika
2c63b65e3c
refactor "which link to show" logic
2011-05-06 06:30:33 -07:00
Friendika
59fd70e568
issues with private photos - hitting internal size limits
2011-05-04 02:20:44 -07:00
Friendika
e00068334f
fix private images
2011-04-30 17:24:37 -07:00
Friendika
de131c9e58
set utf-8 on all emails
2011-04-14 17:13:13 -07:00
Friendika
3c4e501435
convert feed attach to bbcode
2011-04-13 01:53:40 -07:00
Friendika
0ed2d19ac8
death to comment box oddities (a slow death as it will take some time for everybody to upgrade)
2011-04-11 20:11:21 -07:00
Friendika
940d216395
initial dfrn update to pass perms
2011-04-10 18:38:55 -07:00
Friendika
cc45ac14b5
attachment storage
2011-04-06 21:59:07 -07:00
Friendika
c8d827a671
xmlify enclosure items
2011-04-06 20:36:24 -07:00
Friendika
109c25a1bd
some fixes to attachment output in feed
2011-04-06 20:03:06 -07:00
Friendika
6728a11ee3
support feed attachments/enclosures, and fix for bug #30
2011-04-06 19:42:35 -07:00
Friendika
438473529c
atom categories and tag import
2011-04-05 17:41:02 -07:00
Friendika
793967a1d3
better handling of troublesome feeds.
2011-04-04 19:36:18 -07:00
Friendika
b5bcf44354
profile not set
2011-04-04 01:18:28 -07:00
Friendika
0fe997490d
dfrn remote profile protocol revision
2011-03-30 15:04:18 -07:00
Friendika
04cd865cc9
placeholder arg in dfrn conversations
2011-03-30 04:20:40 -07:00
Friendika
f198c5cff8
secure profile failure
2011-03-30 04:07:47 -07:00
Friendika
be67cf663b
minor edits
2011-03-19 05:10:05 -07:00
Friendika
7e33c1072a
stuff to make connecting to diaspora profiles easier
2011-03-19 01:19:11 -07:00
Friendika
f01538a54f
content expiration
2011-03-15 17:31:49 -07:00
Friendika
852ea1aedd
force last-child on foster children, disallow time travel
2011-03-14 18:34:58 -07:00
Friendika
c40944fc86
inherit 'wall' setting from parent post on remote item
2011-03-08 14:40:33 -08:00
