aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-0715-87/+80
|\
| * fix sorting of channel suggestionsMario Vavti2015-07-073-5/+6
| |
| * rename function get_directory_settings => get_directory_setting and move ↵Mario Vavti2015-07-075-32/+26
| | | | | | | | sort options to directory title bar
| * make public forums only setting sticky and simplify function to get ↵Mario Vavti2015-07-073-39/+34
| | | | | | | | directory settings
| * code style correctionMario Vavti2015-07-071-3/+2
| |
| * make directory suggest work with directory optionsMario Vavti2015-07-072-3/+7
| |
| * schema focus: adjust width to match photo width in /photosMario Vavti2015-07-071-1/+1
| |
| * various css fixesMario Vavti2015-07-077-15/+8
| |
| * more word wrap fixesMario Vavti2015-07-071-0/+2
| |
| * move if clause outside of the divMario Vavti2015-07-071-2/+2
| |
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-07-071-1/+1
| |\
| * | use default style for default webpageMario Vavti2015-07-071-7/+12
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaredmatrix2015-07-071-1/+1
|\ \ \
| * \ \ 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
| | | | |
* | | | | incorrect value for hubloc_deleted in zot_get_hublocs() queryredmatrix2015-07-071-1/+1
|/ / / /
* | | | incorrectly named doc fileredmatrix2015-07-061-0/+0
| | | |
* | | | ok that's wretchedly inefficient but provides a basic relevance search for ↵redmatrix2015-07-062-2/+34
| | | | | | | | | | | | | | | | strings in doc files.
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-062-1/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-061-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | fix word wrapping in tagblock and dirtagblock and possibly other placesMario Vavti2015-07-061-0/+4
| | | |
| * | | version updateredmatrix2015-07-061-1/+1
| |/ /
* | / Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-052-2/+2
|\| | | |/ |/|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-051-1/+1
| |\
| | * schema focus: adjust default widthMario Vavti2015-07-051-1/+1
| | |
| * | version updateredmatrix2015-07-051-1/+1
| |/
* | very crude but working doc searchredmatrix2015-07-052-1/+55
| |
* | more work on db storage of docoredmatrix2015-07-055-7/+92
| |
* | 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-034-100/+618
|\| | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-033-7066/+7315
| |\
| * | in hubzilla we're going to convert doco to items. define it here so that an ↵redmatrix2015-07-034-252/+307
| | | | | | | | | | | | accidental import/export doesn't chuck a wobbly.
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: view/it/messages.po view/it/strings.php
| * | Merge pull request #370 from tuscanhobbit/masterredmatrix2015-07-032-7065/+7315
| |\ \ | | | | | | | | Updated Italian localization
| | * | Updated Italian localizationPaolo Tacconi2015-07-032-7065/+7315
| |/ /
| * | Merge pull request #369 from zzottel/masterzzottel2015-07-031-1/+0
| |\ \ | | |/ | |/| update German main help file
| | * update German main help filezottel2015-07-031-1/+0
| |/
* | start doco cleanupredmatrix2015-07-0365-62/+67
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-026-2/+143
|\| | | | | | | | | Conflicts: include/zot.php
| * a few clone sync fixes as well as some work on hubzilla clone sync back to ↵redmatrix2015-07-025-0/+52
| | | | | | | | redmatrix
| * a bit of cleanup and explanatory text on mod/pconfigredmatrix2015-07-021-6/+13
| |
| * web version of util/pconfigredmatrix2015-07-022-1/+106
| |
* | sync abook entries from redmatrixredmatrix2015-07-0212-610/+1013
|\| | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-07-0110-609/+991
| |\
| | * Merge pull request #365 from adsfkajlsfdas/mastergit-marijus2015-07-014-35/+1
| | |\ | | | | | | | | Clean up
| | | * Clean upThomas Willingham2015-06-304-35/+1
| | | |
| | * | since we can now use plain upstream justifiedGallery library - switch to ↵Mario Vavti2015-07-013-2/+16
| | | | | | | | | | | | | | | | minified version
| | * | update justifiedGallery to versio 3.6.0Mario Vavti2015-07-013-572/+974
| | |/
| * / provide backward compatibility with hubzilla extended item exportredmatrix2015-07-012-1/+56
| |/
* | provide compatibility with redmatrix extended item exportredmatrix2015-07-011-3/+50
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 09:21:59 +0000