zotlabs
9a55df245f
disable directory options when using suggestion mode and only return one page (60 items)
...
so that sorting works correctly
2019-04-30 23:38:48 -07:00
zotlabs
9800d95c50
fix suggestion ordering in directory module
2019-04-30 23:19:04 -07:00
Max Kostikov
c340416c94
Add 'reply on comment' code
2019-05-01 06:24:58 +02:00
Max Kostikov
9af8a1d30c
Move JS to main module
2019-05-01 06:23:56 +02:00
Max Kostikov
4da96ee980
Remove 'doreply' JS function
2019-04-30 17:35:53 +02:00
Max Kostikov
21637e033c
Add JS 'doreply' function
2019-04-30 17:34:56 +02:00
Max Kostikov
9ebf2dc97b
Add "reply to" hint to submit button
2019-04-30 17:33:54 +02:00
Mario Vavti
a04689b784
do not allow editing events that do not belong to us
2019-04-30 12:08:19 +02:00
Max Kostikov
5066945adc
Fix add multiple icons on 'Submit' button when reply on comment
2019-04-30 11:17:22 +02:00
Max Kostikov
e945c12856
Add displaying support for threaded comments
2019-04-30 11:00:13 +02:00
Mario Vavti
0b062d0b8a
select event by event_hash instead of item_id
2019-04-30 10:47:48 +02:00
Mario Vavti
9cc1eff15c
remove logging
2019-04-30 00:12:19 +02:00
Mario Vavti
327e5d06e1
calendar merge: implement single event editing UI
2019-04-30 00:09:57 +02:00
Max Kostikov
a2dd0aea92
Merge branch 'cherry-pick-80ca2023' into 'dev'
...
Add 'reply on comment' feature
See merge request kostikov/core!1
2019-04-29 23:45:58 +02:00
Max Kostikov
39da3459c7
Add 'reply on comment' feature
...
(cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
2019-04-29 23:43:11 +02:00
Max Kostikov
c0be4c36e1
Update main.js
2019-04-29 23:40:21 +02:00
Max Kostikov
31e04378cd
Add 'reply to comment' processing
2019-04-29 23:30:51 +02:00
Max Kostikov
e80c99ad74
Add 'reply to comment' button
2019-04-29 23:29:16 +02:00
Max Kostikov
d9be443e53
Add initial threaded comments support
2019-04-29 23:26:20 +02:00
Max Kostikov
6db323b15e
Add variables for threaded comments support
2019-04-29 23:24:48 +02:00
Max Kostikov
5abbfd3f19
Add initial threaded comment support
2019-04-29 23:21:17 +02:00
Mario
674215e9e6
Merge branch 'dev' into 'dev'
...
Add jot videos inline and with poster if possible
See merge request hubzilla/core!1613
2019-04-29 11:58:59 +02:00
Mario Vavti
dce6a5763d
calendar merge: d&d support and some minor cleanup and fixes
2019-04-29 11:45:55 +02:00
zotlabs
d89d6e8a01
Merge branch 'dev' of ../hz into dev
2019-04-28 18:21:41 -07:00
zotlabs
6230dbed2d
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-28 18:21:28 -07:00
zotlabs
9641254443
event attachments still weren't being delivered to zot6
2019-04-28 18:20:40 -07:00
zotlabs
95871fe13c
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-28 17:47:26 -07:00
Max Kostikov
0cecfceb14
Merge branch 'sql_fixes' into 'dev'
...
possible sql performance improvement
See merge request hubzilla/core!1611
2019-04-28 20:59:53 +02:00
zotlabs
13970280d9
Merge branch 'dev' of ../hz into dev
2019-04-27 17:22:00 -07:00
zotlabs
55ce80aabe
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-27 17:21:42 -07:00
zotlabs
9536a490b3
Add jot videos inline and with poster if possible
2019-04-27 17:20:38 -07:00
Mario Vavti
405e07f0a2
improve channel date query
2019-04-27 23:01:05 +02:00
Max Kostikov
d3ce91bd89
Merge branch 'dev' into 'dev'
...
Use goaway() base function
See merge request hubzilla/core!1612
2019-04-27 21:47:57 +02:00
Max Kostikov
eb44201c5f
Use goaway() base function
2019-04-27 21:38:54 +02:00
Mario Vavti
73248aadd5
possible sql performance improvement
2019-04-27 15:35:41 +02:00
Mario
f6a4084f81
bump version
2019-04-26 11:30:23 +02:00
Mario Vavti
d5f89c165a
update changelog
...
(cherry picked from commit a518471a27
2019-04-26 11:29:01 +02:00
Mario Vavti
a518471a27
update changelog
2019-04-26 11:28:06 +02:00
zotlabs
dce5080e53
permissions cleanup
...
(cherry picked from commit 2d886b65ce
2019-04-26 10:52:35 +02:00
zotlabs
2221d4d612
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
...
(cherry picked from commit 0615709a7a
2019-04-26 10:43:56 +02:00
Zot
5f73a46c05
import/export zot6 hublocs+xchans
...
(cherry picked from commit e2dfa1d72f
2019-04-26 10:42:09 +02:00
Zot
b782c6bd16
update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master)
...
(cherry picked from commit f8c583636c
2019-04-26 10:41:52 +02:00
Zot
ab8d8aa552
hubloc confusion in magic auth
...
(cherry picked from commit 3c8f8b76aa
2019-04-26 10:41:35 +02:00
Daniel Lowe
f955276694
Fix infinite loop using postgres as backend
...
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does. This ensures that the argument is a resource before
loading its contents.
(cherry picked from commit 9a6531e2a2
2019-04-26 10:41:04 +02:00
zotlabs
77cc60faf2
required php version not available but allowed to continue
...
(cherry picked from commit 6feddcbced
2019-04-26 10:40:02 +02:00
Mario
a6f50b8c85
Merge branch 'dev' into 'dev'
...
import/export zot6 hublocs+xchans
See merge request hubzilla/core!1610
2019-04-26 09:34:58 +02:00
Zot
e2dfa1d72f
import/export zot6 hublocs+xchans
2019-04-26 09:34:58 +02:00
zotlabs
9a61c0a6fc
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2019-04-26 00:28:29 -07:00
zotlabs
e10b25a12c
Merge branch 'dev' of ../hz into dev
2019-04-26 00:25:32 -07:00
zotlabs
0c1e803208
import/export zot6 hublocs+xchans
2019-04-26 00:24:58 -07:00
