| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | profperm: abook_profile was being handled by profile id rather than ↵ | friendica | 2014-04-13 | 1 | -7/+7 |
| | | | | | profile_guid, causing private profiles to not be activated in many cases. | ||||
| * | Often somebody will join the matrix with a dodgy cert and we'll sort that ↵ | friendica | 2014-04-13 | 2 | -12/+26 |
| | | | | | out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-13 | 200 | -291/+588 |
| |\ | |||||
| | * | Merge pull request #411 from beardy-unixer/master | Thomas Willingham | 2014-04-13 | 1 | -6/+0 |
| | |\ | | | | | | | Tony has been near the Git again. | ||||
| | | * | Tony has been near the Git again. | Thomas Willingham | 2014-04-13 | 1 | -6/+0 |
| | |/ | |||||
| | * | Merge pull request #407 from tonybaldwin/master | RedMatrix | 2014-04-13 | 2 | -0/+7 |
| | |\ | | | | | | | added spoiler tag to bbcode help doc | ||||
| | | * | added breaks after added bbcode spoiler line | tony baldwin | 2014-04-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | added spoiler tag to bbcode help doc | tony baldwin | 2014-04-12 | 1 | -0/+1 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/master' | tony baldwin | 2014-04-12 | 326 | -15932/+20842 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css whatever | ||||
| | | * \ | Merge remote-tracking branch 'upstream/master' | Tony Baldwin | 2014-03-09 | 393 | -13322/+24226 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/redbasic/tpl/theme_settings.tpl reset to upstream | ||||
| | | * | | | took the padding out of bbcode.php | Tony Baldwin | 2014-03-09 | 1 | -8/+8 |
| | | | | | | |||||
| | | * | | | added padding around images floated right and left | Tony Baldwin | 2014-03-09 | 1 | -9/+16 |
| | | | | | | |||||
| | | * | | | reimplementing navbar colours that were undone by git-marjus | tony baldwin | 2014-02-20 | 2 | -4/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #408 from beardy-unixer/master | RedMatrix | 2014-04-13 | 199 | -291/+587 |
| | |\ \ \ \ | | | | | | | | | | | | | Update sabre | ||||
| | | * | | | | Update sabre | Thomas Willingham | 2014-04-12 | 199 | -291/+587 |
| | | | | | | | |||||
| * | | | | | | only show forum tags on contact autocomplete, not in the ACL selector | friendica | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | minor alignment issues | friendica | 2014-04-13 | 3 | -7/+14 |
| |/ / / / / | |||||
| * | | | | | remove extra tag logging | friendica | 2014-04-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | don't match quote remnants | friendica | 2014-04-12 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | let normal hashtags be quoted strings also | friendica | 2014-04-12 | 2 | -2/+21 |
| | | | | | | |||||
| * | | | | | major cleanup of handle_tag() | friendica | 2014-04-12 | 1 | -10/+48 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into prvtag | friendica | 2014-04-12 | 2 | -13/+16 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-12 | 1 | -13/+13 |
| | |\ \ \ \ | |||||
| | | * | | | | Ooops, replaced too many | Thomas Willingham | 2014-04-12 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Revert to prepare_text, use bbcode only for with | Thomas Willingham | 2014-04-12 | 1 | -15/+15 |
| | | | | | | | |||||
| | * | | | | | we seem to have lost any install text mentioning that subdirs and alternate ↵ | friendica | 2014-04-12 | 1 | -0/+3 |
| | |/ / / / | | | | | | | | | | | | | | | | ports aren't supported | ||||
| * | | | | | handle new tag declarations | friendica | 2014-04-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add forum mode to tag handling | friendica | 2014-04-12 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | this is looking better, call the forum version of a tag "foobar network", ↵ | friendica | 2014-04-12 | 2 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | besides altering the icon | ||||
| * | | | | | use icons for identification | friendica | 2014-04-11 | 2 | -3/+8 |
| | | | | | | |||||
| * | | | | | not quite right but I need to check it in so I can switch branches | friendica | 2014-04-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | the auto-complete part | friendica | 2014-04-11 | 1 | -1/+14 |
| | | | | | | |||||
| * | | | | | no this is the way to do it | friendica | 2014-04-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Use @+ to tag a forum and also restrict the post to the forum, this leaves ↵ | friendica | 2014-04-11 | 1 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | @! tags private - period. | ||||
| * | | | | via Mario: default channel permissions not working on channel page | friendica | 2014-04-11 | 1 | -6/+11 |
| | | | | | |||||
| * | | | | make sure we can find that function | friendica | 2014-04-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | we also need a loop breaker | friendica | 2014-04-11 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge pull request #405 from beardy-unixer/master | RedMatrix | 2014-04-12 | 4 | -21/+18 |
| |\| | | | | | | | | | | | A few little fixes | ||||
| | * | | | Never set background or color unless you set both. If this is needed | Thomas Willingham | 2014-04-11 | 1 | -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 Willingham | 2014-04-11 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Bring BBCode to profiles | Thomas Willingham | 2014-04-11 | 1 | -15/+15 |
| | | | | | |||||
| | * | | | Don't explicitly deny our strongest features existence. | Thomas Willingham | 2014-04-11 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Merge pull request #404 from git-marijus/master | RedMatrix | 2014-04-12 | 13 | -160/+123 |
| |\ \ \ \ | | | | | | | | | | | bootstrapify aclselector | ||||
| | * | | | | bootstrapify aclselector | marijus | 2014-04-11 | 13 | -160/+123 |
| | |/ / / | |||||
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-11 | 2 | -1083/+1218 |
| |\| | | | |||||
| | * | | | Merge pull request #403 from tuscanhobbit/master | Paolo T | 2014-04-11 | 2 | -1083/+1218 |
| | |\ \ \ | | | | | | | | | | | IT: strings updated | ||||
| | | * | | | IT: strings updated | Paolo Tacconi | 2014-04-11 | 2 | -1083/+1218 |
| | | | | | | |||||
| | | * | | | Merge pull request #2 from friendica/master | Paolo T | 2014-03-15 | 299 | -11985/+14694 |
| | | |\ \ \ | | | | | | | | | | | | | merge from friendica/red | ||||
| * | | | | | | soft revert 9bb7811 until we can look at it more closely. | friendica | 2014-04-11 | 3 | -1159/+1237 |
| | | | | | | | |||||
| * | | | | | | doc update | friendica | 2014-04-11 | 22 | -62/+92 |
| |/ / / / / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |