aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-123-10/+25
|\
| * expose settings for site sellpage and site locationzotlabs2018-01-112-0/+13
| * OpenWebAuth: can fail after site re-installs; this may need to be pushed forw...zotlabs2018-01-111-10/+12
* | continue working on hqMario Vavti2018-01-112-20/+20
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-1118-13/+20
|\|
| * tag nav_featured_app to apps that the corresponding features may not be enabl...zotlabs2018-01-104-4/+4
| * provide de-de language since some browsers do not offer de on its ownzotlabs2018-01-1011-0/+1
| * db issue reported in hubzilla #953 - this does not do anything about the auth...zotlabs2018-01-101-1/+2
| * hubzilla issue #945 continued: We previously blocked directory keywords when ...zotlabs2018-01-102-8/+13
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-091-1/+1
| |\
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-103-4/+6
|\| |
| * | scrutinizer modszotlabs2018-01-093-4/+6
* | | introduce datasrc2src(selector) js functionMario Vavti2018-01-102-5/+8
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-094-8/+11
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-01-0814-128/+80
| |\
| * | scrutinizer issues: none worthy of including in 3.0, there will likely be a f...zotlabs2018-01-084-8/+11
* | | changelogMario Vavti2018-01-091-1/+1
| |/ |/|
* | fix regression in app categoriesMario Vavti2018-01-082-4/+5
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-076-13/+146
|\|
| * hubzilla issue #946zotlabs2018-01-072-2/+128
| * issues with feed parameterszotlabs2018-01-024-11/+18
* | start with nonactive state for the notifications button and display some text...Mario Vavti2018-01-074-0/+9
* | make active notifications filter stickyMario Vavti2018-01-061-1/+1
* | bump versionMario Vavti2018-01-041-1/+1
* | fix nav update regressions - fixes issue #950Mario Vavti2018-01-042-6/+6
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-01-033-113/+41
|\ \
| * \ Merge pull request #949 from einervonvielen/dev-fix-homeinstallgit-marijus2018-01-033-113/+41
| |\ \
| | * | TypoEiner von Vielen2018-01-031-2/+2
| | * | Fixed homeinstall for dev as in 3.0RCEiner von Vielen2018-01-033-114/+42
| |/ /
* / / update changelogMario Vavti2018-01-031-0/+6
|/ /
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-01-0210-40/+71
|\|
| * hubzilla issue #947zotlabs2018-01-011-1/+2
| * this should finish up hubzilla issue #113zotlabs2017-12-314-9/+30
| * provide warning if ffmpeg not found and video thumbnail is requestedzotlabs2017-12-301-1/+7
| * update file thumbnails when imported/syncedzotlabs2017-12-301-0/+3
| * test of new affinity preset code (post 3.0)zotlabs2017-12-302-7/+7
| * possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted co...zotlabs2017-12-301-1/+1
| * cleanupzotlabs2017-12-281-3/+5
| * a different (hopefully better) implementation of affinity presets, but not fo...zotlabs2017-12-282-10/+8
| * Make affinity widget settings work. It's entirely possible they never did wor...zotlabs2017-12-282-16/+16
* | changelogMario2017-12-281-0/+6
* | Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooksgit-marijus2017-12-271-3/+3
|\ \
| * | Fix whitespace formattingMatthew Dent2017-12-231-14/+14
| * | fix dupe bug in content hooksM.Dent2017-12-231-15/+15
* | | Merge remote-tracking branch 'mike/master' into devMario2017-12-275-11/+41
|\ \ \ | | |/ | |/|
| * | hubzilla issue #945 - directory keywords returned from twkn in standalone modezotlabs2017-12-261-6/+19
| * | sort cloud directory by 1. is_dir and 2. name until we can figure out a way t...zotlabs2017-12-251-1/+1
| * | document that imagick calls/execs ffmpeg for mp4 video thumbnailszotlabs2017-12-251-1/+7
| * | util/dcp - argument warning when arguments are correctzotlabs2017-12-251-1/+1
| * | cannot use file_get/put_contents in attach_store, must use pipe_streamszotlabs2017-12-251-2/+13
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 23:19:00 +0000