kostikov
|
21ecf54b73
|
Update lostpass_eml.tpl
(cherry picked from commit 3713aa210f)
|
2018-07-21 11:34:42 +02:00 |
|
kostikov
|
429e3ce30a
|
Add new file
(cherry picked from commit a65c23546b)
|
2018-07-21 11:34:14 +02:00 |
|
kostikov
|
26e20d35c2
|
Update hstrings.php
(cherry picked from commit 790a9155d4)
|
2018-07-21 11:32:57 +02:00 |
|
kostikov
|
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 |
|
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
|
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
|
4a6f775334
|
set the correct album name when moving photos
(cherry picked from commit eb322e8312)
|
2018-07-18 13:20:20 +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 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 |
|
M. Dent
|
38cc88c861
|
Hookable csp mr
|
2018-07-13 09:34:48 +02:00 |
|
Mario Vavti
|
48e74035f2
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-07-12 09:16:52 +02:00 |
|
zotlabs
|
38bccecc04
|
fix to cart behaviour
|
2018-07-11 18:00:47 -07:00 |
|
Andrew Manning
|
3ebe35f7f7
|
Merge branch 'patch-1' into 'dev'
Update hstrings.php - spelling - Privatsphäre
See merge request hubzilla/core!1223
|
2018-07-10 01:36:14 +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 |
|
Mario Vavti
|
d903772831
|
this is messing with names containing a comma and is superfluous now
|
2018-07-06 08:44:25 +02:00 |
|
zotlabs
|
cc71e507cb
|
don't provide manage apps button when viewing all available
|
2018-07-05 22:03:41 -07:00 |
|
zotlabs
|
fe44ebee93
|
change to import system apps at most once a day per person
|
2018-07-05 21:55:03 -07:00 |
|
zotlabs
|
c80e009cf3
|
app store fixes
|
2018-07-05 21:46:34 -07:00 |
|
zotlabs
|
f6e8ce5516
|
appstore changes
|
2018-07-04 23:20:35 -07:00 |
|
zotlabs
|
51a2e64a89
|
issue syncing pageflags
|
2018-07-04 19:51:16 -07:00 |
|
zotlabs
|
bf24a106ce
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-04 19:07:52 -07:00 |
|
zotlabs
|
1387b88ba4
|
remove manage group link from activity_filter, already in personal menu
|
2018-07-04 19:04:12 -07:00 |
|
Mario Vavti
|
d9ece80fda
|
order nouveau by created instead of received since ordering by received returns unexpected results once old expired items get re-imported
|
2018-07-04 10:55:38 +02:00 |
|
Mario Vavti
|
b88a9c2627
|
Revert "add the missing link to manage privacy groups"
This reverts commit c28e27357a.
|
2018-07-04 10:53:07 +02:00 |
|
zotlabs
|
18dbc490fe
|
remove broken include path hack
|
2018-07-03 18:26:34 -07:00 |
|
zotlabs
|
d753492382
|
bad merge
|
2018-07-01 22:48:05 -07:00 |
|
zotlabs
|
8c26db63dd
|
some changes to support plume
|
2018-07-01 19:12:45 -07:00 |
|
zotlabs
|
5d7d30f789
|
propagate expired posts to other networks
|
2018-06-30 23:57:25 -07:00 |
|
zotlabs
|
63a3f5149a
|
be very precise about what a url looks like
|
2018-06-30 15:47:06 -07:00 |
|
zotlabs
|
c28e27357a
|
add the missing link to manage privacy groups
|
2018-06-28 23:17:50 -07:00 |
|
zotlabs
|
fa6e5e4d75
|
plugins -> addons
|
2018-06-28 16:43:22 -07:00 |
|
zotlabs
|
cae0a26ac0
|
String change to reflect the current forum tagging method
|
2018-06-28 13:38:15 -07:00 |
|
zotlabs
|
156010050c
|
imagick converter: -thumbnail doesn't preserve exif, -resize does
|
2018-06-26 17:19:32 -07:00 |
|
zotlabs
|
524551a05c
|
do not include system channels in directory results
|
2018-06-25 23:20:02 -07:00 |
|
zotlabs
|
b89387d608
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-06-25 20:58:23 -07:00 |
|