harukin
|
4e4d7fcc11
|
test事案
|
2019-06-14 16:17:08 +09:00 |
|
harukin
|
3ca637bec2
|
edit path
|
2019-06-14 16:15:16 +09:00 |
|
harukin
|
ce45eab3cc
|
remove tpl edit
|
2019-06-14 16:13:14 +09:00 |
|
harukin
|
b9e77d6a49
|
recaptha test
|
2019-06-14 16:11:12 +09:00 |
|
harukin
|
76e879e5de
|
Merge branch 'origin' into 'develop'
Update 4.2
See merge request harukin/core!55
|
2019-06-09 10:54:57 +09:00 |
|
Mario Vavti
|
9f403a4d6b
|
fix css issue
(cherry picked from commit 55792d5528)
|
2019-06-07 09:58:51 +02:00 |
|
Mario Vavti
|
a3f726baa8
|
fix embedphotos image size
(cherry picked from commit ebc2b23c3a)
|
2019-06-07 08:45:58 +02:00 |
|
Mario Vavti
|
e4ca3609d9
|
Merge branch '4.2RC'
|
2019-06-04 10:19:04 +02:00 |
|
Mario Vavti
|
bc092d8d78
|
version 4.2
|
2019-06-04 10:16:06 +02:00 |
|
Mario Vavti
|
dd5933b048
|
Merge branch 'dev' into 4.2RC
|
2019-06-04 10:13:59 +02:00 |
|
Mario Vavti
|
5d6128b25c
|
update changelog
|
2019-06-04 10:13:25 +02:00 |
|
Mario Vavti
|
24cb04c346
|
do not change default timezone in parse_ical_file()
(cherry picked from commit f1b54cf0a4)
|
2019-06-03 22:43:20 +02:00 |
|
Mario Vavti
|
f1b54cf0a4
|
do not change default timezone in parse_ical_file()
|
2019-06-03 22:37:03 +02:00 |
|
Mario Vavti
|
e64a7b87a8
|
fix timezone issue when importing adjusted events
(cherry picked from commit 2b452ea3e8)
|
2019-06-03 21:04:51 +02:00 |
|
Mario Vavti
|
2b452ea3e8
|
fix timezone issue when importing adjusted events
|
2019-06-03 21:03:43 +02:00 |
|
Mario
|
66c6c6c7d1
|
regard timezones in calendar import/export
(cherry picked from commit 5b4aa1afc2)
|
2019-06-03 13:27:16 +02:00 |
|
Mario
|
5b4aa1afc2
|
regard timezones in calendar import/export
|
2019-06-03 13:25:48 +02:00 |
|
Mario Vavti
|
89205276ab
|
update changelog
(cherry picked from commit 6d2ab6a7d6)
|
2019-06-03 11:49:04 +02:00 |
|
Mario Vavti
|
6d2ab6a7d6
|
update changelog
|
2019-06-03 11:48:30 +02:00 |
|
Mario Vavti
|
e6da910ee2
|
Merge branch 'dev' into 4.2RC
|
2019-06-03 11:44:31 +02:00 |
|
Max Kostikov
|
2100ac3cfc
|
Merge branch 'dev' into 'dev'
fix category widget when using articles
See merge request hubzilla/core!1664
|
2019-05-31 23:28:09 +02:00 |
|
zotlabs
|
c7476a1d96
|
fix category widget when using articles
|
2019-05-31 14:19:04 -07:00 |
|
Max Kostikov
|
d8c3033941
|
Merge branch 'dev' into 'dev'
live-update not triggering on mod_search
See merge request hubzilla/core!1662
|
2019-05-30 19:50:58 +02:00 |
|
Max Kostikov
|
7e26ee5a73
|
Merge branch 'dev' into 'dev'
Add single photo URL rewrite for clonned channel
See merge request hubzilla/core!1663
|
2019-05-30 13:45:20 +02:00 |
|
Max Kostikov
|
a8e25ccfe6
|
Add single photo URL rewrite for clonned channel
|
2019-05-30 13:41:32 +02:00 |
|
zotlabs
|
b6267ec7c2
|
live-update not triggering on mod_search
|
2019-05-29 17:04:27 -07:00 |
|
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 |
|