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

7577 Commits

Author SHA1 Message Date
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
harukin
f222030edb Merge branch 'origin' into 'master' 
Update 4.0.2

See merge request harukin/core!50
 2019-04-18 06:39:16 +09:00
Max Kostikov
c2ee7cbff5 Update Russian hstrings.php 2019-04-15 12:25:40 +02:00
Max Kostikov
27f813e043 Update Russian hmessages.po 2019-04-15 12:24:51 +02:00
Mario Vavti
767a1711ff enable list views 2019-04-06 16:10:50 +02:00
Mario Vavti
3007009fab upgrade cdav calendar to version 4 2019-04-06 10:22:03 +02:00
Max Kostikov
595429fdde Add submit button styling 2019-03-30 23:08:41 +01:00
Max Kostikov
f9e602c44c Add remove cover button 2019-03-30 22:54:20 +01:00
harukin
3c2b6ce112 Merge branch 'origin' into 'master' 
marge from origin 4.1

See merge request harukin/core!47
 2019-03-21 21:43:10 +09:00
harukin
f8b3a395fb Merge branch 'origin' into 'japanese' 
marge from origin 4.1

See merge request harukin/core!46
 2019-03-21 21:42:57 +09:00
Zot
ea9925f489 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible 2019-03-18 09:35:53 +01:00
Mario Vavti
769dd174bd fix dreport redeliver 2019-03-15 23:10:17 +01:00
harukin
482f1dba27 Merge branch 'japanese' into 'master' 
add Japanese translation

See merge request harukin/core!43
 2019-03-09 18:02:35 +09:00
harukin
23fc7e65d4 Merge branch 'origin' into 'master' 
marge from origin 4.0

See merge request harukin/core!42
 2019-03-09 17:59:08 +09:00
harukin
8f594ad6d9 Merge branch 'origin' into 'japanese' 
marge from origin 4.0

See merge request harukin/core!41
 2019-03-09 17:58:02 +09:00
harukin
19e1325604 edit translation 2019-03-09 17:36:26 +09:00
harukin
0d283b2666 edit translation 2019-03-06 10:32:47 +09:00
Mario Vavti
aa6a31eba5 iron out some kinks with scrollToItem() in combination with collapsed content and images 
(cherry picked from commit 2244bf2ba2)
 2019-03-02 15:32:36 +01:00
Mario Vavti
2244bf2ba2 iron out some kinks with scrollToItem() in combination with collapsed content and images 2019-03-01 14:16:19 +01:00
harukin
8134ba1faf add cmd support test 2019-02-27 10:53:11 +09:00
harukin
d30748f1de edit translation 2019-02-27 10:47:05 +09:00
harukin
e9edec0875 edit translation 2019-02-24 09:19:28 +09:00
Mario Vavti
06aa32db22 fix regression from commit 04ec35d9cc where selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true 2019-02-23 21:48:45 +01:00
Manuel Jiménez Friaza
c91641aa83 Quickfix es-es/hstrings.php 
(cherry picked from commit f92d2e3f7c)
 2019-02-21 18:37:21 +01:00
Manuel Jiménez Friaza
a5bf32a97d Fix es-es/hstrings.php 
(cherry picked from commit a9b75d059b)
 2019-02-21 12:46:48 +01:00
Mario
938e8110ca Merge branch 'es-es' into 'dev' 
Update es-es

See merge request hubzilla/core!1526
 2019-02-21 12:34:31 +01:00
Manuel Jiménez Friaza
a3a90ea09b Update Spanish translation 
(cherry picked from commit e6f289deb6)
 2019-02-21 11:38:45 +01:00
