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
friendica
82eb265a20
add collections widget to connections page - and some more work on realms
2014-08-17 17:48:41 -07:00
Paolo T
1ddbd44fb0
Merge pull request #567 from tuscanhobbit/master
...
IT: strings updated
2014-08-17 19:35:16 +02:00
tuscanhobbit
3b979dd2a9
IT: strings updated
2014-08-17 19:32:44 +02:00
Thomas Willingham
8d3dc7541d
Doco - attempt to explain pull requests in git for non developers.
2014-08-17 14:57:39 +01:00
RedMatrix
bb3768d172
Merge pull request #565 from RedMatrixCanada/Branch
...
French Transalations - UPDATED
2014-08-17 18:49:10 +10:00
RedMatrix
33d43a2a64
Merge pull request #566 from tonnerkiller/master
...
Posting by API and Wordpress plugin
2014-08-17 18:48:43 +10:00
RedMatrixCanada
8c366154c3
French Transalations - UPDATED
2014-08-16 20:52:59 -04:00
friendica
bf3dc80233
Merge https://github.com/friendica/red into pending_merge
2014-08-16 16:11:53 -07:00
friendica
20bdcb037f
provide backend storage and declaration of directory realm
2014-08-16 16:10:35 -07:00
RedMatrix
e4620179ac
Merge pull request #564 from cvogeley/master
...
Add account deletion to the UI
2014-08-17 08:33:13 +10:00
Thomas Willingham
e3c8d36e06
Install doc - mcrypt is required, not optional. Even if it's intended
...
to be optional, it isn't. WSoD abound without it.
2014-08-16 20:48:23 +01:00
Christian Vogeley
54fe09f466
Add account deletion to the UI
2014-08-16 16:28:07 +02:00
tonnerkiller
bac1ed2214
Added "if(!function_exists('xpost_to_html2bbcode'))"
...
This function name is also used by post to friendica plugin
Both functions seem to be identical. If you have both plugins installed
you get an error because of the identical function name
This will avoid the attempt to load the function a second time in case
it was already loaded by the post to friendica plugin
2014-08-16 15:48:44 +02:00
tonnerkiller
03678716fe
api_posting.bb is a new doco file that explains posting to the redmatrix from an external program by exampple of command line tool curl
...
main.bb is an updated version of the doco main site with a link to api_posting.bb
2014-08-16 13:13:57 +02:00
friendica
ba0bf596b5
Merge https://github.com/friendica/red into pending_merge
2014-08-15 14:46:59 -07:00
friendica
481263dc25
bring back some friendica crypto stuff including all the key mangling and translation functions. Also add ability to completely supress email notifications for actitivies with private contents. We'll still pass private mail notifications because often the email notification is the only way infrequently used channels get alerted to these.
2014-08-15 14:42:14 -07:00
RedMatrix
73c209f325
Merge pull request #563 from zzottel/master
...
don't block "public" messages with authenticated scope
2014-08-16 07:07:36 +10:00