aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-07-0711-9/+206
|\
| * incorrectly named doc fileredmatrix2015-07-061-0/+0
| * ok that's wretchedly inefficient but provides a basic relevance search for st...redmatrix2015-07-062-2/+34
| * 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 copy...redmatrix2015-07-041-5/+27
* | | Added cron script to exexute poller every 5 minutesHaakon Meland Eriksen2015-07-051-0/+10
* | | Merge remote-tracking branch 'openshift/master'Haakon Meland Eriksen2015-07-0514-0/+78
|\ \ \ | |/ / |/| |
| * | Creating templateTemplate builder2015-07-0515-0/+352
| /
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-034-100/+618
|\|
| * 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 a...redmatrix2015-07-034-252/+307
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-031-1/+0
|\ \ \ | | |/ | |/|
| * | Merge pull request #370 from tuscanhobbit/masterredmatrix2015-07-032-7065/+7315
| |\ \
| | * | Updated Italian localizationPaolo Tacconi2015-07-032-7065/+7315
| |/ /
| * | Merge pull request #369 from zzottel/masterzzottel2015-07-031-1/+0
| |\ \ | | |/ | |/|
| | * 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
|\|
| * a few clone sync fixes as well as some work on hubzilla clone sync back to re...redmatrix2015-07-025-0/+52
| * 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 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 upThomas Willingham2015-06-304-35/+1
| | * | since we can now use plain upstream justifiedGallery library - switch to mini...Mario Vavti2015-07-013-2/+16
| | * | 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
* | 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-302-18/+63
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-294-0/+12
|\|
| * turn the connection filter into a feature.redmatrix2015-06-294-0/+12
* | fix the postgres schema with all the changes to dateredmatrix2015-06-292-5/+116
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-297-7/+110
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-295-352/+382
| |\
| | * Update NL + 1 revert css, see comment here: https://github.com/redmatrix/redm...jeroenpraat2015-06-303-348/+374
| | * Probably a ugly hack, but it's the only way I could found that cuts off very ...jeroenpraat2015-06-291-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 02:46:14 +0000