Mario Vavti
1b1d11dcf1
Merge branch '3.6RC'
2018-07-25 10:19:19 +02:00
Mario
091ef33f18
Merge branch 'patch-2' into 'dev'
...
Escape internal quotes in translation on export
See merge request hubzilla/core!1237
(cherry picked from commit 84e57d040b64efd07f87857fe53342fc22
2018-07-23 19:55:25 +02:00
kostikov and Mario
ddd77ee6ee
Update update_fail_eml.tpl
...
(cherry picked from commit 8fc7f2aca1
2018-07-21 11:37:27 +02:00
kostikov and Mario
b625b5f645
Update register_verify_eml.tpl
...
(cherry picked from commit b6c2c8117e
2018-07-21 11:36:58 +02:00
kostikov and Mario
c9e272a78d
Update register_open_eml.tpl
...
(cherry picked from commit 86a42aad16
2018-07-21 11:35:30 +02:00
kostikov and Mario
9bfb63fd98
Update passchanged_eml.tpl
...
(cherry picked from commit 8e2e09bb16
2018-07-21 11:35:07 +02:00
kostikov and Mario
21ecf54b73
Update lostpass_eml.tpl
...
(cherry picked from commit 3713aa210f
2018-07-21 11:34:42 +02:00
kostikov and Mario
429e3ce30a
Add new file
...
(cherry picked from commit a65c23546b
2018-07-21 11:34:14 +02:00
kostikov and Mario
26e20d35c2
Update hstrings.php
...
(cherry picked from commit 790a9155d4
2018-07-21 11:32:57 +02:00
kostikov and Mario
f40406514c
Update hmessages.po
...
(cherry picked from commit f141b845fd
2018-07-21 11:32:33 +02:00
Mario Vavti
ed79bef51b
prevent double file uploads when dropping files into jot
...
(cherry picked from commit f6de91bf0f
2018-07-20 16:45:50 +02:00
Mario Vavti
0cde7f9897
fix jot drag and drop
...
(cherry picked from commit c72f6e6ea8
2018-07-20 10:43:38 +02:00
kostikov and Mario
67cbeaa3d4
Update hmessages.po
...
(cherry picked from commit cbab7d2150
2018-07-18 08:28:18 +02:00
kostikov and Mario
23f3d554b8
Fix wrong plural function logic
...
(cherry picked from commit 4284088611
2018-07-18 08:27:53 +02:00
kostikov
cbab7d2150
Update hmessages.po
2018-07-18 00:28:04 +02:00
kostikov
4284088611
Fix wrong plural function logic
2018-07-17 21:27:08 +02:00
Mario Vavti
bb70223509
when calling timeago() from mod_mail.js it is called before the translations are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time)
2018-07-13 11:00:37 +02:00
Mario Vavti
98fb2ec639
let timeago render the date
2018-07-13 10:16:07 +02:00
Mario Vavti
a8cef79b1a
let timeago render the date
2018-07-13 10:13:11 +02:00
Mario Vavti
5076e38c1c
update jquery.timeago lib
2018-07-13 10:12:11 +02:00
Heiko Förster
b81f1111d1
Update hstrings.php - spelling - Privatsphäre
2018-07-08 16:48:37 +02:00
Mario Vavti
ac8db6479e
fix css regression
2018-07-07 08:14:11 +02:00
zotlabs
cc71e507cb
don't provide manage apps button when viewing all available
2018-07-05 22:03:41 -07:00
zotlabs
f6e8ce5516
appstore changes
2018-07-04 23:20:35 -07:00
zotlabs
fa6e5e4d75
plugins -> addons
2018-06-28 16:43:22 -07:00
Mario Vavti
cef1c09db6
Merge remote-tracking branch 'mike/master' into dev
2018-06-25 23:49:11 +02:00
Mario Vavti
62610b5ec0
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-06-25 14:29:32 +02:00
Mario Vavti
2594178158
updates justified gallery lib to version 3.7 and minor fixes for full template
2018-06-25 14:29:07 +02:00
zotlabs
4866ed5283
remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead
2018-06-24 21:56:58 -07:00
Mike Macgirvin
e4f15c078a
Merge branch 'patch-1' into 'dev'
...
NL strings: fix simple error
See merge request hubzilla/core!1221
2018-06-20 07:49:43 +02:00
zotlabs
48a25b1b85
channel sources: add 'resend' option to discard original author - similar to the Friendica remote_self setting
2018-06-18 20:44:59 -07:00
jeroenpraat
eabbad176d
fix simple error
2018-06-18 23:20:35 +02:00
jeroenpraat
e6d7f22ba9
fix simple error
2018-06-18 23:17:29 +02:00
zotlabs
7850ecbd95
remove several unused/unreferenced templates
2018-06-17 20:53:05 -07:00
Mario
28043726e6
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
2018-06-17 17:00:17 +02:00
Mario
9c5df51141
some work on mod group
2018-06-17 16:58:12 +02:00
zotlabs
3fc955abfd
hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes
2018-06-15 15:34:27 -07:00
zotlabs
2f3c3db020
hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider saved default changes
2018-06-15 02:02:03 -07:00
zotlabs
967d4da30a
wiki: word-wrap code on any character
2018-06-14 22:46:20 -07:00
zotlabs
8da0f9d356
optionally report total available space when uploading
2018-06-13 21:06:56 -07:00
zotlabs
b5e4a5f51c
SECURITY: provide option to disable the cloud 'root' directory and make the cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional.
2018-06-13 20:27:10 -07:00
gia vec
9840d1ce73
Update hstrings.php
2018-06-12 20:47:19 +02:00
gia vec
6a45bd4372
Update hmessages.po
2018-06-12 20:42:16 +02:00
zotlabs
a8f179145b
Merge branch 'master' of ../hz into dev
2018-06-10 22:16:39 -07:00
zotlabs
912ccb31a1
hubzilla core issue #1218
2018-06-10 19:26:35 -07:00
Mario Vavti
9e29c13678
fix issue #1219
2018-06-09 16:38:15 +02:00
Mario Vavti
e37ccb7a63
move cid filter js to the widget
2018-06-09 13:08:14 +02:00
Mario Vavti
468af29e3e
new feature filter network by name
2018-06-08 23:03:05 +02:00
Mario Vavti
dfa48ba17c
fixes for search_item.tpl
2018-06-07 23:24:36 +02:00
Mario Vavti
dd4b8529c2
Merge remote-tracking branch 'mike/master' into dev
2018-06-06 20:13:03 +02:00
Mario Vavti
kostikovandMario
Heiko Förster
zotlabs
jeroenpraat
gia vec