Commit graph

20780 commits

Author SHA1 Message Date
zotlabs
619f8f752b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-12 01:26:21 -08:00
zotlabs
e8958b1fb8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-12 01:26:01 -08:00
git-marijus
07b67963f1
Merge pull request #951 from dawnbreak/docu
💡 Add source documentation from recent conversations.
2018-01-12 10:15:43 +01:00
zotlabs
b0a491eaa8 ability to parse info blocks in third-party (or system) widgets 2018-01-12 00:25:43 -08:00
Mario Vavti
47c14d3ca1 Merge remote-tracking branch 'mike/master' into dev 2018-01-12 09:16:56 +01:00
zotlabs
6a8c583220 expose settings for site sellpage and site location 2018-01-11 14:29:00 -08:00
zotlabs
468e976a88 OpenWebAuth: can fail after site re-installs; this may need to be pushed forward to master 2018-01-11 12:15:38 -08:00
Mario Vavti
25a63dc413 continue working on hq 2018-01-11 10:58:46 +01:00
Mario Vavti
61e019e176 Merge remote-tracking branch 'mike/master' into dev 2018-01-11 08:46:13 +01:00
zotlabs
894b3706e7 tag nav_featured_app to apps that the corresponding features may not be enabled by default, so that they will become visible in the app menu when enabled 2018-01-10 23:32:56 -08:00
zotlabs
e59237e680 provide de-de language since some browsers do not offer de on its own 2018-01-10 23:06:54 -08:00
zotlabs
b05c1c391c db issue reported in hubzilla #953 - this does not do anything about the auth issue 2018-01-10 15:42:02 -08:00
zotlabs
c09bab466a hubzilla issue #945 continued: We previously blocked directory keywords when searching the local directory as it produced errant results and included results from the entire directory space (an issue that was resolved satisfactorily by that fix sometime in the past). As a result of issue #945 this was reworked so that we should return correct results for keywords when searching either the local directory or a standalone directory. 2018-01-10 15:32:04 -08:00
Mario Vavti
46cc360e4e Merge remote-tracking branch 'mike/master' into dev 2018-01-10 11:39:02 +01:00
Mario Vavti
d6ff8dc9b6 introduce datasrc2src(selector) js function 2018-01-10 11:34:37 +01:00
zotlabs
d0d72c7fd2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-09 17:05:58 -08:00
zotlabs
f0798f7833 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-09 17:05:39 -08:00
zotlabs
3ce79dd6e1 scrutinizer mods 2018-01-09 17:04:02 -08:00
Mario Vavti
ef7225b4f6 Merge remote-tracking branch 'mike/master' into dev 2018-01-09 10:27:26 +01:00
Mario Vavti
906cbbe45d changelog 2018-01-09 08:56:35 +01:00
zotlabs
dfb75840b8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-08 14:51:16 -08:00
zotlabs
75804d7ce5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2018-01-08 14:50:58 -08:00
zotlabs
62f0266f46 scrutinizer issues: none worthy of including in 3.0, there will likely be a few hundred more before all is said and done. 2018-01-08 14:45:21 -08:00
Mario Vavti
0600817ef7 fix regression in app categories 2018-01-08 11:11:17 +01:00
Mario Vavti
214fa81ec6 Merge remote-tracking branch 'mike/master' into dev 2018-01-07 19:53:03 +01:00
Mario Vavti
98fd311891 start with nonactive state for the notifications button and display some text if there are no notifications on small screens only 2018-01-07 19:14:19 +01:00
zotlabs
0d415fb3c9 hubzilla issue #946 2018-01-07 02:34:37 -08:00
Mario Vavti
8d0cdf5c9a make active notifications filter sticky 2018-01-06 12:16:45 +01:00
Klaus Weidenbach
aa63c23839 💡 Add source documentation from recent conversations.
There have been some conversations in the last weeks which explained
several parts of the code, so add it to the source code documentation.
Also some other small source code documentation improvements.
2018-01-05 01:38:20 +01:00
Mario Vavti
0bb5f38ba5 bump version 2018-01-04 11:33:09 +01:00
Mario Vavti
6f21b3dc34 fix nav update regressions - fixes issue #950 2018-01-04 11:31:48 +01:00
Mario Vavti
e13d7beac4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-01-03 20:19:32 +01:00
Mario Vavti
4562e1cc1c update changelog 2018-01-03 20:18:11 +01:00
git-marijus
67dd9c2930
Merge pull request #949 from einervonvielen/dev-fix-homeinstall
Dev fix homeinstall
2018-01-03 19:25:28 +01:00
Einer von Vielen
e9c91a3ef3 Typo 2018-01-03 17:26:31 +01:00
Einer von Vielen
4cde513523 Fixed homeinstall for dev as in 3.0RC 2018-01-03 17:21:41 +01:00
zotlabs
ada578e7e3 issues with feed parameters 2018-01-02 14:04:43 -08:00
Mario Vavti
f826c09abc Merge remote-tracking branch 'mike/master' into dev 2018-01-02 22:14:31 +01:00
zotlabs
3bd7133ba3 hubzilla issue #947 2018-01-01 12:25:43 -08:00
zotlabs
ce38350e00 this should finish up hubzilla issue #113 2017-12-31 14:45:42 -08:00
zotlabs
45923f408f provide warning if ffmpeg not found and video thumbnail is requested 2017-12-30 23:24:24 -08:00
zotlabs
94e92bb4bf update file thumbnails when imported/synced 2017-12-30 23:15:47 -08:00
zotlabs
3fadedcc54 test of new affinity preset code (post 3.0) 2017-12-30 22:48:06 -08:00
zotlabs
e095cb8113 possibly fix hubzilla #673 (prev/next buttons on connedit can show deleted connections). We cannot actually determine that a connection has been deleted (this is typically accomplished by removing the abook record), but we can determine if the corresponding xchan has been deleted. 2017-12-30 15:35:18 -08:00
zotlabs
1fcf59ff94 cleanup 2017-12-28 15:16:50 -08:00
zotlabs
5cfb63da50 a different (hopefully better) implementation of affinity presets, but not for 3.0 because strings have changed. 2017-12-28 15:12:20 -08:00
zotlabs
38646fe0e1 Make affinity widget settings work. It's entirely possible they never did work correctly. I'm not comfortable over-riding the network_page_default config in this way but this is the way I've always set the affinity and it has worked just fine for me for several years and there haven't been any other requests to extend the network page default options. 2017-12-28 14:06:30 -08:00
Mario
e418a6b3d4 changelog 2017-12-28 21:18:50 +01:00
git-marijus
ab1dec813b
Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooks
Fix dupe bug in content hooks
2017-12-27 16:50:17 +01:00
Mario
4a71fb0831 Merge remote-tracking branch 'mike/master' into dev 2017-12-27 16:45:33 +01:00