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
M. Dent
4cb4f17500
Merge branch 'photo-hook' into 'dev'
...
add photo_view_filter hook and fix minor issue with unset auto_save_draft…
See merge request hubzilla/core!1425
2018-12-10 21:49:12 +01:00
Mario Vavti
7894fed741
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
2018-12-10 10:37:29 +01:00
phani00
18caf0273f
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.
2018-12-10 03:03:28 +00:00
harukin
4f1fdf85c8
edit translation
2018-12-09 13:31:34 +09:00
harukin
33865993db
edit translation
2018-12-09 13:29:24 +09:00
harukin
5a27aaef24
edit translation
2018-12-06 22:10:55 +09:00
harukin
770036c5a8
Merge branch 'develop' into 'japanese'
...
merge from upsream 3.8.6 release
See merge request harukin/core!23
2018-12-04 23:55:59 +09:00
harukin
e8acf7e87a
merge from upsream 3.8.6 release
2018-12-04 23:52:59 +09:00
harukin
2a4aea67b8
edit translation
2018-12-04 23:47:09 +09:00
Max Kostikov
d12744011a
Merge branch 'dev' into 'dev'
...
Add strings to Russian translation
See merge request hubzilla/core!1418
2018-12-04 11:50:04 +01:00
Max Kostikov
c0e4c92d47
Update hstrings.php
2018-12-04 11:41:59 +01:00
Max Kostikov
cc3e910194
Update hmessages.po
2018-12-04 11:41:42 +01:00
Mario Vavti
5e14da67e1
quickfix for es-es language
...
(cherry picked from commit 6b68a76bbe
2018-12-03 21:24:29 +01:00
Mario Vavti
6b68a76bbe
quickfix for es-es language
2018-12-03 21:22:02 +01:00
Mario Vavti
c50e3a702a
more notifications fixes
...
(cherry picked from commit 9ef6c57ca5
2018-12-03 10:49:08 +01:00
Mario Vavti
9ef6c57ca5
more notifications fixes
2018-12-03 10:46:49 +01:00
harukin
5d82037ffb
edit translation
2018-12-02 20:36:14 +09:00
harukin
a41713febb
edit translation
2018-12-02 20:29:11 +09:00
harukin
5002d8e1fa
edit translation
2018-12-02 19:59:58 +09:00
Mario Vavti
f13b1e8604
fix filtering by addr in handleNotificationsItems()
...
(cherry picked from commit f083c0cba1
2018-12-02 10:59:33 +01:00
Mario Vavti
f083c0cba1
fix filtering by addr in handleNotificationsItems()
2018-12-02 10:58:54 +01:00
Mario Vavti
05c422ef23
redbasic sticky aside fixes
...
(cherry picked from commit 8d4f6a7865
2018-12-02 10:18:20 +01:00
zotlabs
51d274961b
typo
...
(cherry picked from commit 6f22e47feb
2018-12-02 10:18:05 +01:00
zotlabs
4b4cc04897
allow notification filtering by name or addr
...
(cherry picked from commit c6acb6191c
2018-12-02 10:17:45 +01:00
Mario
58c0b81908
use flex for the default template
...
(cherry picked from commit 3775be4ce9
2018-12-02 10:16:24 +01:00
Mario
a0d1ce77dc
update imagesloaded to version 4.1.4 via composer
...
(cherry picked from commit c667572d3e
2018-12-02 10:14:37 +01:00
Manuel Jiménez Friaza
863cae1bab
Update es-es
...
(cherry picked from commit ca98a566ee
2018-12-02 10:13:43 +01:00
M. Dent
132547a9d9
Merge branch 'sticky_aside_fixes' into 'dev'
...
redbasic sticky aside fixes
See merge request hubzilla/core!1415
2018-12-02 05:07:59 +01:00
Mario Vavti
fdb0459288
Merge remote-tracking branch 'mike/master' into dev
2018-12-01 21:43:54 +01:00
Mario Vavti
8d4f6a7865
redbasic sticky aside fixes
2018-12-01 21:30:18 +01:00
harukin
d72276df94
edit translation
2018-12-01 23:15:39 +09:00
harukin
450bb1c2cb
edit translation
2018-12-01 22:54:51 +09:00
zotlabs
6f22e47feb
typo
2018-11-30 22:39:10 -08:00
zotlabs
c6acb6191c
allow notification filtering by name or addr
2018-11-30 19:03:14 -08:00
harukin
658c0734e2
edit translation
2018-11-30 00:19:54 +09:00
harukin
5c7f01140a
edit translation
2018-11-29 22:53:13 +09:00
harukin
12767746ca
edit translation
2018-11-29 22:50:12 +09:00
harukin
ffa86b25db
edit translation
2018-11-29 22:46:14 +09:00
harukin
2763c0f40e
edit translation
2018-11-29 22:42:28 +09:00
M. Dent
19f0ce7e37
Merge branch 'default2flex-conversion' into 'dev'
...
use flex for the default template
See merge request hubzilla/core!1409
2018-11-28 04:03:39 +01:00
M. Dent
a4b2eac0f0
Merge branch 'update-imagesloaded' into 'dev'
...
update imagesloaded to version 4.1.4 via composer
See merge request hubzilla/core!1407
2018-11-28 03:52:53 +01:00
harukin
e6edac1589
edit translation
2018-11-28 00:29:24 +09:00
harukin
781d0c0fe0
edit translation
2018-11-27 23:26:03 +09:00
harukin
b48cb47f41
edit translation
2018-11-27 19:38:00 +09:00
harukin
1ece7caa57
edit translation
2018-11-27 19:35:54 +09:00
harukin
0c1a3b1a61
edit translation
2018-11-27 19:10:07 +09:00
harukin
2b5d4ef346
edit translation
2018-11-27 19:07:33 +09:00
harukin
2dbd990017
edit translate
2018-11-27 18:59:50 +09:00
harukin
34961b39fe
edit translation
2018-11-27 18:53:26 +09:00
harukin
088a54dacb
edit translation
2018-11-27 18:47:25 +09:00
harukin
bc9d4a7643
edit translation
2018-11-27 18:32:55 +09:00
harukin
e0ee14d5b0
edit translation
2018-11-27 16:19:46 +09:00
harukin
e88db3d609
edit translation
2018-11-27 15:45:10 +09:00
harukin
f7d3550122
edit translation
2018-11-27 15:35:48 +09:00
harukin
896681b671
edit translation
2018-11-27 14:47:19 +09:00
harukin
fbdbd440d2
edit translation
2018-11-27 14:40:32 +09:00
harukin
c0af854cb6
fixed translation
2018-11-27 14:37:10 +09:00
harukin
92889397e6
edit translation
2018-11-27 14:29:43 +09:00
harukin
7c10b53209
えぢ らんぁちおん
2018-11-27 14:19:23 +09:00
harukin
a154fedbfb
edit translation
2018-11-27 14:13:47 +09:00
harukin
7c43f5b554
edit translation
2018-11-27 14:09:58 +09:00
harukin
d19769115c
edit translation
2018-11-27 14:03:06 +09:00
harukin
561ffce031
edit translation & add OSUSHI!.svg
2018-11-27 11:48:06 +09:00
harukin
61e2190f98
edit translation
2018-11-27 03:14:59 +09:00
harukin
c56abbf7df
fixed translation
2018-11-27 03:11:16 +09:00
harukin
1cd2f7e0f4
edit translation
2018-11-27 03:08:22 +09:00
harukin
516ad23aa5
fix translation miss
2018-11-27 03:05:27 +09:00
harukin
0599d27463
edit translation
2018-11-27 03:04:07 +09:00
harukin
f56107c84d
edit translation
2018-11-27 02:59:08 +09:00
harukin
dd61824df5
edit translation
2018-11-27 02:54:15 +09:00
harukin
531b4d955c
edit translation
2018-11-27 02:00:16 +09:00
Mario
3775be4ce9
use flex for the default template
2018-11-26 12:44:10 +01:00
harukin
87e2aa42b8
edit translation
2018-11-26 13:23:18 +09:00
harukin
d9560ad124
edit translation
2018-11-26 13:19:32 +09:00
harukin
b93397e415
edit translation
2018-11-26 13:14:51 +09:00
harukin
44d89c7209
edit translation
2018-11-26 12:49:12 +09:00
harukin
5bb9890660
edit translation
2018-11-26 12:33:13 +09:00
harukin
f22d589c49
edit translation
2018-11-26 10:55:54 +09:00
harukin
17f873db70
edit translation /settings/display fin
2018-11-26 10:43:55 +09:00
harukin
026d6d4a70
edit translation /settings/display
2018-11-26 03:44:07 +09:00
harukin
93113e0f00
edit translation /settings/channel fin
2018-11-26 03:29:31 +09:00
harukin
236692908a
edit translation /settings/channel
2018-11-26 03:22:27 +09:00
harukin
6eea7c7e50
edit translation /settings/channel
2018-11-26 00:48:51 +09:00
harukin
31516acec2
edit translation /settings/editor/ fin
2018-11-26 00:32:55 +09:00
harukin
c9728961bf
edit settings/editor/ launguage
2018-11-26 00:12:46 +09:00
harukin
7bd89a9ab1
2018-11-26 00:00:41 +09:00
Mario
c667572d3e
update imagesloaded to version 4.1.4 via composer
2018-11-25 10:09:26 +01:00
Manuel Jiménez Friaza
ca98a566ee
Update es-es
2018-11-24 13:23:20 +01:00
Mario
07fd2dbc99
Merge branch 'dev' into 'dev'
...
Update Russian translation
See merge request hubzilla/core!1400
2018-11-20 11:08:27 +01:00
Max Kostikov
4dea1b5a0d
Replace hmessages.po
2018-11-19 13:52:31 +01:00
Max Kostikov
da44ab0529
Replace hstrings.php
2018-11-19 13:51:54 +01:00
zotlabs
ab2376f8d8
fix dreport link
2018-11-14 17:42:02 -08:00
harukin
1d0ad72800
Merge branch 'develop' into 'japanese'
...
Merge Upstream to here. 3.8.4
See merge request harukin/core!14
2018-11-14 19:51:21 +09:00
harukin
23b65c8e6e
Merge Upstream to here. 3.8.4
2018-11-14 19:45:51 +09:00
M. Dent
a7d3a49171
Merge branch 'fix-activity-filter-widget' into 'dev'
...
use the correct javascript function for this case
See merge request hubzilla/core!1390
2018-11-12 21:50:08 +01:00
Mario Vavti
7bd60adfbe
fix css issues in bbcode conversion and focus-light schema
2018-11-12 09:35:12 +01:00
Mario Vavti
c335719e8f
use the correct javascript function for this case
2018-11-11 14:46:35 +01:00
harukin
04e220cc4b
Merge branch 'develop' into 'japanese'
...
ctrl+enter適用
See merge request harukin/core!13
2018-11-10 21:34:03 +09:00
Mario Vavti
fc5dc9717a
fix shared_header img expanding to 100% width when sharing a share
2018-11-10 11:31:06 +01:00
harukin
d87eece1d2
コメント欄ctl+enter対応化
2018-11-09 22:22:36 +09:00
