friendica
9dbfed64be
rev update
2014-08-22 15:51:36 -07:00
friendica
9f22f28d2f
doc update
2014-08-22 15:51:03 -07:00
Jeroen
a328fc4865
fix nl
2014-08-22 21:42:33 +00:00
marijus
b0d52943e8
Merge branch 'upstream'
2014-08-22 09:17:17 +02:00
marijus
c5f4e5bac7
Merge branch 'master' of https://github.com/friendica/red into upstream
2014-08-22 09:14:19 +02:00
friendica
1abd2a2917
another round of heavy lifting
2014-08-21 22:28:09 -07:00
friendica
69d3e5468d
provide the site blacklist everywhere it is needed
2014-08-21 21:07:32 -07:00
friendica
72a766432d
missing template file
2014-08-21 20:45:15 -07:00
friendica
05515e3b10
D* receive endpoint is receive/users/$guid - where $guid is really the channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids.
2014-08-21 20:42:55 -07:00
friendica
e524835463
the rest of the diaspora local discovery stuff
2014-08-21 20:31:55 -07:00
friendica
921799b045
make the old personal xrd interface (old webfinger) work again
2014-08-21 17:42:19 -07:00
friendica
831714f0f0
profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer).
2014-08-21 16:46:24 -07:00
marijus
1a3be50451
Merge branch 'master' of https://github.com/friendica/red
2014-08-21 13:20:49 +02:00
friendica
a59a6fbd90
abook-edit-me class lost during some edit - we need this to reset the permission fields
2014-08-21 01:41:15 -07:00
friendica
b4aed12129
extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code.
2014-08-20 23:01:25 -07:00
friendica
af45b34ee0
verified that chatroom expire is working, so doing away with the second function to do the same thing.
...
If you have a problem with chatroom expiration, check that it was created with cr_expire set to 120 (minutes). Chatrooms created during the first couple of days of the chat feature didn't have this. You can set the DB value manually.
2014-08-20 20:49:03 -07:00
friendica
b8a5b7a610
restrict returned directory contents to xchans in the zot network. We could probably add other networks to this and create a distributed directory for the free web. It's highly unlikely we would do this but we *could*.
2014-08-20 19:36:01 -07:00
friendica
a169e5c4f3
restructure the author and owner info from feeds
2014-08-20 18:35:36 -07:00
friendica
a6829f7dcb
move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately)
2014-08-20 17:15:13 -07:00
friendica
e842359e9b
Merge https://github.com/friendica/red into pending_merge
2014-08-20 16:13:02 -07:00
friendica
f7895d322e
provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this.
2014-08-20 16:10:57 -07:00
marijus
0b95a60f22
Merge branch 'master' of https://github.com/friendica/red
2014-08-20 17:23:13 +02:00
zzottel
51d1f454db
Merge pull request #570 from zzottel/master
...
updated German main.bb doco file
2014-08-20 14:46:24 +02:00
zottel
ecf8b70794
updated German main.bb doco file
2014-08-20 14:44:55 +02:00
friendica
b102986929
greatly simplify consume_feed() - a lot of this was friendica specific and somebody may want to put some of it back in, but we'd be much better off building a zot compatible feed for friendica (hint,hint) - even if it didn't support the other protocol bits. Special purpose feed handlers for things like likes, dislikes, events, and community tags are better handled as zot arrays. We have all those handlers. We just need to pass them a JSON message instead of an XML/Atom message. Handlers for statusnet follow messages are another casualty. That's easy to bring back - but we need to keep driving nails into the XML coffin or the damn zombies will get out.
2014-08-20 04:38:17 -07:00
marijus
85ef5c1033
Merge branch 'master' of https://github.com/friendica/red
2014-08-20 08:05:40 +02:00
friendica
0fef39a326
fangs bared
2014-08-19 22:47:11 -07:00
friendica
0c8866acde
snakebite continued
2014-08-19 21:31:33 -07:00
friendica
c7fe071a1f
some work on network discovery
2014-08-19 19:38:42 -07:00
friendica
55d4ceb7e0
also reset comment policy on alternate delivery chains
2014-08-19 17:51:45 -07:00
friendica
8b5627e777
make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated
2014-08-19 17:47:32 -07:00
friendica
6feaa2689d
follow => connect
2014-08-19 16:26:46 -07:00
friendica
82389f8c1b
really really fix lockview (cross fingers) ;-)
2014-08-19 16:04:38 -07:00
RedMatrix
01a9c56ef9
Merge pull request #569 from git-marijus/master
...
really fix lock info
2014-08-20 08:52:21 +10:00
Jeroen
341892a7af
fix nl
2014-08-19 21:48:49 +00:00
marijus
0542125711
Merge branch 'master' of https://github.com/friendica/red
2014-08-19 22:31:22 +02:00
Jeroen
9f400229a7
Update nl
2014-08-19 20:22:15 +00:00
marijus
a10f39b994
really fix lock info
2014-08-19 22:01:33 +02:00
friendica
dc212c80e2
diaspora - crazy amount of work remaining
2014-08-19 02:00:34 -07:00
friendica
b3d450626e
provide an overt indication that a post/comment was edited.
2014-08-18 22:44:03 -07:00
friendica
206492e15d
Merge https://github.com/friendica/red into pending_merge
2014-08-18 20:04:19 -07:00
friendica
b522ab13cb
nav channel selection
2014-08-18 20:03:48 -07:00
RedMatrix
4ab14387df
Merge pull request #568 from git-marijus/master
...
make lockview provide the right info
2014-08-19 06:54:31 +10:00
marijus
953c8ac686
make lockview provide the right info
2014-08-18 21:25:02 +02:00
Paolo T
b5d1c7865b
Merge pull request #1 from friendica/master
...
Red master has been merged
2014-08-18 18:55:18 +02:00
friendica
d9ff121930
beginning of permission role settings
2014-08-17 22:53:00 -07:00
friendica
3dbc3e263d
add ability to follow somebody not already in your connections from "post actions" dropdown. bug: doesn't bring you back to this page.
2014-08-17 21:34:52 -07:00
friendica
cb027232ff
diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elephants standing on it. I'm working on the first tonne or two.
2014-08-17 20:37:52 -07:00
friendica
4a76925787
some more work on realms
2014-08-17 19:06:56 -07:00
friendica
de1198ccfe
Merge https://github.com/friendica/red into pending_merge
2014-08-17 17:49:25 -07:00
