aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| | | | |/ / |/| |
| * | 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 c...Mario Vavti2015-07-101-8/+6
| * revertMario Vavti2015-07-091-2/+2
| * do not show status editor in /display - we most probably want to read the thr...Mario Vavti2015-07-091-1/+2
| * 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 sort...Mario Vavti2015-07-071-4/+9
| * make public forums only setting sticky and simplify function to get directory...Mario Vavti2015-07-071-10/+17
* | Merge pull request #4 from git-marijus/masterredmatrix2015-07-081-1/+1
|\ \
| * | 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 st...redmatrix2015-07-062-2/+34
|/ /
* | 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 copy...redmatrix2015-07-041-5/+27
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-022-0/+126
|\|
| * a few clone sync fixes as well as some work on hubzilla clone sync back to re...redmatrix2015-07-022-0/+14
| * 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 a...redmatrix2015-07-012-3/+8
* | cleanup of import to allow cross-product import going one way. Note - items/c...redmatrix2015-06-301-9/+4
* | 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 version...redmatrix2015-06-291-0/+14
* | lots of work on clone/import from redmatrix to hubzilla (won't go back the ot...redmatrix2015-06-301-15/+61
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-0/+1
|\|
| * turn the connection filter into a feature.redmatrix2015-06-291-0/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-2/+1
|\|
| * fix directory locationMario Vavti2015-06-291-2/+1
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-282-4/+13
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-281-2/+2
| |\
| | * simply 'post' is a better default term than 'status'Alexandre Hannud Abdo2015-06-271-2/+2
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ...redmatrix2015-06-281-2/+10
| |/
* | undo the disabling of browser_prefetch and for the time being revert the HTML...redmatrix2015-06-257-7/+7
* | remove all QR-code stuff from core - now in qrator addonredmatrix2015-06-251-8/+0
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-242-4/+5
|\|
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-241-1/+1
| |\
| * | Reflect in directory title if we watch the local or the global directoryMario Vavti2015-06-241-2/+3
* | | more work on mail flagsredmatrix2015-06-233-15/+8