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
|
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
|
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
|
0cde7f9897
|
fix jot drag and drop
(cherry picked from commit c72f6e6ea8)
|
2018-07-20 10:43:38 +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
|
85e21ce617
|
checkjs fix ($page not bin-hex in all cases)
(cherry picked from commit a94c9d2709)
|
2018-07-20 09:16:35 +02:00 |
|
zotlabs
|
157a9e895c
|
fix the filtered query string so it can potentially be re-used as is.
(cherry picked from commit 6adbb93f0a)
|
2018-07-20 09:16:09 +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
|
7e2635adfe
|
RC1
|
2018-07-19 12:27:43 +02:00 |
|
Mario
|
b655d04b34
|
version 3.4.2
|
2018-07-19 11:57:35 +02:00 |
|
Mario
|
7f84933cab
|
compatibility fix for future versions
|
2018-07-19 11:52:12 +02:00 |
|
zotlabs
|
36220fdde8
|
typo
(cherry picked from commit ec852b0c8d)
|
2018-07-19 09:21:35 +02:00 |
|
zotlabs
|
67848c03ed
|
query filter was a bit greedy
(cherry picked from commit a05c8ff66b)
|
2018-07-19 09:21:14 +02:00 |
|
Mario
|
685d05f98b
|
Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'
mangled urls on redirects
See merge request hubzilla/core!1228
|
2018-07-19 09:20:45 +02:00 |
|
zotlabs
|
931afe98b1
|
mangled urls on redirects
(cherry picked from commit 5ce50d0a2e)
|
2018-07-19 09:19:33 +02: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
|
4a6f775334
|
set the correct album name when moving photos
(cherry picked from commit eb322e8312)
|
2018-07-18 13:20:20 +02:00 |
|
Mario Vavti
|
5fa3e10701
|
set the correct album name when moving photos
(cherry picked from commit eb322e8312)
|
2018-07-18 13:19:35 +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 |
|
kostikov
|
67cbeaa3d4
|
Update hmessages.po
(cherry picked from commit cbab7d2150)
|
2018-07-18 08:28:18 +02:00 |
|
kostikov
|
23f3d554b8
|
Fix wrong plural function logic
(cherry picked from commit 4284088611)
|
2018-07-18 08:27:53 +02:00 |
|
Mario
|
95355ddec0
|
Merge branch 'patch-1' into 'master'
Fix wrong plural function logic
See merge request hubzilla/core!1226
|
2018-07-18 08:27:21 +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 |
|
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 |
|