Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | abook clone sync - change logic to also unset existing cross-project flags ↵ | redmatrix | 2015-07-16 | 1 | -16/+8 |
| | | | | besides just setting them | ||||
* | don't including rating stuff from cloned abooks | redmatrix | 2015-07-16 | 1 | -1/+1 |
| | |||||
* | fix observer tags for now (issue #17) | zottel | 2015-07-16 | 1 | -1/+1 |
| | |||||
* | since we've got a fresh start without a lot of legacy sites to support, ↵ | redmatrix | 2015-07-15 | 1 | -1/+2 |
| | | | | provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided. | ||||
* | make tagadelic results (including categories in wall-to-wall posts) visible ↵ | redmatrix | 2015-07-15 | 3 | -11/+17 |
| | | | | to wall visitors by checking ownership rather than authorship. It is doubtful the queries will scale on redmatrix so moved forward to hubzilla tree. | ||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -3/+9 |
|\ | | | | | | | | | Conflicts: include/zot.php | ||||
| * | fix for empty recip array resulting from a mangled xchan | redmatrix | 2015-07-15 | 1 | -5/+8 |
| | | |||||
* | | more clone sync issues across projects | redmatrix | 2015-07-15 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -2/+7 |
|\| | |||||
| * | clone sync fixes across red/hz | redmatrix | 2015-07-15 | 1 | -2/+7 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -0/+6 |
|\| | |||||
| * | stream_perms_xchans() set to empty quoted string when no results rather than ↵ | redmatrix | 2015-07-14 | 1 | -0/+6 |
| | | | | | | | | return an empty string | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 2 | -2/+4 |
|\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-07-14 | 2 | -1/+19 |
| |\ | |||||
| | * | cleanup connedit | Mario Vavti | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | coverup and ignore the illegal string offset message that some sites have ↵ | redmatrix | 2015-07-14 | 1 | -1/+3 |
| | | | | | | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. | ||||
* | | | merge from redmatrix | redmatrix | 2015-07-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-13 | 2 | -1/+23 |
|\ \ \ | | |/ | |/| | |||||
| * | | change account_default_channel if default channel is removed | zottel | 2015-07-13 | 1 | -0/+18 |
| |/ | |||||
| * | Only let local logins install webpage elements | redmatrix | 2015-07-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-10 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php | ||||
| * | increase width of the aside area and make default profile image size 300x300 | Mario Vavti | 2015-07-09 | 1 | -1/+1 |
| | | |||||
| * | fix typo to make directory safe mode default to on work again | Mario Vavti | 2015-07-08 | 1 | -1/+1 |
| | | |||||
* | | inconsistent naming of block item types | redmatrix | 2015-07-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-07 | 3 | -46/+21 |
|\| | |||||
| * | fix sorting of channel suggestions | Mario Vavti | 2015-07-07 | 1 | -1/+1 |
| | | |||||
| * | rename function get_directory_settings => get_directory_setting and move ↵ | Mario Vavti | 2015-07-07 | 2 | -21/+5 |
| | | | | | | | | sort options to directory title bar | ||||
| * | make public forums only setting sticky and simplify function to get ↵ | Mario Vavti | 2015-07-07 | 2 | -29/+17 |
| | | | | | | | | directory settings | ||||
| * | code style correction | Mario Vavti | 2015-07-07 | 1 | -3/+2 |
| | | |||||
| * | make directory suggest work with directory options | Mario Vavti | 2015-07-07 | 2 | -3/+7 |
| | | |||||
* | | incorrect value for hubloc_deleted in zot_get_hublocs() query | redmatrix | 2015-07-07 | 1 | -1/+1 |
| | | |||||
* | | more work on db storage of doco | redmatrix | 2015-07-05 | 2 | -2/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po | ||||
| * | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 1 | -2/+5 |
| | | | | | | | | accidental import/export doesn't chuck a wobbly. | ||||
* | | start doco cleanup | redmatrix | 2015-07-03 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 2 | -1/+14 |
|\| | | | | | | | | | 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/+36 |
| | | | | | | | | redmatrix | ||||
* | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 1 | -0/+21 |
|\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | ||||
| * | provide backward compatibility with hubzilla extended item export | redmatrix | 2015-07-01 | 1 | -0/+55 |
| | | |||||
* | | provide compatibility with redmatrix extended item export | redmatrix | 2015-07-01 | 1 | -3/+50 |
| | | |||||
* | | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵ | redmatrix | 2015-06-30 | 1 | -3/+2 |
| | | | | | | | | other way) | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 2 | -0/+6 |
|\| | |||||
| * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 2 | -0/+6 |
| | | |||||
* | | fix the postgres schema with all the changes to date | redmatrix | 2015-06-29 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 2 | -1/+100 |
|\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | ||||
| * | some prep work | redmatrix | 2015-06-29 | 2 | -1/+100 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 2 | -17/+94 |
|\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 2 | -17/+93 |
| | | | | | | | | still pretty cool. | ||||
* | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 |
| | | |||||
* | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 2 | -53/+39 |
| | | | | | | | | 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. |