aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into wikiAndrew Manning2016-06-200-0/+0
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2016-06-2047-1150/+22931
| |\
| * \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-06-1673-553/+25128
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into devAndrew Manning2016-06-1535-167/+392
| |\ \ \
| * | | | Move Spanish context help translation from es to es-es and make es a symlink ...Andrew Manning2016-06-1315-1/+1
* | | | | Add formatted heading for revision comparison viewerAndrew Manning2016-06-201-1/+2
* | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2042-1139/+22890
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Added many of the recent schema changes to the database schema documentationredmatrix2016-06-1915-27/+72
| * | | | update the bbcode docredmatrix2016-06-191-1/+2
| * | | | experimental rtl support; this will probably require a fair bit of work.redmatrix2016-06-193-3/+18
| * | | | Don't use count() to check DB resultsredmatrix2016-06-192-11/+16
| * | | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| * | | | hebrew translationroot2016-06-189-0/+19195
| * | | | update the top level database doc, the individual schema pages are still out ...redmatrix2016-06-181-6/+5
| * | | | schema changes needed for the caldav client bitredmatrix2016-06-184-7/+105
| * | | | changelog update for 1.8redmatrix2016-06-171-0/+4
| * | | | the text link to a thing will take you to the local thing page, both as a lin...redmatrix2016-06-173-2/+3
| * | | | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-173-3/+8
| |\ \ \ \
| * | | | | 1. string update, 2. pretty print json blobsredmatrix2016-06-173-1080/+1151
* | | | | | Do not change active page commit until user reverts the pageAndrew Manning2016-06-201-1/+2
* | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-176-11/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | only use height: auto for week and day viewMario Vavti2016-06-173-3/+8
| |/ / / /
| * | | / core changes to better support media migrationsredmatrix2016-06-163-8/+33
| | |_|/ | |/| |
* / | | Wiki page revision comparison tool with diff displayed in modal dialog. Lever...Andrew Manning2016-06-175-17/+548
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-1613-536/+1539
|\ \ \
| * | | show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
| * | | fix scrollbarsMario Vavti2016-06-162-0/+8
| * | | update 3rd party lib fullcalendar to version 2.7.3Mario Vavti2016-06-169-536/+1491
* | | | code commentsredmatrix2016-06-151-0/+5
|/ / /
* | | custom request methods for curlredmatrix2016-06-151-3/+13
* | | provide a default for undefined languagesredmatrix2016-06-151-0/+1
* | | ignore case in language names and add 'js' as an alias for 'javascript'redmatrix2016-06-152-4/+6
* | | improve readability of commentsredmatrix2016-06-151-1/+1
* | | Merge pull request #422 from anaqreon/wikihubzilla2016-06-163-14/+136
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-157-10/+162
| |\ \ \
| * | | | Rename page feature added. Fixed bug in git commit function and other minor f...Andrew Manning2016-06-153-14/+136
* | | | | This was the reason for the large line widths - an extra linefeed after each ...redmatrix2016-06-152-4/+1
* | | | | provide syntax based [colour] highlighting on code blocks for popular languag...redmatrix2016-06-1555-0/+23433
| |/ / / |/| | |
* | | | translate already imported system appsredmatrix2016-06-151-0/+2
| |_|/ |/| |
* | | add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-142-1/+11
|\ \ \
| * | | Merge pull request #419 from anaqreon/wikihubzilla2016-06-152-1/+11
| |\| |
| | * | Fix Spanish wiki translationAndrew Manning2016-06-141-1/+1
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-1426-157/+202
| | |\ \ | | |/ / | |/| |
| | * | Add Italian wiki context help translationAndrew Manning2016-06-141-0/+10
* | | | support cookie auth in Sabre DAVredmatrix2016-06-142-1/+55
* | | | readme for the module directory, also provide an undocumented way to reset th...redmatrix2016-06-142-8/+94
|/ / /
* | | some work to provide propagation and honouring of the item_notshown flag.redmatrix2016-06-133-10/+25
* | | missing iconfig conversionredmatrix2016-06-131-3/+6