aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no sense maintaining 2 to-do files. I think the one I'm removing is reference...friendica2014-09-162-83/+0
* Merge pull request #595 from solstag/masterRedMatrix2014-09-172-2/+2
|\
| * Fix name attribute of button elements so jquery '.submit()' doesn't breakAlexandre Hannud Abdo2014-09-162-2/+2
* | that's why bb2diaspora_itemwallwall() wasn't doing its thang.friendica2014-09-161-3/+3
* | still some old Friendica database queries in diaspora_signed_retractionfriendica2014-09-161-17/+15
* | z_post_url_json() added to easily deal with JSON post APIs; without getting c...friendica2014-09-161-0/+17
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-161-2/+2
|\|
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-161-9/+4
| |\
| * | this still has less issuesmarijus2014-09-161-2/+2
* | | just mark dead hubloc deleted - don't remove them. This could cause problems....friendica2014-09-163-13/+9
| |/ |/|
* | when importing channels - use the new location notification message to tell y...friendica2014-09-161-9/+4
|/
* use the more portable encoded_item format for exported items - but with added...friendica2014-09-163-16/+32
* push individual block to directoryfriendica2014-09-151-0/+1
* fat finger - must have been here a whilefriendica2014-09-151-1/+1
* change platform name to redmatrix (lowercase, one word) for use in meta tags ...friendica2014-09-156-1/+4949
* channel export with itemsfriendica2014-09-154-7/+47
* additions and edits to the faqfriendica2014-09-151-5/+8
* couple of edits to make this more currentfriendica2014-09-151-7/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-152-2/+2
|\
| * Trivial typo - concatenated string that should be. Doesn't reallyThomas Willingham2014-09-162-2/+2
* | honour service class restrictions for total_identities, total_channels ("frie...friendica2014-09-153-5/+87
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-152-8/+20
|\
| * See comments on commit 5ab85b0. Also fixed some bb typo's in docu index.Jeroen2014-09-152-8/+20
* | final piece of the mrjive delivery puzzle, and now we've got most all the too...friendica2014-09-151-3/+6
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-151-2/+2
|\|
| * heading font-size should not be tied to font-size for posts and commentsmarijus2014-09-151-2/+2
* | rev updatefriendica2014-09-151-1/+1
|/
* this is probably better in most casesmarijus2014-09-151-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-140-0/+0
|\
| * Bugger, revert - not only a dodgy cut and paste between terminals, butThomas Willingham2014-09-151-14/+0
| * Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
* | allow the site to designate an admin channel that's visible to the outside wo...friendica2014-09-142-2/+9
* | provide a way to sync locations and get rid of bogus hublocs, now implementedfriendica2014-09-145-14/+73
|/
* that won't work...friendica2014-09-141-1/+2
* bb2diaspora_itemwallwall not finding author elements - inserting empty bbcodefriendica2014-09-141-0/+4
* fix diaspora_retractionfriendica2014-09-141-7/+4
* pull the plug on the old location sync section of import_xchan - this has now...friendica2014-09-141-168/+12
* Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-151-2/+20
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-147-15/+21
| |\
| * | privacy issue - restrictive stream permission setting with a non-targetted po...friendica2014-09-141-2/+20
* | | A bit of mod/home refactoring. This is a transient state, so it's stillThomas Willingham2014-09-151-20/+27
| |/ |/|
* | Deprecate site channel. The sys channel should be doing this. Will fixThomas Willingham2014-09-152-4/+3
* | tryout - some more adjustmentsmarijus2014-09-141-3/+1
* | Thanks to Thomas other people see now your posts on your channel page also li...Jeroen2014-09-141-1/+1
* | Made link post titles to source optional in display settings. Hopefully I did...Jeroen2014-09-144-3/+12
* | tryout - fetch larger thumbnail if image gets streched over its sizemarijus2014-09-141-6/+6
|/
* more heavy lifting on the hubloc management and revocation infrastructure; do...friendica2014-09-143-31/+55
* Merge https://github.com/friendica/red into pending_mergefriendica2014-09-1310-392/+32
|\
| * Doco - kill dupeThomas Willingham2014-09-131-105/+0
| * Bring DB doco up to dateThomas Willingham2014-09-131-5/+22