Max Kostikov
3a6ea57d2c Update Russian hstrings.php 2019-02-20 09:00:05 +01:00
Max Kostikov
e960bcfd1c Update Russian hmessages.po 2019-02-20 08:59:50 +01:00
zotlabs
a77d7b8442 urlencode links in category widget 2019-02-19 20:51:06 -08:00
zotlabs
1a77bdd1d0 fix ability for file storage creators (visitors) to be able to delete their own content 2019-02-19 13:14:19 -08:00
Mario Vavti
48f2c85791 prevent page jumping on like if comments are expanded (show all x comments) 2019-02-18 14:40:41 +01:00
harukin
6dda2713cf edit translation 2019-02-15 23:29:31 +09:00
harukin
38443c72c3 おまえかぁぁぁぁぁぁぁぁぁあ！！！！！！！！！！！！！！！！！！！！！11 2019-02-13 23:56:49 +09:00
harukin
0cef3e67ce fix delete strings.php.... 2019-02-13 23:49:33 +09:00
harukin
b98d4875da fix strings.php 2019-02-13 23:24:13 +09:00
harukin
ae52db41de edit translation 2019-02-13 23:19:40 +09:00
Max Kostikov
07df43aa2a Merge branch 'dev' into 'dev' 
Update Russian translayion

See merge request hubzilla/core!1509
 2019-02-12 11:55:17 +01:00
Max Kostikov
6e3bc77369 Update hstrings.php 2019-02-12 11:48:50 +01:00
Max Kostikov
24ddefe3ad Update hmessages.po 2019-02-12 11:47:53 +01:00
harukin
5e0ce96e49 Merge branch 'origin' into 'japanese' 
marge from origin 3.8.9

See merge request harukin/core!37
 2019-02-11 17:51:12 +09:00
harukin
4a2228a372 Merge branch 'origin' into 'develop' 
marge from origin 3.8.9

See merge request harukin/core!36
 2019-02-11 17:48:25 +09:00
harukin
d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
Mario Vavti
2b7a605223 exec updateInit() instead of notificationsUpdate() in jotShare() 2019-02-07 09:55:22 +01:00
Mario Vavti
d70f0092f7 Merge remote-tracking branch 'mike/master' into dev 2019-02-07 09:34:22 +01:00
zotlabs
29c1797493 work on repeat/share for Hubzilla 2019-02-06 17:26:09 -08:00
DM42.Net (Matt Dent)
708d288121 Add filter hooks and the ability to add buttons to the default status editor 2019-02-01 09:49:11 -05:00
Max Kostikov
a2cae45f00 Merge branch 'dev' into 'dev' 
Fix typos in Russian translation

See merge request hubzilla/core!1500
 2019-01-31 18:14:16 +01:00
Max Kostikov
c1159337da Update hstrings.php 2019-01-31 18:06:19 +01:00
Max Kostikov
71adbd7c39 Update hmessages.po 2019-01-31 18:06:09 +01:00
harukin
ded949052c edit translation 2019-01-31 18:44:51 +09:00
harukin
de15a1e7c8 edit translation 2019-01-31 16:50:53 +09:00
zotlabs
a56bc0e1e0 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2019-01-30 18:34:44 -08:00
zotlabs
519db2aace set document title when title changes on a page update 2019-01-30 18:33:10 -08:00
Klaus Weidenbach
728788e3b9 Extend documentation. 2019-01-28 23:58:19 +01:00
Max Kostikov
5ad055efb4 Merge branch 'dev' into 'dev' 
Update Russian translation

See merge request hubzilla/core!1491
 2019-01-25 20:04:19 +01:00
Max Kostikov
3277595366 Update hstrings.php 2019-01-25 19:56:15 +01:00
Max Kostikov
b11be32063 Update hmessages.po 2019-01-25 19:55:23 +01:00
Mario Vavti
ddbc35181c fix page jumping when liking a collapsed/expanded post 
(cherry picked from commit 54806f6ee8)
 2019-01-24 13:39:49 +01:00
