harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,872 Commits 6 Branches 36 Tags 152 MiB
4e4d7fcc11
Commit Graph

24872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti
39613aa2d9 improve timezone detection for caldav and remove smart birthday feature. Force adjust birthdays until we agree on how to deal with this. 2019-05-22 12:40:37 +02:00
zotlabs
7c2aafd4ee another forum -> group wording change 2019-05-21 18:23:45 -07:00
Mario Vavti
e834c7fe3e remove unused code 2019-05-21 12:31:50 +02:00
Mario Vavti
f96958adf8 fix all day events for caldav calendars 2019-05-21 12:29:00 +02:00
zotlabs
776074b24f translate make-friend activities to zot6 2019-05-20 19:03:10 -07:00
Mario Vavti
c9d64d75f3 move smart birthday feature to calendar settings and override the adjust flag at display time instead of import 2019-05-20 13:51:53 +02:00
Mario Vavti
9651689bb8 fix event notifications viewall url 2019-05-20 13:14:54 +02:00
Mario
75be0475ba Merge branch 'es-es' into 'dev' 
Update es-es

See merge request hubzilla/core!1651
 2019-05-20 13:08:37 +02:00
Mario
e130b58b20 Merge branch 'es-es' into '4.2RC' 
Update es-es

See merge request hubzilla/core!1652
 2019-05-20 13:06:55 +02:00
Mario Vavti
e44f0c497f be more precise with table selection 2019-05-20 12:34:05 +02:00
Mario Vavti
2d0f96d28b Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-05-20 12:27:00 +02:00
Mario Vavti
34d1f79777 calendar merge: initial commit for timezone support 2019-05-20 12:26:33 +02:00
Manuel Jiménez Friaza
2185ccd4ea Merge branch 'cherry-pick-350e636e' into 'es-es' 
Updated Spanish translation

See merge request mjfriaza/core!7
 2019-05-19 14:03:17 +02:00
Manuel Jiménez Friaza
125634759d Updated Spanish translation 
(cherry picked from commit 350e636e3d)
 2019-05-19 13:57:04 +02:00
Xanthor
a921deafd1 Fix a really disturbing comment 
(cherry picked from commit 823c0434eb)

(cherry picked from commit af2b263bc7)
 2019-05-17 12:28:41 +02:00
Mario Vavti
071fba2f71 wiki: urlencode the entire share link 
(cherry picked from commit aa120e0478)
 2019-05-17 12:28:13 +02:00
Mario Vavti
9de729e3e7 wiki: urlencode the entire share link 
(cherry picked from commit aa120e0478)
 2019-05-17 12:27:54 +02:00
Mario Vavti
7cf5bd30f2 use escape_tags() wiki headers 
(cherry picked from commit e7f1f496c5)
 2019-05-17 12:27:18 +02:00
Mario Vavti
e6cee2965a use escape_tags() wiki headers 
(cherry picked from commit e7f1f496c5)
 2019-05-17 12:26:03 +02:00
Xanthor
af2b263bc7 Fix a really disturbing comment 
(cherry picked from commit 823c0434eb)
 2019-05-17 12:25:22 +02:00
Mario Vavti
aa120e0478 wiki: urlencode the entire share link 2019-05-17 12:24:25 +02:00
Mario
b07c55a0d9 Merge branch 'patch-1' into 'master' 
Fix a really disturbing comment

See merge request hubzilla/core!1650
 2019-05-17 12:01:21 +02:00
Mario Vavti
e7f1f496c5 use escape_tags() wiki headers 2019-05-17 11:57:41 +02:00
Xanthor
823c0434eb Fix a really disturbing comment 2019-05-17 05:23:12 +02:00
Mario Vavti
22162635e7 calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries 
(cherry picked from commit 8be0031602)
 2019-05-15 18:25:59 +02:00
Mario Vavti
8be0031602 calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries 2019-05-15 18:21:52 +02:00
Mario Vavti
29c5e74d31 missing backslash 
(cherry picked from commit 3c8867a1e8)
 2019-05-15 11:40:36 +02:00
Mario Vavti
3c8867a1e8 missing backslash 2019-05-15 11:38:23 +02:00
Mario Vavti
c439fe0437 add autocomplete js to calendar and fix issue with extended likes mid 
(cherry picked from commit 15a000bb45)
 2019-05-14 09:14:04 +02:00
Max Kostikov
b21db670b4 Fix comments scroll button CSS 
(cherry picked from commit d0322f5fbd)
 2019-05-14 09:13:40 +02:00
Mario Vavti
1f84aa9809 css fixes 
(cherry picked from commit c1f01b7e35)
 2019-05-14 09:13:19 +02:00
Mario Vavti
4ac249c26c deal with privacy mentions in event descriptions 
(cherry picked from commit 71064f481b)
 2019-05-14 09:13:02 +02:00
zotlabs
85a29fce94 bbcode map bypass wasn't catching all map forms. 
(cherry picked from commit 436293713b)
 2019-05-14 09:12:35 +02:00
Mario
71ecb470b6 Merge branch 'dev' into 'dev' 
bbcode map bypass wasn't catching all map forms.

See merge request hubzilla/core!1647
 2019-05-14 09:10:48 +02:00
Mario Vavti
15a000bb45 add autocomplete js to calendar and fix issue with extended likes mid 2019-05-14 09:09:48 +02:00
Max Kostikov
18e4a7ac6e Merge branch 'dev' into 'dev' 
Fix comments scroll button CSS

See merge request hubzilla/core!1649
 2019-05-13 23:19:19 +02:00
Max Kostikov
d0322f5fbd Fix comments scroll button CSS 2019-05-13 23:16:36 +02:00
Mario Vavti
c1f01b7e35 css fixes 2019-05-13 22:00:40 +02:00
Mario Vavti
71064f481b deal with privacy mentions in event descriptions 2019-05-13 15:45:05 +02:00
zotlabs
436293713b bbcode map bypass wasn't catching all map forms. 2019-05-13 05:14:43 -07:00
Mario Vavti
fc726bfb4b fix button size 2019-05-13 13:11:14 +02:00
Mario Vavti
b0c3780667 fix button size 2019-05-13 13:02:23 +02:00
Mario Vavti
3e431c65be bump version 2019-05-13 12:17:08 +02:00
Mario Vavti
5b0b90d1f5 bump version, update autoload cache and update strings 2019-05-13 12:13:18 +02:00
Mario Vavti
d16714e84b calendar merge: cleanup 2019-05-13 11:30:13 +02:00
Mario Vavti
1d5fff9f58 upgrade jgrowl 2019-05-13 10:53:10 +02:00
Mario Vavti
fbe8d6144a port db_indexes() from zap 2019-05-13 10:46:12 +02:00
Mario Vavti
d5f59a57bf don't do oembed processing on naked links and smarty lib cleanup. ported from zap. 2019-05-13 10:39:40 +02:00
Mario Vavti
7465c79884 optimise oembed pdf processing so we do not actually load the content, which could cause performance issues. ported from zap. 2019-05-13 10:28:06 +02:00
Mario Vavti
769195fcff Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-05-13 10:14:06 +02:00