harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,393 Commits 6 Branches 36 Tags 152 MiB
master
Commit Graph

2682 Commits

Author SHA1 Message Date
harukin
6859053727 Revert "Revert "Merge branch 'develop' into 'origin'"" 
This reverts commit 8c207cf1eb.
 2019-12-29 13:59:00 +09:00
harukin
8c207cf1eb Revert "Merge branch 'develop' into 'origin'" 
This reverts commit e1922bd555.
 2019-12-29 13:53:59 +09:00
harukin
e1922bd555 Merge branch 'develop' into 'origin' 
# Conflicts:
#   view/ja/hstrings.php
 2019-12-29 13:31:01 +09:00
DM42.Net Hubzilla Development
3e133bbfa3 Move auto_save_draft to header from thread comment 
(cherry picked from commit c86b35da701674510a97ccc21e46581bd864cc31)
 2019-11-28 09:42:59 +01:00
Mario
fd7d497cd1 make inline pdf a security option, move thumbnail security to security options from admin/site 
(cherry picked from commit de9a7f0fa909792656d26d369f2ff21c57fc1e4d)
 2019-11-15 11:03:38 +01:00
Max Kostikov
541146e8ce Add 'Connect' button for not connected at this location channels 2019-10-01 11:15:29 +02:00
Terrox
93ec01e0a1 More nofollow tags to discourage backlink farmers 2019-09-03 14:32:52 +02:00
harukin
63d7bfde81 Merge branch 'origin' into 'develop' 
Update 4.4.1

See merge request harukin/core!61
 2019-08-17 08:38:51 +09:00
Mario Vavti
4e3a0720c3 minor css adjustions 2019-07-23 23:32:32 +02:00
Mario Vavti
407b02bde8 calendar: revert back to UTC strings for dates due to better legibility. Strip timezone info from UTC string and always treat values as UTC. 2019-07-11 11:12:27 +02:00
Mario Vavti
da7912b879 calendar: display date values as ISO string 2019-07-09 23:17:48 +02:00
Mario Vavti
02c08aed12 hide timezone select on allday events 2019-07-08 21:12:54 +02:00
Mario Vavti
4f705fc3f8 various calendar UI improvements: make day- and weeknumbers clickable for navigation, hide start and end time fields in month view (only allday events can be generated there), remove the action arg from changeView(). 
;
 2019-06-20 18:27:46 +02:00
Mario Vavti
c9604eaabf revisit mod cal 2019-06-17 10:07:00 +02:00
Max Kostikov
5315d8fe3f Add signature when private message displaying 2019-06-14 20:59:07 +02:00
Max Kostikov
75dedb3345 Add signature when send private message 2019-06-14 20:57:28 +02: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
55792d5528 fix css issue 2019-06-07 09:51: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
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 Vavti
34d1f79777 calendar merge: initial commit for timezone support 2019-05-20 12:26:33 +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
dc786bd1cc form security token for mod register ported from zap 2019-05-13 10:13:51 +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
Max Kostikov
6fd5133bed Force to add "go to previous comment" hint 2019-05-05 18:09:25 +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
Mario Vavti
1da4602567 port db update improvements from zap 2019-05-03 15:13:13 +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
9af8a1d30c Move JS to main module 2019-05-01 06:23:56 +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
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
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