aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into devredmatrix2016-04-185-11601/+11629
|\
| * revup #337redmatrix2016-04-181-1/+1
| * Spanish and Dutch strings updatejeroenpraat2016-04-174-11600/+11628
* | some issues with GNU-Social's implementation of events in feeds. The summary ...redmatrix2016-04-181-2/+2
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-1720-315/+348
|\ \
| * | Making sure the great new context help works with all thmes and schema's (3rd...jeroenpraat2016-04-186-6/+62
| * | Merge pull request #345 from anaqreon/context-helpredmatrix2016-04-1815-315/+292
| |\ \
| | * | Recover lost language translation accommodation and doc/context restructuringAndrew Manning2016-04-1712-110/+38
| | * | New help panel that slides in from the top and pushes the content down so it ...Andrew Manning2016-04-173-205/+254
| |/ /
* | | pull in the new object router and a few selected samples for the new controll...redmatrix2016-04-175-1896/+1917
* | | Merge commit '521d404' into devredmatrix2016-04-175-66/+115
|\ \ \
| * | | remove the date hack on public feeds which was a temporary fix for an issue l...redmatrix2016-04-171-2/+2
| * | | Convert Channel to new moduleredmatrix2016-04-152-45/+56
| * | | cleanup and test of new routerredmatrix2016-04-151-39/+39
| * | | get init() working with class modulesredmatrix2016-04-152-9/+27
| * | | testing the new router/module coderedmatrix2016-04-151-1/+21
* | | | Merge branch 'master' into devredmatrix2016-04-171-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | revup #337redmatrix2016-04-171-1/+1
* | | | Merge branch 'master' into devredmatrix2016-04-161-1/+1
|\| | | | |_|/ |/| |
| * | revup #337redmatrix2016-04-161-1/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-04-150-0/+0
|\ \ \
| * | | Merge branch 'master' into devMario Vavti2016-04-159-7360/+7416
| |\| |
* | | | Merge branch 'master' into devredmatrix2016-04-155-249/+238
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | 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
| |\ \
| * | | fix some slight crossbrowser rendering issues with jotMario Vavti2016-04-153-16/+16
* | | | Merge branch 'master' into devredmatrix2016-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
| |/ /
* / / filter out a bit more dreport noise - especially for private posts to multipl...redmatrix2016-04-141-0/+11
|/ /
* | 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
* | | | Important work on the sessionhandler to maintain compatibility with php7 and ...redmatrix2016-04-123-58/+65
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | revup issue #337redmatrix2016-04-121-1/+2
* | | remove obsolete jotVideoURL() and jotAudioURL()redmatrix2016-04-111-14/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 04:00:10 +0000