Mario Vavti
0946ac2ff9 possibly more page jumping fixes 2019-01-24 12:53:38 +01:00
harukin
875aecf9c6 edit translation 2019-01-24 17:43:03 +09:00
Mario Vavti
54806f6ee8 fix page jumping when liking a collapsed/expanded post 2019-01-23 15:36:34 +01:00
M. Dent
cd8a0f33b5 Add remaining hook insertions 2019-01-22 12:13:16 +01:00
harukin
c85acf8044 edit translation 2019-01-20 22:33:47 +09:00
harukin
78a587791f edit translation 2019-01-20 21:38:53 +09:00
harukin
f4a3ebcb41 edit translation 2019-01-20 21:31:43 +09:00
harukin
086dab902c edit translation 2019-01-20 17:22:38 +09:00
harukin
722c03b6c6 edit translation 2019-01-20 17:08:14 +09:00
Mario Vavti
cc1e1a525f possible fix for #1326 2019-01-17 21:42:24 +01:00
harukin
bb962b90cc edit translation 2019-01-16 21:19:38 +09:00
Mario
2e94e4cd67 Merge branch 'core_fixes' into 'dev' 
Core fixes

See merge request hubzilla/core!1470
 2019-01-15 11:38:41 +01:00
harukin
44f75d94e1 edit translation 2019-01-15 18:07:33 +09:00
harukin
ad89310c45 edit translation 2019-01-15 17:36:43 +09:00
Mario Vavti
c26e112bee whitespace 2019-01-14 15:06:21 +01:00
Mario Vavti
7daf18b077 fix a new instance of autocomplete created on each conversation update 2019-01-14 14:07:56 +01:00
Mario Vavti
f3554804bf only load new content onpopstate if the mid has actually changed 2019-01-14 10:14:37 +01:00
DM42.Net (Matt Dent)
dba9c2fbb0 Add pgrp_extras hook & display 2019-01-13 14:34:04 -05:00
harukin
f481ba1c1c edit translation 2019-01-13 10:39:40 +09:00
Mario Vavti
06beb59628 slightly improve item.is_new rendering 2019-01-08 15:23:08 +01:00
harukin
2dbe567e3b edit translation 2019-01-08 21:48:31 +09:00
Mario Vavti
6f93001658 fix issue with IE 2019-01-07 09:47:08 +01:00
Mario Vavti
d9f21db623 Merge remote-tracking branch 'mike/master' into dev 2019-01-03 14:05:08 +01:00
zotlabs
8ac541e634 better handling of notification updates while commenting 2019-01-02 23:33:33 -08:00
Mario Vavti
da2688403e Merge remote-tracking branch 'mike/master' into dev 2019-01-02 23:07:37 +01:00
zotlabs
f660530ef5 allow notification updates when composing comments. This was disabled when it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed). 2019-01-02 12:49:04 -08:00
harukin
7fbff885dd edit translation 2019-01-01 15:22:09 +09:00
harukin
60b0e652df edit translation 2018-12-31 12:04:53 +09:00
harukin
bb3405ef60 edit translation 2018-12-31 11:57:32 +09:00
harukin
9ef0883011 edit translation 2018-12-31 10:36:15 +09:00
harukin
fa0176c1e6 Merge branch 'develop' into 'japanese' 
merge upstream/master for 3.8.8

See merge request harukin/core!32
 2018-12-24 01:00:50 +09:00
harukin
ffadb70d81 Merge branch 'origin' into 'develop' 
merge upstream/master for 3.8.8

See merge request harukin/core!30
 2018-12-24 00:54:15 +09:00
Mario Vavti
0bfda6d4c8 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text. 
(cherry picked from commit fac3579fb0)
 2018-12-22 20:18:12 +01:00
phani00
feda1e6d84 remove color from style.css (default) but add a little padding; add color & border radius to dark.css. 
(cherry picked from commit 2354bb5427)
 2018-12-22 19:54:48 +01:00
phani00
4256bea418 change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css. 
(cherry picked from commit b97143e9db)
 2018-12-22 19:54:31 +01:00
phani00
4d47b098e5 remove some fancy formatting. 
(cherry picked from commit aaab905e72)
 2018-12-22 19:54:11 +01:00
