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 |
|
Max Kostikov
|
9af8a1d30c
|
Move JS to main module
|
2019-05-01 06:23:56 +02:00 |
|
Max Kostikov
|
4da96ee980
|
Remove 'doreply' JS function
|
2019-04-30 17:35:53 +02:00 |
|
Max Kostikov
|
21637e033c
|
Add JS 'doreply' function
|
2019-04-30 17:34:56 +02:00 |
|
Mario Vavti
|
a04689b784
|
do not allow editing events that do not belong to us
|
2019-04-30 12:08:19 +02:00 |
|
Max Kostikov
|
5066945adc
|
Fix add multiple icons on 'Submit' button when reply on comment
|
2019-04-30 11:17:22 +02:00 |
|
Mario Vavti
|
0b062d0b8a
|
select event by event_hash instead of item_id
|
2019-04-30 10:47:48 +02:00 |
|
Mario Vavti
|
9cc1eff15c
|
remove logging
|
2019-04-30 00:12:19 +02:00 |
|
Mario Vavti
|
327e5d06e1
|
calendar merge: implement single event editing UI
|
2019-04-30 00:09:57 +02:00 |
|
Max Kostikov
|
c0be4c36e1
|
Update main.js
|
2019-04-29 23:40:21 +02:00 |
|
Max Kostikov
|
31e04378cd
|
Add 'reply to comment' processing
|
2019-04-29 23:30:51 +02:00 |
|
Max Kostikov
|
e80c99ad74
|
Add 'reply to comment' button
|
2019-04-29 23:29:16 +02:00 |
|
Mario Vavti
|
dce6a5763d
|
calendar merge: d&d support and some minor cleanup and fixes
|
2019-04-29 11:45:55 +02:00 |
|
Mario Vavti
|
f616b2d49a
|
calendar merge: bring back event categories
|
2019-04-24 14:48:30 +02:00 |
|
Mario Vavti
|
9275fd16c2
|
resolve merge conflict
|
2019-04-20 10:23:11 +02:00 |
|
Max Kostikov
|
54f95389a8
|
Add anti SEO link properties in directory listing
|
2019-04-19 23:17:24 +02:00 |
|
Max Kostikov
|
c374072822
|
Update cdav_calendar.tpl
|
2019-04-19 21:22:42 +02:00 |
|
Max Kostikov
|
7560918b32
|
Add translation to update button
|
2019-04-19 21:04:00 +02:00 |
|
Mario Vavti
|
fd87faa7a6
|
Merge branch 'dev' into calendar_merge
|
2019-04-19 19:37:06 +02:00 |
|
Mario Vavti
|
2bd5ae3617
|
provide link to source and some cleanup
|
2019-04-19 17:21:45 +02:00 |
|
Mario Vavti
|
9b6e46dc6b
|
calendar merge initial commit
|
2019-04-19 15:32:56 +02:00 |
|
Max Kostikov
|
ea1d8b8104
|
Add remove profile photo button
|
2019-04-19 15:29:08 +02:00 |
|
harukin
|
d55f691ec0
|
Merge branch 'origin' into 'japanese'
Update 4.0.2
See merge request harukin/core!51
|
2019-04-18 06:40:08 +09:00 |
|