 Mario
|
87fc4e6588
|
Merge branch 'patch-5' into 'dev'
Update hstrings.php
See merge request hubzilla/core!1239
|
2018-07-23 19:57:10 +02:00 |
|
|
Mario
|
84e57d040b
|
Merge branch 'patch-2' into 'dev'
Escape internal quotes in translation on export
See merge request hubzilla/core!1237
|
2018-07-23 19:55:00 +02:00 |
|
 kostikov
|
a4f64c02d0
|
Update hstrings.php
|
2018-07-23 12:20:50 +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 |
|
|
kostikov
|
64efd07f6b
|
Escape internal quotes in translation on export
|
2018-07-22 19:39:53 +02:00 |
|
|
Mario Vavti
|
6be66d6df9
|
update changelog
|
2018-07-21 22:01:59 +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
|
95ef78ab23
|
Merge branch 'patch-1' into 'dev'
Add var to respect current hstrings.php format
See merge request hubzilla/core!1231
|
2018-07-21 11:27:49 +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 |
|
|
kostikov
|
062633d312
|
Add var to respect current hstrings.php format
|
2018-07-20 16:40:35 +02:00 |
|
|
Mario Vavti
|
4a54699c1f
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-20 10:42:45 +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 |
|
|
Mario
|
a274c87cb3
|
Merge branch 'dev' into 'dev'
Update php2po.php
See merge request hubzilla/core!1229
|
2018-07-20 09:21:35 +02:00 |
|
 zotlabs
|
a94c9d2709
|
checkjs fix ($page not bin-hex in all cases)
|
2018-07-19 17:19:19 -07:00 |
|
|
kostikov
|
f9b18aa62f
|
Update php2po.php
|
2018-07-20 00:22:04 +02:00 |
|
|
zotlabs
|
0866cea72c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-19 13:45:30 -07:00 |
|
|
zotlabs
|
6adbb93f0a
|
fix the filtered query string so it can potentially be re-used as is.
|
2018-07-19 13:42:57 -07:00 |
|
|
Mario Vavti
|
fe0e00f8f8
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-19 09:12:33 +02:00 |
|
|
zotlabs
|
13d19d42cb
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-18 19:14:21 -07:00 |
|
|
zotlabs
|
ec852b0c8d
|
typo
|
2018-07-18 17:51:10 -07:00 |
|
|
zotlabs
|
a05c8ff66b
|
query filter was a bit greedy
|
2018-07-18 17:48:23 -07:00 |
|
|
zotlabs
|
5ce50d0a2e
|
mangled urls on redirects
|
2018-07-18 17:05:38 -07:00 |
|
|
Mario Vavti
|
dfbdeafa39
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-18 20:59:45 +02:00 |
|
|
Mario Vavti
|
eb322e8312
|
set the correct album name when moving photos
|
2018-07-18 13:18:37 +02:00 |
|
|
Mario Vavti
|
c2e819771f
|
version 3.7
|
2018-07-18 11:56:26 +02:00 |
|
|
Mario Vavti
|
896d29d0c0
|
update composer autoload cache
|
2018-07-18 11:52:42 +02:00 |
|
|
Mario Vavti
|
4c633a9fb8
|
update strings
|
2018-07-18 11:49:32 +02:00 |
|
|
Mario Vavti
|
5fd1674d50
|
version 3.6RC
|
2018-07-18 11:39:22 +02:00 |
|
|
kostikovandMario
|
67cbeaa3d4
|
Update hmessages.po
(cherry picked from commit cbab7d2150)
|
2018-07-18 08:28:18 +02:00 |
|
|
kostikovandMario
|
23f3d554b8
|
Fix wrong plural function logic
(cherry picked from commit 4284088611)
|
2018-07-18 08:27:53 +02:00 |
|
|
zotlabs
|
744d548380
|
util/typo - perform php -l and then include the file. We'll catch a bunch more stuff.
|
2018-07-17 05:01:22 -07:00 |
|
|
zotlabs
|
82a4bbd571
|
spellcheck
|
2018-07-15 23:32:09 -07:00 |
|
|
zotlabs
|
c187461985
|
update_addon_repo: scan the addon dir after updating and remove dead symlinks (which represent deprecated/removed addons).
|
2018-07-15 21:34:06 -07:00 |
|
|
zotlabs
|
cc91db55b7
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-15 18:43:41 -07: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 |
|
|
Mario
|
e000d98cc5
|
Merge branch 'hookableCSP-mr' into 'dev'
Hookable csp mr
See merge request hubzilla/core!1225
|
2018-07-13 09:34:48 +02:00 |
|