aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-3/+9
|\ | | | | | | | | Conflicts: include/zot.php
| * fix for empty recip array resulting from a mangled xchanredmatrix2015-07-151-5/+8
| |
* | more clone sync issues across projectsredmatrix2015-07-151-5/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-151-2/+7
|\|
| * clone sync fixes across red/hzredmatrix2015-07-151-2/+7
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+6
|\|
| * stream_perms_xchans() set to empty quoted string when no results rather than ↵redmatrix2015-07-141-0/+6
| | | | | | | | return an empty string
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-142-2/+4
|\| | | | | | | | | Conflicts: mod/connedit.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-142-1/+19
| |\
| | * cleanup conneditMario Vavti2015-07-141-1/+1
| | |
| * | coverup and ignore the illegal string offset message that some sites have ↵redmatrix2015-07-141-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 redmatrixredmatrix2015-07-131-1/+1
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-132-1/+23
|\ \ \ | | |/ | |/|
| * | change account_default_channel if default channel is removedzottel2015-07-131-0/+18
| |/
| * Only let local logins install webpage elementsredmatrix2015-07-111-1/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-102-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 300x300Mario Vavti2015-07-091-1/+1
| |
| * fix typo to make directory safe mode default to on work againMario Vavti2015-07-081-1/+1
| |
* | inconsistent naming of block item typesredmatrix2015-07-081-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-073-46/+21
|\|
| * fix sorting of channel suggestionsMario Vavti2015-07-071-1/+1
| |
| * rename function get_directory_settings => get_directory_setting and move ↵Mario Vavti2015-07-072-21/+5
| | | | | | | | sort options to directory title bar
| * make public forums only setting sticky and simplify function to get ↵Mario Vavti2015-07-072-29/+17
| | | | | | | | directory settings
| * code style correctionMario Vavti2015-07-071-3/+2
| |
| * make directory suggest work with directory optionsMario Vavti2015-07-072-3/+7
| |
* | incorrect value for hubloc_deleted in zot_get_hublocs() queryredmatrix2015-07-071-1/+1
| |
* | more work on db storage of docoredmatrix2015-07-052-2/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-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 ↵redmatrix2015-07-031-2/+5
| | | | | | | | accidental import/export doesn't chuck a wobbly.
* | start doco cleanupredmatrix2015-07-031-0/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-022-1/+14
|\| | | | | | | | | Conflicts: include/zot.php
| * a few clone sync fixes as well as some work on hubzilla clone sync back to ↵redmatrix2015-07-022-0/+36
| | | | | | | | redmatrix
* | sync abook entries from redmatrixredmatrix2015-07-021-0/+21
|\| | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
| * provide backward compatibility with hubzilla extended item exportredmatrix2015-07-011-0/+55
| |
* | provide compatibility with redmatrix extended item exportredmatrix2015-07-011-3/+50
| |
* | lots of work on clone/import from redmatrix to hubzilla (won't go back the ↵redmatrix2015-06-301-3/+2
| | | | | | | | other way)
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-292-0/+6
|\|
| * turn the connection filter into a feature.redmatrix2015-06-292-0/+6
| |
* | fix the postgres schema with all the changes to dateredmatrix2015-06-291-2/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-292-1/+100
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * some prep workredmatrix2015-06-292-1/+100
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-282-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 ↵redmatrix2015-06-282-17/+93
| | | | | | | | still pretty cool.
* | bring single instance file storage to dav and cloud uploaded photosredmatrix2015-06-272-8/+28
| |
* | undo the disabling of browser_prefetch and for the time being revert the ↵redmatrix2015-06-252-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.
* | remove all QR-code stuff from core - now in qrator addonredmatrix2015-06-251-14/+0
| |
* | localise event calendarredmatrix2015-06-252-55/+114
| |
* | more work on photos, including os_storage for the size '0' photo and ↵redmatrix2015-06-233-15/+67
| | | | | | | | numbering duplicate filenames
* | more work on mail flagsredmatrix2015-06-235-23/+18
| |
* | item flag fixes discovered after a few mergesredmatrix2015-06-235-28/+9
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 05:23:59 +0000