phani00
66b56416b6 new fix for dark theme 
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css

this works for all schemas incl. dark.


(cherry picked from commit aace8a14ce)
 2018-12-22 19:52:39 +01:00
phani00
c855346358 remove my dark theme fixes. 
(cherry picked from commit 70a7661711)
 2018-12-22 19:52:09 +01:00
Mario Vavti
fac3579fb0 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text. 2018-12-22 19:47:46 +01:00
harukin
651ea8cc2f edit translation 2018-12-20 20:34:39 +09:00
harukin
3f0e948981 edit translation 2018-12-20 17:07:24 +09:00
harukin
24ed7fbf3f edit translation 2018-12-20 17:04:54 +09:00
harukin
b13c3979c2 edit translation 2018-12-20 16:59:24 +09:00
harukin
fdd0dbd973 edit translation 2018-12-19 20:48:05 +09:00
phani00
2354bb5427 remove color from style.css (default) but add a little padding; add color & border radius to dark.css. 2018-12-18 17:54:39 +01:00
phani00
b97143e9db change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css. 2018-12-18 14:02:50 +01:00
phani00
aaab905e72 remove some fancy formatting. 2018-12-18 12:37:51 +01:00
harukin
f0a834f7e8 edit translation 2018-12-18 15:05:36 +09:00
harukin
fdb2cf09c7 edit translation 2018-12-18 14:26:16 +09:00
harukin
a67738380c edit translation 2018-12-18 14:19:34 +09:00
phani00
aace8a14ce new fix for dark theme 
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css

this works for all schemas incl. dark.
 2018-12-17 15:28:15 +00:00
phani00
70a7661711 remove my dark theme fixes. 2018-12-17 10:08:45 +00:00
harukin
5816ee9f9a Merge branch 'develop' into 'japanese' 
merge again upstream/master for 3.8.7

See merge request harukin/core!27
 2018-12-15 17:20:44 +09:00
harukin
e02c09d361 merge again upstream/master for 3.8.7 2018-12-15 17:17:00 +09:00
Mario Vavti
d51d0160d3 fix issue with linkdropper 
(cherry picked from commit f81a3ba45d)
 2018-12-14 21:32:23 +01:00
zotlabs
c2ad9d4996 regression: the ability to order apps messed up since adding pinned apps to the ordering 
(cherry picked from commit 6464099364)
 2018-12-14 21:31:02 +01:00
harukin
dfa6463e5b Merge branch 'develop' into 'japanese' 
merge from upsream

See merge request harukin/core!25
 2018-12-15 00:48:21 +09:00
harukin
097afab9f4 merge from upsream 2018-12-15 00:40:38 +09:00
Mario Vavti
1bd49671b7 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error 
(cherry picked from commit 7894fed741)
 2018-12-14 11:30:57 +01:00
phani00
44832bbacb change redbasic dark schema to make categories and highlights readable 
additions to /view/theme/redbasic/schema/dark.css to change the appearance of category
badges and highlighted text ([hl]...[/hl]).

hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class
selector that works in master but not in dev anymore.


(cherry picked from commit 18caf0273f)
 2018-12-14 11:30:05 +01:00
Mario Vavti
f81a3ba45d fix issue with linkdropper 2018-12-14 11:23:08 +01:00
harukin
018fa052f2 edit translation 2018-12-14 19:21:10 +09:00
Mario Vavti
c771d2809f Merge remote-tracking branch 'mike/master' into dev 2018-12-14 10:28:55 +01:00
zotlabs
6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering 2018-12-12 19:11:30 -08:00
harukin
7c19f0cca7 edit translation 2018-12-12 11:42:46 +09:00
harukin
c2181c23ef edit translation 2018-12-12 11:31:05 +09:00
harukin
3cf145aa6a edit translation 2018-12-11 23:01:28 +09:00
harukin
f2d078e3cd edit translation 2018-12-11 10:02:20 +09:00