Commit Graph

24706 Commits

Author SHA1 Message Date
zotlabs 8aefbd911b events: don't use htmlentities on local (hz) event titles as they are not being used in textareas and umlauts for instance are getting mangled on the calendar display
(cherry picked from commit c1cc76119c)
2019-06-20 18:39:58 +02:00
Mario f046a34d34 Merge branch 'patch-2' into 'master'
Fix os_path replace for thumbnails

See merge request hubzilla/core!1673
2019-06-18 19:17:33 +02:00
Max Kostikov 9e3a4402e0 Fix os_path replace for thumbnails 2019-06-18 18:19:17 +02:00
Mario Vavti df228237de fix typo
(cherry picked from commit 619b39f955)
2019-06-18 10:37:56 +02:00
Mario Vavti 958217dd55 changelog and version 2019-06-17 10:42:56 +02:00
Mario Vavti 2f80fdae97 Merge branch 'dev' 2019-06-17 10:28:47 +02:00
Mario Vavti 9507f191b0 disable events module. it is now disfunctional 2019-06-17 10:16:49 +02:00
Mario Vavti 92f5d8c8be remove old fullcalendar library 2019-06-17 10:11:36 +02:00
Mario Vavti 8535eb7bf5 update feature set 2019-06-17 10:10:44 +02:00
Mario Vavti c9604eaabf revisit mod cal 2019-06-17 10:07:00 +02:00
Mario 3bc214e544 Merge branch 'dev' into 'dev'
Add signatures processing for private messages

See merge request hubzilla/core!1670
2019-06-15 23:07:39 +02:00
Max Kostikov 43cec4398d base64 encode message signature 2019-06-15 16:03:35 +02:00
Max Kostikov 335394aaa1 Add base64 decode if signature encoded 2019-06-15 15:58:55 +02:00
Max Kostikov c9615cc19c Formatting 2019-06-14 21:08:53 +02:00
Max Kostikov 5315d8fe3f Add signature when private message displaying 2019-06-14 20:59:07 +02:00
Max Kostikov 75dedb3345 Add signature when send private message 2019-06-14 20:57:28 +02:00
Max Kostikov 134dfb8804 Formatting 2019-06-14 20:56:00 +02:00
Max Kostikov 86f4a8d33a Add signatures processing for private messages 2019-06-14 20:54:42 +02:00
Max Kostikov abeb924554 Add signatures processing for private messages 2019-06-14 20:53:43 +02:00
Max Kostikov 4da3933f24 Add signatures processing for private messages 2019-06-14 20:52:21 +02:00
Mario Vavti c5703306ef fix mod cal regression
(cherry picked from commit a26774b99e)
2019-06-14 09:53:26 +02:00
Mario Vavti a26774b99e fix mod cal regression 2019-06-14 09:52:54 +02:00
Mario 9258593776 Merge branch 'dev' into 'dev'
zot6 protocol edge case

See merge request hubzilla/core!1669
2019-06-14 09:13:57 +02:00
Mario Vavti 48604041e8 fix typo 2019-06-14 09:12:47 +02:00
zotlabs 57ed9ec8e2 zot6 protocol edge case 2019-06-13 18:28:33 -07:00
Mario Vavti 801ab611ed more work on linked item/resource deletion for photos and events, deprecate the force flag in drop_item() and comment out goaway() in drop_item(). 2019-06-13 13:34:04 +02:00
Mario Vavti bc34167c84 port delete fixes from zap 2019-06-12 12:46:29 +02:00
Mario Vavti decd0dc035 more work on event item deletion 2019-06-12 11:27:39 +02:00
Mario Vavti 9ac9c693ad initial support for deleting event items if an event is removed 2019-06-12 10:07:18 +02:00
Mario 9b2cd69c0f Merge branch 'dev' into 'dev'
attach sync issues

See merge request hubzilla/core!1668
2019-06-12 10:00:17 +02:00
zotlabs b3f1a19db6 zot6 deletion issue 2019-06-11 20:22:57 -07:00
zotlabs f3b6708a92 attach sync issues 2019-06-11 18:00:42 -07:00
Mario 8848885d9a Merge branch 'patch-1' into 'master'
Add resize on image scale to 4 and 7

See merge request hubzilla/core!1667
2019-06-11 17:16:41 +02:00
Max Kostikov c1cab6789e Add resize on image scale to 4 and 7 2019-06-11 12:55:28 +02:00
Max Kostikov 907777eeb0 Add resize on image scale to 4 and 7 2019-06-11 12:53:46 +02:00
Mario Vavti 7889612edc remove sizeRangeSuffixes. they can cause issues with profile photos.
(cherry picked from commit e81e264988)
2019-06-10 22:40:36 +02:00
Mario Vavti e81e264988 remove sizeRangeSuffixes. they can cause issues with profile photos. 2019-06-10 22:39:53 +02:00
Mario eacc29ded0 add the thumbrepair script
(cherry picked from commit 15874ac45c)
2019-06-10 22:36:10 +02:00
Mario ea04c93bfd resolve merge conflict
(cherry picked from commit 761fc74a67)
2019-06-10 22:35:30 +02:00
Mario 8692977585 fix storageconv issue with postgres
(cherry picked from commit 0e2239e50b)
2019-06-10 22:35:14 +02:00
Mario 6a40f3ed60 Revert "PgSQL compatibility on conversion"
This reverts commit dd1f631d9d
2019-06-10 22:34:51 +02:00
Max Kostikov dd1f631d9d PgSQL compatibility on conversion
(cherry picked from commit 94254e61c1)
2019-06-10 22:32:54 +02:00
Mario 15874ac45c add the thumbrepair script 2019-06-10 22:30:38 +02:00
Mario 761fc74a67 resolve merge conflict 2019-06-10 21:52:29 +02:00
Mario 0e2239e50b fix storageconv issue with postgres 2019-06-10 21:49:34 +02:00
Max Kostikov e9a17517d3 Merge branch 'dev' into 'dev'
PgSQL compatibility on conversion

See merge request hubzilla/core!1665
2019-06-10 20:03:55 +02:00
Max Kostikov 94254e61c1 PgSQL compatibility on conversion 2019-06-10 19:51:55 +02:00
Mario Vavti 9f403a4d6b fix css issue
(cherry picked from commit 55792d5528)
2019-06-07 09:58:51 +02:00
Mario Vavti 55792d5528 fix css issue 2019-06-07 09:51:26 +02:00
Mario Vavti a3f726baa8 fix embedphotos image size
(cherry picked from commit ebc2b23c3a)
2019-06-07 08:45:58 +02:00