Commit graph

22561 commits

Author SHA1 Message Date
zotlabs
e6e253d200 Merge branch 'dev' 2018-09-16 01:33:05 -07:00
zotlabs
fb50c7881b Merge branch 'dev' into 1.0 2018-09-16 01:32:50 -07:00
zotlabs
a3e3c93902 consistency 2018-09-16 01:17:25 -07:00
Mario Vavti
07cd1d1272 appification of the lang module 2018-09-16 09:30:07 +02:00
M.Dent (DM42.Net)
abe35817cd Add attach_delete hook 2018-09-15 23:09:16 -04:00
zotlabs
c57e8519dc Merge branch 'zap' into dev 2018-09-15 16:44:27 -07:00
zotlabs
ac0020979c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:44:06 -07:00
zotlabs
cebfeabc41 logic issue 2018-09-15 16:43:44 -07:00
zotlabs
df7605435f Merge branch 'zap' into dev 2018-09-15 16:21:00 -07:00
zotlabs
34e8a36019 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:14:52 -07:00
zotlabs
f58c244ba0 refactor include/follow 2018-09-15 16:13:44 -07:00
Max Kostikov
585bdf562a Update msglib.php 2018-09-16 00:43:45 +02:00
Max Kostikov
034441bd13 use common msg_drop function 2018-09-15 22:32:56 +02:00
Max Kostikov
1819704620 Use common msg_drop function 2018-09-15 22:32:07 +02:00
Max Kostikov
18801a6c60 formatting 2018-09-15 22:31:08 +02:00
Max Kostikov
f83c2d5cd1 Create msglib.php 2018-09-15 22:27:39 +02:00
Max Kostikov
724dc48fe8 Add new file 2018-09-15 21:41:13 +02:00
Mario Vavti
791ff25d52 appify poke 2018-09-15 11:09:16 +02:00
Mario Vavti
299eb469f8 appify mood 2018-09-15 11:00:41 +02:00
Mario Vavti
0f9a8a43e4 appify invite 2018-09-15 10:48:51 +02:00
Mario Vavti
7856f5882b appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again 2018-09-15 10:10:43 +02:00
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