harukin
|
059ee6d792
|
test
|
2019-06-14 16:29:15 +09:00 |
|
harukin
|
51bdae7590
|
move position
|
2019-06-14 16:27:14 +09:00 |
|
harukin
|
68b692c233
|
continue?
|
2019-06-14 16:24:45 +09:00 |
|
harukin
|
2c80a07457
|
continue.
|
2019-06-14 16:19:03 +09:00 |
|
harukin
|
4e4d7fcc11
|
test事案
|
2019-06-14 16:17:08 +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
|
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
|
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 |
|
Mario Vavti
|
f96958adf8
|
fix all day events for caldav calendars
|
2019-05-21 12:29:00 +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 Vavti
|
34d1f79777
|
calendar merge: initial commit for timezone support
|
2019-05-20 12:26:33 +02:00 |
|
Manuel Jiménez Friaza
|
125634759d
|
Updated Spanish translation
(cherry picked from commit 350e636e3d)
|
2019-05-19 13:57:04 +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
|
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
|
b0c3780667
|
fix button size
|
2019-05-13 13:02:23 +02:00 |
|
Mario Vavti
|
1d5fff9f58
|
upgrade jgrowl
|
2019-05-13 10:53:10 +02:00 |
|
Mario Vavti
|
769195fcff
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2019-05-13 10:14:06 +02:00 |
|
Mario Vavti
|
dc786bd1cc
|
form security token for mod register ported from zap
|
2019-05-13 10:13:51 +02:00 |
|
Max Kostikov
|
960f4ed649
|
Merge branch 'dev' into 'dev'
Add new Russian translations
See merge request hubzilla/core!1646
|
2019-05-12 17:15:01 +02:00 |
|
Max Kostikov
|
91ad3bf1b6
|
Update hstrings.php
|
2019-05-12 17:09:59 +02:00 |
|
Max Kostikov
|
91b495d526
|
Update hmessages.po
|
2019-05-12 17:09:15 +02:00 |
|
Mario Vavti
|
67ca1b82cc
|
css fix for bootstrap 4.3.1
|
2019-05-10 14:36:11 +02:00 |
|
Mario Vavti
|
89a2c1a09c
|
fix issue with color selector
|
2019-05-10 13:56:03 +02:00 |
|
Mario Vavti
|
274f69526f
|
calendar merge: implement channel calendar import in cdav/calendar
|
2019-05-10 12:18:37 +02:00 |
|
Max Kostikov
|
1545c78d05
|
Merge branch 'dev' into 'dev'
Add 'Create' button translation in CalDAV
See merge request hubzilla/core!1642
|
2019-05-09 14:41:12 +02:00 |
|
Max Kostikov
|
5beaf8ac98
|
Add 'Create' button translation
|
2019-05-09 14:34:58 +02:00 |
|
Mario Vavti
|
9efd484e27
|
calendar merge: cleanup and comment out some unused code
|
2019-05-09 13:43:20 +02:00 |
|
Mario Vavti
|
c200e55f95
|
remove option which should never have slipped into dev branch
|
2019-05-08 16:15:26 +02:00 |
|
Max Kostikov
|
0537be129c
|
More precise scroll back to initial comment in thread
|
2019-05-05 19:00:00 +02:00 |
|
Max Kostikov
|
14eb4326e7
|
Scroll back to initial low level comment
|
2019-05-05 18:13:00 +02:00 |
|
Max Kostikov
|
6fd5133bed
|
Force to add "go to previous comment" hint
|
2019-05-05 18:09:25 +02:00 |
|
Max Kostikov
|
c98f3c5d29
|
Threaded comments navigation elements fixes
|
2019-05-05 15:38:08 +02:00 |
|
Max Kostikov
|
5c8de9d82f
|
Allign arrows position
|
2019-05-05 14:28:15 +02:00 |
|
Max Kostikov
|
6cd968b53b
|
Add arrows to scroll between related comments
|
2019-05-05 14:14:07 +02:00 |
|
Max Kostikov
|
2aa76d257c
|
Merge branch 'db_update' into 'dev'
port db update improvements from zap
See merge request hubzilla/core!1628
|
2019-05-04 22:37:21 +02:00 |
|
Mario Vavti
|
1da4602567
|
port db update improvements from zap
|
2019-05-03 15:13:13 +02:00 |
|
Max Kostikov
|
d55904d4db
|
Update hstrings.php
|
2019-05-03 14:52:43 +02:00 |
|
Max Kostikov
|
740dc59255
|
Update hmessages.po
|
2019-05-03 14:52:08 +02:00 |
|
Max Kostikov
|
413410d02d
|
Revert "Fix comment edit field expansion on reply on comment"
This reverts commit 3528610a51
|
2019-05-03 10:09:54 +02:00 |
|
Max Kostikov
|
3528610a51
|
Fix comment edit field expansion on reply on comment
|
2019-05-03 10:03:40 +02:00 |
|
Mario Vavti
|
b6d598a001
|
provide xchan_url if there is no xchan_addr
|
2019-05-02 12:58:24 +02:00 |
|
Mario Vavti
|
9594ce9a8a
|
calendar merge: fix event_xchan mixup
|
2019-05-01 15:35:20 +02:00 |
|
Mario
|
256f8dd41b
|
Merge branch 'dev' into 'dev'
Add 'reply on comment' feature
See merge request hubzilla/core!1614
|
2019-05-01 10:06:24 +02:00 |
|
Max Kostikov
|
c340416c94
|
Add 'reply on comment' code
|
2019-05-01 06:24:58 +02:00 |
|