aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added breaks after added bbcode spoiler linetony baldwin2014-04-121-1/+1
* added spoiler tag to bbcode help doctony baldwin2014-04-121-0/+1
* Merge remote-tracking branch 'upstream/master'tony baldwin2014-04-12326-15932/+20842
|\
| * 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 p...friendica2014-04-121-0/+3
| |/
| * 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
| |\
| | * Never set background or color unless you set both. If this is neededThomas Willingham2014-04-111-1/+0
| | * 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 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 updatedPaolo Tacconi2014-04-112-1083/+1218
| | | * Merge pull request #2 from friendica/masterPaolo T2014-03-15299-11985/+14694
| | | |\
| * | | | 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 de...friendica2014-04-101-14/+14
| * | | 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 some more details about why browser-valid SSL certificates must besasiflo2014-04-103-3/+32
| * | | | | push notes widget updates to channel clones on focusout (final save). Don't d...friendica2014-04-102-3/+13
| |/ / / /
| * | | | Discover page: when importing public items, alter the item so that it has the...friendica2014-04-101-0/+19
| * | | | move the deleted flag setting to encode_item_flags() where it belongs now tha...friendica2014-04-101-4/+3
| * | | | Include the entire original item when notifying other channels of deletions a...friendica2014-04-104-8/+3
| |/ / /
| * | | improve the appearance of the ACL selector in a hackish way on the short term -friendica2014-04-092-4/+4
| * | | 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
| | |\ \ \
| | | * | | use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblo...marijus2014-04-098-8/+5
| | | * | | 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 'new/se...friendica2014-04-092-9/+10
| |/ / / / /
| * | | | | 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
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Correction for #401: Theme redbasic extended.sasiflo2014-04-101-1/+1
| | | * | | | Extended theme redbasic: Allow to center the content (aside + converse)sasiflo2014-04-094-15/+33
| | |/ / / /
| * / / / / 'anybody in this network' permissions were not being allowed for non-connecte...friendica2014-04-092-7/+23
| |/ / / /
| * / / / strip affinity tool labels on ultra-small screens; otherwise they just smush ...friendica2014-04-082-1/+2
| |/ / /
| * | | some fixes to #395friendica2014-04-073-3/+3
| * | | possible fix for issue #398friendica2014-04-071-3/+11
| * | | pass the original element title through the element stack so that it we don't...friendica2014-04-072-0/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 14:15:17 +0000