aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-0/+1
|\ | | | | | | | | Conflicts: mod/import.php
| * fix import of group membersredmatrix2015-07-141-1/+1
| |
* | group fixes to importredmatrix2015-07-141-4/+14
| |
* | more stuff to resume failed importsredmatrix2015-07-141-1/+13
| |
* | log the import progressredmatrix2015-07-141-3/+9
| |
* | provide resumable imports if things go wrongredmatrix2015-07-141-285/+329
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-143-81/+46
|\| | | | | | | | | Conflicts: mod/connedit.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-141-80/+44
| |\
| | * make strings translateableMario Vavti2015-07-141-0/+6
| | |
| | * revert provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+1
| | |
| | * remove dbgMario Vavti2015-07-141-2/+0
| | |
| | * provide inherited perms for connection default permissionsMario Vavti2015-07-141-1/+3
| | |
| | * cleanup conneditMario Vavti2015-07-141-80/+38
| | |
| * | coverup and ignore the illegal string offset message that some sites have ↵redmatrix2015-07-141-1/+1
| |/ | | | | | | 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 branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-131-1/+0
|\ \
| * \ mergeMario Vavti2015-07-111-1/+4
| |\ \
| * \ \ merge redmatrix fixesMario Vavti2015-07-105-24/+26
| |\ \ \
* | \ \ \ Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-132-7/+4
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | allow sys editing of menuredmatrix2015-07-111-0/+1
| | | |
| * | | whitespace and comment out info againMario Vavti2015-07-122-3/+3
| | | |
| * | | fix sys channel menu in a morre standard wayMario Vavti2015-07-122-4/+4
| | | |
| * | | menu_id is still neededMario Vavti2015-07-121-0/+1
| | | |
| * | | make menu creation for sys channel workMario Vavti2015-07-122-7/+2
| | | |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-105-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 Vavti2015-07-101-1/+4
| |/
| * more webpages - generic-content-wrapper fixesMario Vavti2015-07-103-15/+18
| |
| * add generic content wrapper to post/webpage editor and make editpost render ↵Mario Vavti2015-07-101-8/+6
| | | | | | | | correctly
| * revertMario Vavti2015-07-091-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 Vavti2015-07-091-1/+2
| | | | | | | | thread or comment.
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-091-2/+2
| |
* | inconsistent naming of block item typesredmatrix2015-07-083-5/+5
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-071-11/+24
|\|
| * fix sorting of channel suggestionsMario Vavti2015-07-071-0/+1
| |
| * rename function get_directory_settings => get_directory_setting and move ↵Mario Vavti2015-07-071-4/+9
| | | | | | | | sort options to directory title bar
| * make public forums only setting sticky and simplify function to get ↵Mario Vavti2015-07-071-10/+17
| | | | | | | | directory settings
* | Merge pull request #4 from git-marijus/masterredmatrix2015-07-081-1/+1
|\ \ | | | | | | abook_pending should probably be 1 in this place
| * | abook_pending should probably be 1 in this placeMario Vavti2015-07-061-1/+1
| | |
* | | ok that's wretchedly inefficient but provides a basic relevance search for ↵redmatrix2015-07-062-2/+34
|/ / | | | | | | strings in doc files.
* | very crude but working doc searchredmatrix2015-07-051-1/+47
| |
* | more work on db storage of docoredmatrix2015-07-051-4/+55
| |
* | mod/help: read doc files from the database if present and newer than the ↵redmatrix2015-07-041-5/+27
| | | | | | | | copy in the filesystem.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-022-0/+126
|\| | | | | | | | | Conflicts: include/zot.php
| * a few clone sync fixes as well as some work on hubzilla clone sync back to ↵redmatrix2015-07-022-0/+14
| | | | | | | | redmatrix
| * a bit of cleanup and explanatory text on mod/pconfigredmatrix2015-07-021-6/+13
| |
| * web version of util/pconfigredmatrix2015-07-021-0/+105
| |
* | turn attached audio/video into audio/video elements as well as providing an ↵redmatrix2015-07-012-3/+8
| | | | | | | | attachment link
* | cleanup of import to allow cross-product import going one way. Note - ↵redmatrix2015-06-301-9/+4
| | | | | | | | items/content are not yet importable
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-301-0/+14
|\|
| * warn if export data file is from an incompatible project or if the DB ↵redmatrix2015-06-291-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 ↵redmatrix2015-06-301-15/+61
| | | | | | | | other way)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 09:44:45 +0000