aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into prvtagfriendica2014-04-122-13/+16
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-04-121-13/+13
| |\
| | * Ooops, replaced too manyThomas Willingham2014-04-121-2/+2
| | |
| | * Revert to prepare_text, use bbcode only for withThomas Willingham2014-04-121-15/+15
| | |
| * | we seem to have lost any install text mentioning that subdirs and alternate ↵friendica2014-04-121-0/+3
| |/ | | | | | | ports aren't supported
* | handle new tag declarationsfriendica2014-04-121-1/+1
| |
* | add forum mode to tag handlingfriendica2014-04-121-2/+9
| |
* | this is looking better, call the forum version of a tag "foobar network", ↵friendica2014-04-122-9/+6
| | | | | | | | besides altering the icon
* | use icons for identificationfriendica2014-04-112-3/+8
| |
* | not quite right but I need to check it in so I can switch branchesfriendica2014-04-111-2/+2
| |
* | the auto-complete partfriendica2014-04-111-1/+14
| |
* | no this is the way to do itfriendica2014-04-111-2/+2
| |
* | Use @+ to tag a forum and also restrict the post to the forum, this leaves ↵friendica2014-04-111-2/+2
|/ | | | @! tags private - period.
* via Mario: default channel permissions not working on channel pagefriendica2014-04-111-6/+11
|
* make sure we can find that functionfriendica2014-04-111-0/+1
|
* we also need a loop breakerfriendica2014-04-111-0/+6
|
* Merge pull request #405 from beardy-unixer/masterRedMatrix2014-04-124-21/+18
|\ | | | | A few little fixes
| * Never set background or color unless you set both. If this is neededThomas Willingham2014-04-111-1/+0
| | | | | | | | in future, it should probably be reimplmented with the class anyway.
| * Don't count deleted channels when figuring out where to send a user on login.Thomas Willingham2014-04-111-2/+3
| |
| * Bring BBCode to profilesThomas Willingham2014-04-111-15/+15
| |
| * Don't explicitly deny our strongest features existence.Thomas Willingham2014-04-111-3/+0
| |
* | Merge pull request #404 from git-marijus/masterRedMatrix2014-04-1213-160/+123
|\ \ | | | | | | bootstrapify aclselector
| * | bootstrapify aclselectormarijus2014-04-1113-160/+123
| |/
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-112-1083/+1218
|\|
| * Merge pull request #403 from tuscanhobbit/masterPaolo T2014-04-112-1083/+1218
| |\ | | | | | | IT: strings updated
| | * IT: strings updatedPaolo Tacconi2014-04-112-1083/+1218
| | |
| | * Merge pull request #2 from friendica/masterPaolo T2014-03-15299-11985/+14694
| | |\ | | | | | | | | merge from friendica/red
* | | | soft revert 9bb7811 until we can look at it more closely.friendica2014-04-113-1159/+1237
| | | |
* | | | doc updatefriendica2014-04-1122-62/+92
|/ / /
* | | add the message-id to delivery reports. This _could_ allow an enterprising ↵friendica2014-04-101-14/+14
| | | | | | | | | | | | developer to collect the delivery reports for a given post and store them in a DB table so that the sender could track and verify where a message had been sent on a web page and verify the success or failure of those attempts without requiring admin access. (To be fair this would also need an extra flag which hasn't yet been implemented to indicate that a channel created a second delivery chain of the message).
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-103-3/+32
|\ \ \
| * \ \ Merge pull request #402 from sasiflo/masterRedMatrix2014-04-113-3/+32
| |\ \ \ | | | | | | | | | | Added info about SSL certificates
| | * | | Added some more details about why browser-valid SSL certificates must besasiflo2014-04-103-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used when SSL is used at all. It is now in the check failure message in the installation routine, the installation readme and in the documentation pages.
* | | | | push notes widget updates to channel clones on focusout (final save). Don't ↵friendica2014-04-102-3/+13
|/ / / / | | | | | | | | | | | | do this for the auto-save events (every ten seconds) which could generate superfluous network traffic.
* | | | Discover page: when importing public items, alter the item so that it has ↵friendica2014-04-101-0/+19
| | | | | | | | | | | | | | | | the characteristics of one that was sourced by the sys channel instead of just being stored under the sys channel uid. This should allow comments and likes to flow upstream if permissions allow and may fix issue #398. Permission may still be denied by the original poster, but without this the comment/like is treated as a forgery and is blocked from transmission.
* | | | move the deleted flag setting to encode_item_flags() where it belongs now ↵friendica2014-04-101-4/+3
| | | | | | | | | | | | | | | | that we aren't giving deleted posts special treatment.
* | | | Include the entire original item when notifying other channels of deletions ↵friendica2014-04-104-8/+3
|/ / / | | | | | | | | | as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached.
* | | improve the appearance of the ACL selector in a hackish way on the short term -friendica2014-04-092-4/+4
| | | | | | | | | | | | it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly.
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-0925-83/+70
|\ \ \
| * \ \ Merge pull request #399 from git-marijus/masterRedMatrix2014-04-1025-83/+70
| |\ \ \ | | | | | | | | | | change the way jot tools are displayed/hidden
| | * | | use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵marijus2014-04-098-8/+5
| | | | | | | | | | | | | | | | | | | | editblock and editlayout which still depended on it.
| | * | | replace lock icon with icon-{lock, unlock}marijus2014-04-0911-37/+19
| | | | |
| | * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-04-092-1/+2
| | |\ \ \
| | * | | | whitespace cleanupmarijus2014-04-081-6/+6
| | | | | |
| | * | | | change the way jot tools are displayed/hiddenmarijus2014-04-0815-36/+44
| | | | | |
* | | | | | issue #400 - lock not showing up for previews of private mentions (or ↵friendica2014-04-092-9/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 'new/search' item view) also reformat the new/search template to pick up recent changes to conv_item.tpl
* | | | | whitespace - nothing elsefriendica2014-04-091-154/+154
| | | | |
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-094-15/+33
|\ \ \ \ \
| * \ \ \ \ Merge pull request #401 from sasiflo/masterRedMatrix2014-04-104-15/+33
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Extended theme redbasic: Allow to center the content (aside + converse)
| | * | | | Correction for #401: Theme redbasic extended.sasiflo2014-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use max-width instead of width to allow mobile devices to reflow the content.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 20:59:20 +0000