Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-15 | 1 | -2/+2 |
|\ | |||||
| * | heading font-size should not be tied to font-size for posts and comments | marijus | 2014-09-15 | 1 | -2/+2 |
| | | |||||
* | | rev update | friendica | 2014-09-15 | 1 | -1/+1 |
|/ | |||||
* | this is probably better in most cases | marijus | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-14 | 0 | -0/+0 |
|\ | |||||
| * | Bugger, revert - not only a dodgy cut and paste between terminals, but | Thomas Willingham | 2014-09-15 | 1 | -14/+0 |
| | | | | | | | | also pushed to the wrong repo | ||||
| * | Very, very cautiously, let a developer switch to the sys chan, if | Thomas Willingham | 2014-09-15 | 1 | -0/+14 |
| | | | | | | | | they're also an admin. | ||||
* | | allow the site to designate an admin channel that's visible to the outside ↵ | friendica | 2014-09-14 | 2 | -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 implemented | friendica | 2014-09-14 | 5 | -14/+73 |
|/ | |||||
* | that won't work... | friendica | 2014-09-14 | 1 | -1/+2 |
| | |||||
* | bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode | friendica | 2014-09-14 | 1 | -0/+4 |
| | |||||
* | fix diaspora_retraction | friendica | 2014-09-14 | 1 | -7/+4 |
| | |||||
* | pull the plug on the old location sync section of import_xchan - this has ↵ | friendica | 2014-09-14 | 1 | -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/red | Thomas Willingham | 2014-09-15 | 1 | -2/+20 |
|\ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-14 | 7 | -15/+21 |
| |\ | |||||
| * | | privacy issue - restrictive stream permission setting with a non-targetted ↵ | friendica | 2014-09-14 | 1 | -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 still | Thomas Willingham | 2014-09-15 | 1 | -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 fix | Thomas Willingham | 2014-09-15 | 2 | -4/+3 |
| | | | | | | | | shortly. | ||||
* | | tryout - some more adjustments | marijus | 2014-09-14 | 1 | -3/+1 |
| | | |||||
* | | Thanks to Thomas other people see now your posts on your channel page also ↵ | Jeroen | 2014-09-14 | 1 | -1/+1 |
| | | | | | | | | linked to source. If enabled. | ||||
* | | Made link post titles to source optional in display settings. Hopefully I ↵ | Jeroen | 2014-09-14 | 4 | -3/+12 |
| | | | | | | | | did a right. | ||||
* | | tryout - fetch larger thumbnail if image gets streched over its size | marijus | 2014-09-14 | 1 | -6/+6 |
|/ | |||||
* | more heavy lifting on the hubloc management and revocation infrastructure; ↵ | friendica | 2014-09-14 | 3 | -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_merge | friendica | 2014-09-13 | 10 | -392/+32 |
|\ | |||||
| * | Doco - kill dupe | Thomas Willingham | 2014-09-13 | 1 | -105/+0 |
| | | |||||
| * | Bring DB doco up to date | Thomas Willingham | 2014-09-13 | 1 | -5/+22 |
| | | |||||
| * | Doco - some links that got stripped at some point | Thomas Willingham | 2014-09-13 | 1 | -0/+3 |
| | | |||||
| * | remove this hub from fallback servers | marijus | 2014-09-13 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-13 | 2 | -216/+1 |
| |\ | |||||
| | * | Here, have a semi-colon | Thomas Willingham | 2014-09-13 | 1 | -1/+1 |
| | | | |||||
| | * | Only use one install file | Thomas Willingham | 2014-09-13 | 2 | -216/+1 |
| | | | |||||
| * | | cleanup after recent changes in mod photos | marijus | 2014-09-13 | 3 | -63/+4 |
| |/ | |||||
| * | Merge pull request #592 from jeroenpraat/master | RedMatrix | 2014-09-13 | 1 | -1/+1 |
| |\ | | | | | | | Issue #590: Linked conversation titles to source. | ||||
| | * | Issue #590: Linked conversation titles to source. | jeroenpraat | 2014-09-12 | 1 | -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 ↵ | friendica | 2014-09-13 | 4 | -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 executed | friendica | 2014-09-12 | 1 | -0/+2 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-12 | 7 | -468/+525 |
|\ \ | |||||
| * | | define justifiedGalleryActive in head.tpl to not break other pages autoload | marijus | 2014-09-12 | 2 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-12 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | This is even better. Adapts better to Red user settings. | Jeroen | 2014-09-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | reset testing values back to default | marijus | 2014-09-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | do not load next page if justifiedGallery() is not ready yet | marijus | 2014-09-12 | 2 | -4/+5 |
| |/ / | |||||
| * | | H1-H6 simplified (less font sizes), rem | Jeroen | 2014-09-12 | 1 | -0/+12 |
| | | | |||||
| * | | expert_mode > expert | Jeroen | 2014-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed. Thanks to Thomas. | Jeroen | 2014-09-12 | 1 | -4/+3 |
| | | | |||||
| * | | Merge pull request #591 from tuscanhobbit/dev | Paolo T | 2014-09-12 | 2 | -463/+506 |
| |\ \ | | | | | | | | | IT localization updated | ||||
| | * | | IT localization updated | tuscanhobbit | 2014-09-12 | 2 | -463/+506 |
| |/ / | |||||
| * | | Addon count on addon settings page (featured) doesnt work (always 0). ↵ | Jeroen | 2014-09-12 | 1 | -2/+3 |
| | | | | | | | | | | | | Commented out. | ||||
* | | | make the xchan diagnostic tool useful | friendica | 2014-09-12 | 1 | -2/+14 |
| | | | |||||
* | | | doc updates | friendica | 2014-09-12 | 2 | -0/+141 |
|/ / |