Max Kostikov
|
c16fda1cb6
|
Update wiki.tpl
|
2018-08-25 21:16:05 +02:00 |
|
Mario Vavti
|
f036c25dca
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-24 14:44:45 +02:00 |
|
zotlabs
|
6ecd31a715
|
tweak archive widget for articles
|
2018-08-22 13:30:16 -07:00 |
|
Max Kostikov
|
456bc2ef86
|
Update hstrings.php
|
2018-08-22 15:13:01 +02:00 |
|
Max Kostikov
|
e071cd4635
|
Update hmessages.po
|
2018-08-22 15:12:09 +02:00 |
|
Mario Vavti
|
cc03e1ceef
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-22 10:47:40 +02:00 |
|
Mario
|
e4d08fc5d7
|
Merge branch 'redbasic-addroomforfooter' into 'dev'
Fix jumpy sidebars
See merge request hubzilla/core!1261
|
2018-08-22 10:46:02 +02:00 |
|
zotlabs
|
b25192332b
|
profile likes - liker image was a bit large and didn't make a very pleasant looking dropdown, may have been overlooked when other related things were changed to menu-img-1 class
|
2018-08-21 23:39:49 -07:00 |
|
M.Dent
|
79eb6d3942
|
Fix jumpy sidebars
|
2018-08-21 13:18:42 -04:00 |
|
Mario
|
218029ee57
|
Merge branch 'redbasic-addroomforfooter' into 'dev'
Add bottom margin on aside elements and main to allow for viewport footer.
See merge request hubzilla/core!1259
|
2018-08-21 13:17:14 +02:00 |
|
fadelkon
|
af31bbeba1
|
Update catalan translations for sstrings up to 18th July 2018
|
2018-08-20 22:50:46 +02:00 |
|
M.Dent
|
1d7d604016
|
Add bottom margin on aside elements and main to allow for viewport footer.
|
2018-08-20 00:15:34 -04:00 |
|
zotlabs
|
f230c07ba5
|
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
|
2018-08-15 17:00:37 -07:00 |
|
Mario Vavti
|
759a18685b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-12 14:07:16 +02:00 |
|
Mario
|
e07ab65d73
|
Merge branch 'oauth2-ui-pr' into 'dev'
Oauth2 ui pr
See merge request hubzilla/core!1255
|
2018-08-12 14:06:24 +02:00 |
|
zotlabs
|
5afe779ffc
|
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
|
2018-08-11 16:16:54 -07:00 |
|
M.Dent
|
af042ccf07
|
OAuth2 UI and settings updates
|
2018-08-10 13:54:26 -04:00 |
|
Manuel Jiménez Friaza
|
edf834188d
|
Update Spanish translation
|
2018-07-30 12:03:03 +02:00 |
|
Max Kostikov
|
06b0dbdfba
|
Update hstrings.php
|
2018-07-26 12:21:33 +02:00 |
|
Max Kostikov
|
48fb3d3653
|
Update hmessages.po
|
2018-07-26 12:20:53 +02:00 |
|
Max Kostikov
|
baa5fd9739
|
Update passchanged_eml.tpl
|
2018-07-26 12:19:59 +02:00 |
|
Max Kostikov
|
e01c277c56
|
Update lostpass_eml.tpl
|
2018-07-26 12:18:54 +02:00 |
|
kostikov
|
3342fc2244
|
Update hstrings.php
|
2018-07-23 12:15:10 +02:00 |
|
kostikov
|
87857fe5d9
|
Update hmessages.po
|
2018-07-23 12:14:33 +02:00 |
|
Mario
|
a68934f498
|
Merge branch 'patch-2' into 'dev'
New russian templates
See merge request hubzilla/core!1233
|
2018-07-21 11:29:09 +02:00 |
|
Mario
|
5be0743751
|
Merge branch 'dev' into 'dev'
Update russian translation for 3.6
See merge request hubzilla/core!1230
|
2018-07-21 11:26:43 +02:00 |
|
kostikov
|
8fc7f2aca1
|
Update update_fail_eml.tpl
|
2018-07-20 19:28:45 +02:00 |
|
kostikov
|
4db4ab9798
|
Create register_verify_member.tpl
|
2018-07-20 19:28:13 +02:00 |
|
kostikov
|
b6c2c8117e
|
Update register_verify_eml.tpl
|
2018-07-20 19:27:29 +02:00 |
|
kostikov
|
86a42aad16
|
Update register_open_eml.tpl
|
2018-07-20 19:26:54 +02:00 |
|
kostikov
|
8e2e09bb16
|
Update passchanged_eml.tpl
|
2018-07-20 19:26:24 +02:00 |
|
kostikov
|
3713aa210f
|
Update lostpass_eml.tpl
|
2018-07-20 19:25:46 +02:00 |
|
kostikov
|
a65c23546b
|
Add new file
|
2018-07-20 19:21:58 +02:00 |
|
Mario Vavti
|
f6de91bf0f
|
prevent double file uploads when dropping files into jot
|
2018-07-20 16:44:43 +02:00 |
|
Mario Vavti
|
c72f6e6ea8
|
fix jot drag and drop
|
2018-07-20 10:42:16 +02:00 |
|
kostikov
|
790a9155d4
|
Update hstrings.php
|
2018-07-20 10:25:03 +02:00 |
|
kostikov
|
f141b845fd
|
Update hmessages.po
|
2018-07-20 10:24:23 +02:00 |
|
kostikov
|
67cbeaa3d4
|
Update hmessages.po
(cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
|
2018-07-18 08:28:18 +02:00 |
|
kostikov
|
23f3d554b8
|
Fix wrong plural function logic
(cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
|
2018-07-18 08:27:53 +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 |
|