aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* version+stringsredmatrix2016-04-292-794/+779
* revupredmatrix2016-04-281-1/+1
* revupredmatrix2016-04-271-1/+1
* revupredmatrix2016-04-261-1/+1
* revupredmatrix2016-04-251-1/+1
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-232-7224/+7467
|\
| * Merge pull request #352 from phellmes/de20160422redmatrix2016-04-232-7224/+7467
| |\
| | * Update DE translation stringsphellmes2016-04-222-7224/+7467
| |/
* / revupredmatrix2016-04-231-1/+1
|/
* revupredmatrix2016-04-222-5131/+5301
* Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-211-12/+12
|\
| * Merge pull request #349 from HaakonME/mastergit-marijus2016-04-211-12/+12
| |\
| | * Updated Hubzilla on OpenShift deploy script to include unofficial repos by ap...Haakon Meland Eriksen2016-04-191-19/+19
| | * Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-04-187-11602/+11633
| | |\
| | * \ Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-04-161-1/+1
| | |\ \
| | * | | Commented out extra repos except official addonsHaakon Meland Eriksen2016-04-161-12/+12
* | | | | revup #337redmatrix2016-04-211-1/+1
|/ / / /
* | | | some crossbrowser rendering work on the comment boxMario Vavti2016-04-201-1/+3
* | | | Use stopImmidiatePropagation() only if we are in a list to not interfere with...Mario Vavti2016-04-201-2/+6
* | | | revup #337redmatrix2016-04-201-1/+1
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-192-1/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | bring back bbcode buttons for mod/editpostMario Vavti2016-04-181-0/+1
| * | | fix rpost bbcode buttons and autocompleteMario Vavti2016-04-181-1/+3
* | | | revup #337redmatrix2016-04-191-1/+1
|/ / /
* | | revup #337redmatrix2016-04-181-1/+1
* | | Spanish and Dutch strings updatejeroenpraat2016-04-174-11600/+11628
* | | revup #337redmatrix2016-04-171-1/+1
| |/ |/|
* | revup #337redmatrix2016-04-161-1/+1
|/
* nav: move js and css out of template, provide a help button in the panel on s...Mario Vavti2016-04-153-233/+222
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-04-154-7111/+7178
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_mergeredmatrix2016-04-152-3091/+3147
| |\
| | * Merge pull request #343 from wave72/masterWave2016-04-152-3091/+3147
| | |\
| | | * Merge branch 'redmatrix-master'Paolo Tacconi2016-04-15532-91509/+104813
| | | |\
| | | | * Resolved conflict in view/it/hstrings.phpPaolo Tacconi2016-04-15532-91509/+104813
| | | |/| | | | |/ | | |/|
| | | * Updated Italian stringsPaolo Tacconi2016-04-152-3091/+3147
| * | | revup + strings #337redmatrix2016-04-152-4020/+4031
| |/ /
* / / fix some slight crossbrowser rendering issues with jotMario Vavti2016-04-153-16/+16
|/ /
* | commit 1.41.4redmatrix2016-04-142-1/+34
* | provide general purpose verification class, remove include/session.php (no lo...redmatrix2016-04-144-187/+48
* | Merge branch 'master' into devredmatrix2016-04-141-2/+1
|\ \
| * | revup #337redmatrix2016-04-141-2/+1
* | | fix marked bug in coderedmatrix2016-04-131-2/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-131-2/+2
|\ \ \
| * | | some bbcode autocomplete refinement for edit webpageMario Vavti2016-04-131-2/+2
* | | | refactor the js detection into a checkjs class which is only enabled on deman...redmatrix2016-04-135-19/+50
* | | | Merge branch 'master' into devredmatrix2016-04-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | issue #337redmatrix2016-04-131-1/+1
* | | | reverse the logic of the jsenabled setting so that sessions without js are pe...redmatrix2016-04-128-26/+26
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-121-2/+3
|\ \ \
| * | | improve bbco autocomplete to not execute listNewLineAutocomplete() many times...Mario Vavti2016-04-121-2/+3