| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 5 | -24/+30 |
| |\ | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| | * | show status editor in /display on share action. | Mario Vavti | 2015-07-10 | 1 | -1/+4 |
| | | | |||||
| | * | more webpages - generic-content-wrapper fixes | Mario Vavti | 2015-07-10 | 3 | -15/+18 |
| | | | |||||
| | * | add generic content wrapper to post/webpage editor and make editpost render ↵ | Mario Vavti | 2015-07-10 | 1 | -8/+6 |
| | | | | | | | | | correctly | ||||
| | * | revert | Mario Vavti | 2015-07-09 | 1 | -2/+2 |
| | | | | | | | | | do not show status editor in /display - we most probably want to read the thread or comment. | ||||
| | * | do not show status editor in /display - we most probably want to read the ↵ | Mario Vavti | 2015-07-09 | 1 | -1/+2 |
| | | | | | | | | | thread or comment. | ||||
| | * | increase width of the aside area and make default profile image size 300x300 | Mario Vavti | 2015-07-09 | 1 | -2/+2 |
| | | | |||||
| * | | inconsistent naming of block item types | redmatrix | 2015-07-08 | 3 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 1 | -11/+24 |
| |\| | |||||
| | * | fix sorting of channel suggestions | Mario Vavti | 2015-07-07 | 1 | -0/+1 |
| | | | |||||
| | * | rename function get_directory_settings => get_directory_setting and move ↵ | Mario Vavti | 2015-07-07 | 1 | -4/+9 |
| | | | | | | | | | sort options to directory title bar | ||||
| | * | make public forums only setting sticky and simplify function to get ↵ | Mario Vavti | 2015-07-07 | 1 | -10/+17 |
| | | | | | | | | | directory settings | ||||
| * | | Merge pull request #4 from git-marijus/master | redmatrix | 2015-07-08 | 1 | -1/+1 |
| |\ \ | | | | | | | abook_pending should probably be 1 in this place | ||||
| | * | | abook_pending should probably be 1 in this place | Mario Vavti | 2015-07-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | ok that's wretchedly inefficient but provides a basic relevance search for ↵ | redmatrix | 2015-07-06 | 2 | -2/+34 |
| |/ / | | | | | | | strings in doc files. | ||||
| * | | very crude but working doc search | redmatrix | 2015-07-05 | 1 | -1/+47 |
| | | | |||||
| * | | more work on db storage of doco | redmatrix | 2015-07-05 | 1 | -4/+55 |
| | | | |||||
| * | | mod/help: read doc files from the database if present and newer than the ↵ | redmatrix | 2015-07-04 | 1 | -5/+27 |
| | | | | | | | | | copy in the filesystem. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 2 | -0/+126 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | a few clone sync fixes as well as some work on hubzilla clone sync back to ↵ | redmatrix | 2015-07-02 | 2 | -0/+14 |
| | | | | | | | | | redmatrix | ||||
| | * | a bit of cleanup and explanatory text on mod/pconfig | redmatrix | 2015-07-02 | 1 | -6/+13 |
| | | | |||||
| | * | web version of util/pconfig | redmatrix | 2015-07-02 | 1 | -0/+105 |
| | | | |||||
| * | | turn attached audio/video into audio/video elements as well as providing an ↵ | redmatrix | 2015-07-01 | 2 | -3/+8 |
| | | | | | | | | | attachment link | ||||
| * | | cleanup of import to allow cross-product import going one way. Note - ↵ | redmatrix | 2015-06-30 | 1 | -9/+4 |
| | | | | | | | | | items/content are not yet importable | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-30 | 1 | -0/+14 |
| |\| | |||||
| | * | warn if export data file is from an incompatible project or if the DB ↵ | redmatrix | 2015-06-29 | 1 | -0/+14 |
| | | | | | | | | | version differs significantly from the current DB. This is to avoid people cloning a hubzilla channel back to red and potentially stuffing up the works. Hopefully we can migrate upwards someday. Downwards is always going to be an issue. | ||||
| * | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵ | redmatrix | 2015-06-30 | 1 | -15/+61 |
| | | | | | | | | | other way) | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -0/+1 |
| |\| | |||||
| | * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -2/+1 |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| | * | fix directory location | Mario Vavti | 2015-06-29 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 2 | -4/+13 |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 1 | -2/+2 |
| | |\ | |||||
| | | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -2/+10 |
| | |/ | | | | | | | still pretty cool. | ||||
| * | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 7 | -7/+7 |
| | | | | | | | | | HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. | ||||
| * | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 1 | -8/+0 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 2 | -4/+5 |
| |\| | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | ||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-24 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 |
| | | | | |||||
| * | | | more work on mail flags | redmatrix | 2015-06-23 | 3 | -15/+8 |
| | | | | |||||
| * | | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 4 | -5/+3 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 3 | -18/+29 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| | * | | typo | redmatrix | 2015-06-23 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-23 | 1 | -3/+3 |
| | |\ | |||||
| | | * | Merge pull request #356 from solstag/signature_edit_fix | redmatrix | 2015-06-23 | 1 | -2/+2 |
| | | |\ | | | | | | | | | properly trims edited posts before signing so signature verification … | ||||
| | | | * | properly trims edited posts before signing so signature verification works | Alexandre Hannud Abdo | 2015-06-23 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-22 | 1 | -0/+1 |
| | | |\| | |||||
| | | * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | some work on directory | Mario Vavti | 2015-06-23 | 1 | -14/+23 |
| | | |/ | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |