Mario Vavti
|
b6bd2884d5
|
Merge branch 'dev' into 4.2RC
|
2019-05-29 09:08:40 +02:00 |
|
Mario
|
767a235611
|
Merge branch 'dev' into 'dev'
support 'expires' over Zot6
See merge request hubzilla/core!1661
|
2019-05-29 09:06:52 +02:00 |
|
zotlabs
|
620fc06b6c
|
anomolies in calls to datetime_convert in include/import
|
2019-05-28 23:14:22 -07:00 |
|
zotlabs
|
0fa4c89a1b
|
convert AS "instrument" objects to the more appropriate "generator" - this probably should happen in pubcrawl addon also
|
2019-05-28 20:23:03 -07:00 |
|
zotlabs
|
1bf046c142
|
Revert "another forum -> group wording change" (wrong tree)
This reverts commit 7c2aafd4ee.
|
2019-05-28 16:35:41 -07:00 |
|
zotlabs
|
52f8429218
|
support 'expires' over Zot6
|
2019-05-28 16:28:03 -07:00 |
|
zotlabs
|
932b414063
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-28 16:16:29 -07:00 |
|
Mario Vavti
|
097b2390db
|
update changelog
(cherry picked from commit ca8d252ad7)
|
2019-05-28 12:31:48 +02:00 |
|
Mario Vavti
|
ca8d252ad7
|
update changelog
|
2019-05-28 12:07:14 +02:00 |
|
Mario Vavti
|
23a0dbe3cc
|
4.2RC2
|
2019-05-27 08:19:23 +02:00 |
|
Mario Vavti
|
545ece82b3
|
Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RC
|
2019-05-27 08:09:36 +02:00 |
|
Mario Vavti
|
eaea947b74
|
Merge branch 'dev' into 4.2RC
|
2019-05-27 08:07:26 +02:00 |
|
Mario Vavti
|
f1b61d5882
|
mod cal band-aid fixes
|
2019-05-26 20:22:40 +02:00 |
|
Mario Vavti
|
e466d72058
|
adjust birthday handling according to community decision and slightly change display of allday event items
|
2019-05-26 18:05:11 +02:00 |
|
Mario Vavti
|
385be35ed5
|
fix #1374
(cherry picked from commit 528b9b6a60)
|
2019-05-24 12:27:14 +02:00 |
|
Mario Vavti
|
528b9b6a60
|
fix #1374
|
2019-05-24 10:27:45 +02:00 |
|
Mario Vavti
|
dd374eaebf
|
get channel from photo uid
(cherry picked from commit 9ea483d1dc)
|
2019-05-24 09:59:17 +02:00 |
|
Mario Vavti
|
9ea483d1dc
|
get channel from photo uid
|
2019-05-24 09:57:46 +02:00 |
|
Mario Vavti
|
b1813df61a
|
add new directory fallback server
|
2019-05-23 08:46:16 +02:00 |
|
Mario Vavti
|
8715f74d29
|
Merge branch 'dev' into 4.2RC
|
2019-05-23 08:44:44 +02:00 |
|
Mario Vavti
|
152224944b
|
add new directory fallback server
|
2019-05-23 08:43:48 +02:00 |
|
Mario Vavti
|
f86d12c8f4
|
Merge branch 'dev' into 4.2RC
|
2019-05-23 08:37:52 +02:00 |
|
Mario
|
94d4bc4bac
|
Merge branch 'dev' into 'dev'
translate make-friend activities to zot6
See merge request hubzilla/core!1654
|
2019-05-22 12:59:41 +02:00 |
|
Mario Vavti
|
c95488549d
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-22 12:41:01 +02:00 |
|
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
|
9de729e3e7
|
wiki: urlencode the entire share link
(cherry picked from commit aa120e0478)
|
2019-05-17 12:27:54 +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 Vavti
|
e7f1f496c5
|
use escape_tags() wiki headers
|
2019-05-17 11:57:41 +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 |
|