zotlabs
|
d67d26564d
|
bookmark links are deprecated in zap
|
2018-09-14 16:49:08 -07:00 |
|
Max Kostikov
|
284e5dd2e8
|
unification with zot.php code for future reuse
|
2018-09-15 01:45:54 +02:00 |
|
Max Kostikov
|
3d3f4f50fb
|
formatting
|
2018-09-15 01:40:17 +02:00 |
|
Max Kostikov
|
8d89c4bbce
|
Save combined view on calling first message in thread
|
2018-09-15 01:20:49 +02:00 |
|
Max Kostikov
|
85d8225cc0
|
less data in select
|
2018-09-15 01:01:48 +02:00 |
|
zotlabs
|
291f493457
|
update install guide
|
2018-09-14 15:23:36 -07:00 |
|
M.Dent
|
8ad24ca3e8
|
Catch errors in template rendering. Output a generic error and log problem.
|
2018-09-14 17:53:28 -04:00 |
|
zotlabs
|
cfbb7960c7
|
revert change to std_version after merging from master
|
2018-09-14 14:48:29 -07:00 |
|
zotlabs
|
8dd9028654
|
Merge branch 'master' of https://framagit.org/macgirvin/osada into dev
|
2018-09-14 14:47:57 -07:00 |
|
Mike Macgirvin
|
771faa04ad
|
Merge branch 'fix-install-from-url' into 'master'
Fix Framagit URLs in INSTALL.txt
See merge request macgirvin/osada!1
|
2018-09-14 23:45:49 +02:00 |
|
M. Dent
|
cdd7d75459
|
Update INSTALL.txt
|
2018-09-14 23:39:19 +02:00 |
|
zotlabs
|
f08195687b
|
Merge branch 'zap'
|
2018-09-14 14:38:50 -07:00 |
|
zotlabs
|
ca752cfb1f
|
Merge branch 'zap' into dev
|
2018-09-14 14:38:23 -07:00 |
|
zotlabs
|
d725f9d97f
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-14 14:38:10 -07:00 |
|
zotlabs
|
d6a68b8f8c
|
Merge commit '6734fea'
|
2018-09-14 14:37:33 -07:00 |
|
zotlabs
|
6734feaa81
|
Merge commit '3bc079e' into 1.0
|
2018-09-14 14:37:07 -07:00 |
|
zotlabs
|
3bc079e69e
|
zap issue #3 cannot post to public forum using tag mentions
|
2018-09-14 14:33:39 -07:00 |
|
Max Kostikov
|
6360dee125
|
formatting
|
2018-09-14 17:45:42 +02:00 |
|
Max Kostikov
|
e931616011
|
Save combined view while deleting first message in thread
|
2018-09-14 17:38:14 +02:00 |
|
zotlabs
|
aa161b3ebf
|
Merge branch 'dev'
|
2018-09-14 02:19:57 -07:00 |
|
zotlabs
|
3bd1df52bf
|
Merge branch 'zap' into dev
|
2018-09-14 02:19:23 -07:00 |
|
zotlabs
|
097a0e5adc
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-14 02:19:05 -07:00 |
|
zotlabs
|
2542617471
|
zot6 import authors in hyperdrive mode
|
2018-09-14 02:18:17 -07:00 |
|
zotlabs
|
8505ae4ab2
|
zot6 import authors in hyperdrive mode
|
2018-09-14 02:18:07 -07:00 |
|
zotlabs
|
273a9b12f0
|
zot6 import authors in hyperdrive mode
|
2018-09-14 02:16:42 -07:00 |
|
Mario
|
ab611e9ef3
|
Merge branch 'patch-2' into 'dev'
php2po.php unify quote/unquote
See merge request hubzilla/core!1272
|
2018-09-14 10:48:03 +02:00 |
|
zotlabs
|
874f316116
|
Merge branch 'dev'
|
2018-09-13 22:40:48 -07:00 |
|
zotlabs
|
c16fa755a8
|
Merge branch 'zap' into dev
|
2018-09-13 22:40:23 -07:00 |
|
zotlabs
|
4b7770f28c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 22:40:11 -07:00 |
|
zotlabs
|
f2c7e7bb01
|
Merge branch 'dev'
|
2018-09-13 22:39:44 -07:00 |
|
zotlabs
|
edcfc6ef60
|
Merge branch 'dev' into 1.0
|
2018-09-13 22:39:31 -07:00 |
|
zotlabs
|
048c5f65e2
|
old protocol string still showing
|
2018-09-13 22:39:05 -07:00 |
|
zotlabs
|
26e419e032
|
hardwire group widget = enabled
|
2018-09-13 21:25:37 -07:00 |
|
zotlabs
|
cbef061158
|
Merge commit 'decf21c'
|
2018-09-13 20:36:32 -07:00 |
|
zotlabs
|
55d4973439
|
Merge commit 'decf21c' into dev
|
2018-09-13 20:36:13 -07:00 |
|
zotlabs
|
b253aa9f9c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 20:35:54 -07:00 |
|
zotlabs
|
0b2f7f08c8
|
Merge commit 'decf21c' into 1.0
|
2018-09-13 20:34:26 -07:00 |
|
zotlabs
|
abbd2a9c52
|
Merge commit 'decf21c'
|
2018-09-13 20:33:39 -07:00 |
|
zotlabs
|
decf21c78b
|
add privacy groups link
|
2018-09-13 20:32:44 -07:00 |
|
zotlabs
|
1b8f8e60ec
|
missing call to actor_store
|
2018-09-13 18:45:10 -07:00 |
|
zotlabs
|
2b39a93e0f
|
Merge branch 'zap' into dev
|
2018-09-13 18:44:24 -07:00 |
|
zotlabs
|
980ccf0876
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 18:44:05 -07:00 |
|
zotlabs
|
57d7c81c31
|
missing call to actor_store
|
2018-09-13 18:43:23 -07:00 |
|
zotlabs
|
8f6fd36df3
|
missing call to actor_store
|
2018-09-13 18:43:07 -07:00 |
|
zotlabs
|
767d1f9889
|
missing call to actor_store
|
2018-09-13 18:42:29 -07:00 |
|
zotlabs
|
b38e52cc23
|
chanview not redirecting properly for z6
|
2018-09-13 18:23:53 -07:00 |
|
zotlabs
|
5cee677014
|
Merge branch 'zap' into dev
|
2018-09-13 18:23:00 -07:00 |
|
zotlabs
|
71cc526f7d
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 18:22:43 -07:00 |
|
zotlabs
|
9febf8643e
|
chanview not redirecting properly for z6
|
2018-09-13 18:20:59 -07:00 |
|
zotlabs
|
b8ed6547cf
|
chanview not redirecting properly for z6
|
2018-09-13 18:20:51 -07:00 |
|