aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | be specificredmatrix2016-05-151-1/+1
| | * | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-05-1515-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | stupid gitjeroenpraat2016-05-1514-0/+113
| | | * | | | | | the other way aroundjeroenpraat2016-05-1514-113/+0
| | * | | | | | | roll minor version due to changeredmatrix2016-05-151-1/+1
| | * | | | | | | issue #387redmatrix2016-05-151-1/+2
| | |/ / / / / /
| | * | | | | | Merge pull request #382 from mjfriaza/devredmatrix2016-05-1514-273/+58
| | |\ \ \ \ \ \
| | | * | | | | | Another updated context help es-esManuel Jiménez Friaza2016-05-1414-273/+58
| | * | | | | | | issue #383redmatrix2016-05-142-2/+1
| | * | | | | | | SECURITY: edited comment to private post loses privacy info. Not visible in s...redmatrix2016-05-122-1/+11
| | * | | | | | | update std_versionredmatrix2016-05-121-1/+1
* | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-2021-42/+108
|\| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | return something so we can make a conclusionMario Vavti2016-06-191-0/+5
* | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1914-13/+21622
|\| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-188-1084/+1160
|\| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-173-3/+8
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | only use height: auto for week and day viewMario Vavti2016-06-173-3/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-174-8/+38
|\| | | | | | |
| * | | | | | | core changes to better support media migrationsredmatrix2016-06-163-8/+33
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-1613-536/+1539
| |\ \ \ \ \ \
| * | | | | | | code commentsredmatrix2016-06-151-0/+5
* | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
* | | | | | | | mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
|\| | | | | | |
| * | | | | | | fix scrollbarsMario Vavti2016-06-162-0/+8
* | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-169-536/+1491
|\| | | | | | |
| * | | | | | | update 3rd party lib fullcalendar to version 2.7.3Mario Vavti2016-06-169-536/+1491
| |/ / / / / /
* | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1660-17/+23584
|\| | | | | |
| * | | | | | 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
| | |/ / / / / / | |/| | | | | |