aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do.
* 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
| | | | | | | | | | deserve it's own commit, but if I don't fix it now, nobody will notice for another18 months.
* | honour service class restrictions for total_identities, total_channels ↵friendica2014-09-153-5/+87
|/ | | | ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
* 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 ↵friendica2014-09-151-3/+6
| | | | | | | | tools to implement mod_hubman
* | 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
| | | | | | | | also pushed to the wrong repo
| * Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
| | | | | | | | they're also an admin.
* | allow the site to designate an admin channel that's visible to the outside ↵friendica2014-09-142-2/+9
| | | | | | | | world (via siteinfo/json). Otherwise we'll use the default channel of any accounts that have the account admin role.
* | 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 ↵friendica2014-09-141-168/+12
| | | | | | now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours.
* 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 ↵friendica2014-09-141-2/+20
| | | | | | | | | | | | post cannot be enforced on remote networks. Restrict these posts to zot network.
* | | A bit of mod/home refactoring. This is a transient state, so it's stillThomas Willingham2014-09-151-20/+27
| |/ |/| | | | | messy, but it'll be much nicer after the move is finished.
* | Deprecate site channel. The sys channel should be doing this. Will fixThomas Willingham2014-09-152-4/+3
| | | | | | | | shortly.
* | tryout - some more adjustmentsmarijus2014-09-141-3/+1
| |
* | Thanks to Thomas other people see now your posts on your channel page also ↵Jeroen2014-09-141-1/+1
| | | | | | | | linked to source. If enabled.
* | Made link post titles to source optional in display settings. Hopefully I ↵Jeroen2014-09-144-3/+12
| | | | | | | | did a right.
* | 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; ↵friendica2014-09-143-31/+55
| | | | don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
* 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
| |
| * Doco - some links that got stripped at some pointThomas Willingham2014-09-131-0/+3
| |
| * remove this hub from fallback serversmarijus2014-09-131-2/+1
| |
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-132-216/+1
| |\
| | * Here, have a semi-colonThomas Willingham2014-09-131-1/+1
| | |
| | * Only use one install fileThomas Willingham2014-09-132-216/+1
| | |
| * | cleanup after recent changes in mod photosmarijus2014-09-133-63/+4
| |/
| * Merge pull request #592 from jeroenpraat/masterRedMatrix2014-09-131-1/+1
| |\ | | | | | | Issue #590: Linked conversation titles to source.
| | * Issue #590: Linked conversation titles to source. jeroenpraat2014-09-121-1/+1
| | | | | | | | | If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
* | | some backend work for the remaining missing bits of mod_hubman - this is ↵friendica2014-09-134-6/+258
|/ / | | | | | | still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
* | log why this doesn't get executedfriendica2014-09-121-0/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-127-468/+525
|\ \
| * | define justifiedGalleryActive in head.tpl to not break other pages autoloadmarijus2014-09-122-1/+2
| | |
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-121-2/+2
| |\ \