aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2114-469/+360
|\
| * abook-edit-me class lost during some edit - we need this to reset the ↵friendica2014-08-212-2/+2
| | | | | | | | permission fields
| * extensible profiles - add the input form elements. Still needs styling and ↵friendica2014-08-203-135/+123
| | | | | | | | 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.
| * verified that chatroom expire is working, so doing away with the second ↵friendica2014-08-202-24/+4
| | | | | | | | | | | | 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.
| * restrict returned directory contents to xchans in the zot network. We could ↵friendica2014-08-201-2/+2
| | | | | | | | 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*.
| * restructure the author and owner info from feedsfriendica2014-08-201-85/+58
| |
| * move Friendica photo migrator to addons, bring back a few XML scraping ↵friendica2014-08-204-176/+165
| | | | | | | | functions that we're going to require (unfortunately)
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-201-0/+1
| |\
| * | provide admin option for allowing rss/atom feed connections. Need to do this ↵friendica2014-08-202-45/+6
| | | | | | | | | | | | now before the feature is complete so that public sites don't get borked. We also will need a service class for this.
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-203-196/+51
|\ \ \ | | |/ | |/|
| * | Merge pull request #570 from zzottel/masterzzottel2014-08-201-0/+1
| |\ \ | | |/ | |/| updated German main.bb doco file
| | * updated German main.bb doco filezottel2014-08-201-0/+1
| | |
| * | greatly simplify consume_feed() - a lot of this was friendica specific and ↵friendica2014-08-202-196/+50
| |/ | | | | | | 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.
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-207-239/+373
|\|
| * fangs baredfriendica2014-08-191-1/+23
| |
| * snakebite continuedfriendica2014-08-191-53/+108
| |
| * some work on network discoveryfriendica2014-08-192-168/+167
| |
| * also reset comment policy on alternate delivery chainsfriendica2014-08-191-2/+4
| |
| * make sure privacy scope is completely reset on second delivery chain - ↵friendica2014-08-191-8/+62
| | | | | | | | revert if there are forum issues, this is subtle and complicated
| * follow => connectfriendica2014-08-191-1/+1
| |
| * really really fix lockview (cross fingers) ;-)friendica2014-08-191-5/+7
| |
| * Merge pull request #569 from git-marijus/masterRedMatrix2014-08-201-1/+2
| |\ | | | | | | really fix lock info
| * | fix nlJeroen2014-08-192-3/+3
| | |
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-192-5927/+6256
|\| | | |/ |/|
| * Update nlJeroen2014-08-192-5927/+6256
| |
* | really fix lock infomarijus2014-08-191-1/+2
|/
* diaspora - crazy amount of work remainingfriendica2014-08-192-81/+64
|
* provide an overt indication that a post/comment was edited.friendica2014-08-183-4/+6
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-181-5/+4
|\
| * Merge pull request #568 from git-marijus/masterRedMatrix2014-08-191-5/+4
| |\ | | | | | | make lockview provide the right info
| | * make lockview provide the right infomarijus2014-08-181-5/+4
| |/
* / nav channel selectionfriendica2014-08-185-3/+26
|/
* beginning of permission role settingsfriendica2014-08-172-1/+61
|
* add ability to follow somebody not already in your connections from "post ↵friendica2014-08-171-0/+5
| | | | actions" dropdown. bug: doesn't bring you back to this page.
* diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of ↵friendica2014-08-171-218/+118
| | | | elephants standing on it. I'm working on the first tonne or two.
* some more work on realmsfriendica2014-08-176-15/+54
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-178-2472/+2923
|\
| * Merge pull request #567 from tuscanhobbit/masterPaolo T2014-08-172-1208/+1416
| |\ | | | | | | IT: strings updated
| | * IT: strings updatedtuscanhobbit2014-08-172-1208/+1416
| | |
| * | Doco - attempt to explain pull requests in git for non developers.Thomas Willingham2014-08-171-2/+27
| | |
| * | Merge pull request #565 from RedMatrixCanada/BranchRedMatrix2014-08-172-1197/+1387
| |\ \ | | | | | | | | French Transalations - UPDATED
| | * | French Transalations - UPDATEDRedMatrixCanada2014-08-162-1197/+1387
| | | |
| * | | Merge pull request #566 from tonnerkiller/masterRedMatrix2014-08-173-65/+93
| |\ \ \ | | |/ / | |/| | Posting by API and Wordpress plugin
| | * | Added "if(!function_exists('xpost_to_html2bbcode'))"tonnerkiller2014-08-161-64/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | api_posting.bb is a new doco file that explains posting to the redmatrix ↵tonnerkiller2014-08-162-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | add collections widget to connections page - and some more work on realmsfriendica2014-08-175-2/+27
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-163-4/+7
|\ \ \
| * \ \ Merge pull request #564 from cvogeley/masterRedMatrix2014-08-172-3/+6
| |\ \ \ | | | | | | | | | | Add account deletion to the UI
| | * | | Add account deletion to the UIChristian Vogeley2014-08-162-3/+6
| | | | |
| * | | | Install doc - mcrypt is required, not optional. Even if it's intendedThomas Willingham2014-08-161-1/+1
| | |/ / | |/| | | | | | | | | | to be optional, it isn't. WSoD abound without it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 05:54:08 +0000