zotlabs
|
05f9f0a393
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2018-01-15 21:49:28 -08:00 |
|
zotlabs
|
03f692f24f
|
surface the article feature
|
2018-01-15 21:46:27 -08:00 |
|
zotlabs
|
014a1f0158
|
add summary bbcode tag
|
2018-01-15 20:47:32 -08:00 |
|
Mario Vavti
|
746ea5a369
|
fix some regressions with permission roles
|
2018-01-15 11:34:42 +01:00 |
|
Mario Vavti
|
d868ebe4ba
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-01-15 08:56:41 +01:00 |
|
Mario Vavti
|
b49e09939a
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-01-15 08:56:15 +01:00 |
|
zotlabs
|
91db66b32d
|
move markdown-in-posts/comments feature to plugin
|
2018-01-14 18:22:58 -08:00 |
|
zotlabs
|
f0faa7f9b0
|
support tables in markdown posts/comments (but not table alignment); and do not support iframes from html source.
|
2018-01-14 16:45:33 -08:00 |
|
Andrew Manning
|
ef11b3eb2b
|
Added minimum registration age to /admin/site settings page
|
2018-01-14 15:02:43 -05:00 |
|
Einer von Vielen
|
3ab92ba9d9
|
Fixed poller. Use Master.php
|
2018-01-14 18:33:08 +01:00 |
|
Mario Vavti
|
8970d30c93
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-01-14 07:42:58 +01:00 |
|
zotlabs
|
75285fd452
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-01-13 15:55:04 -08:00 |
|
zotlabs
|
76c8bbf7b8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2018-01-13 15:54:45 -08:00 |
|
zotlabs
|
eb3e43feec
|
cleanup of last fix
|
2018-01-13 14:08:15 -08:00 |
|
zotlabs
|
08bea83c03
|
unexpected openssl result
|
2018-01-13 13:45:33 -08:00 |
|
zotlabs
|
8892568652
|
improve owa logging
|
2018-01-13 12:24:55 -08:00 |
|
Mario Vavti
|
ce10a44e72
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-01-12 22:44:59 +01:00 |
|
Mario Vavti
|
0f5bc00586
|
update league/html-to-markdown via composer
|
2018-01-12 22:32:42 +01:00 |
|
Mario Vavti
|
50ec3b300b
|
fix some breaking changes with bootstrap 4 beta3
|
2018-01-12 22:23:05 +01:00 |
|
Mario Vavti
|
2c5b6cf8dc
|
update to bootstrap 4 beta3
|
2018-01-12 22:03:06 +01:00 |
|
Mario Vavti
|
f2ec84fb13
|
typo
|
2018-01-12 16:03:41 +01:00 |
|
Mario Vavti
|
51d791d824
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-01-12 15:54:41 +01:00 |
|
Mario Vavti
|
db08e2cea0
|
mod hq: stick to show latest unseen toplevel post on load
|
2018-01-12 15:54:27 +01:00 |
|
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 |
|