Mario
32de123db0
fix sql error
2018-10-17 11:05:28 +02:00
Mario
4295fbf6c6
Merge branch 'dev' into 'dev'
...
Update catalan translations for sstrings up to 18th July 2018
See merge request hubzilla/core!1260
(cherry picked from commit 0985adb770af31bbeb
2018-08-21 13:14:25 +02:00
Mario
85aa495741
Merge branch 'patch-17' into 'master'
...
Add missed app 'Order Apps'
See merge request hubzilla/core!1258
2018-08-21 13:12:41 +02:00
Max Kostikov
6086a70e06
Add missed app 'Order Apps'
2018-08-17 17:48:55 +02:00
Mario
99066ae939
Merge branch 'patch-16' into 'dev'
...
Add translation for missed string
See merge request hubzilla/core!1253
(cherry picked from commit 5ff0f09a45d3362dfa
2018-08-12 13:59:49 +02:00
Mario Vavti
7c842f3170
search form action for channel search needs the channel address
...
(cherry picked from commit 054c5da294
2018-08-09 15:50:49 +02:00
Mario
4e6539efec
Merge branch 'fixactivityorderwithfilters' into 'master'
...
Add GET for filtered forums
See merge request hubzilla/core!1251
2018-08-02 20:16:25 +02:00
DM42.Net (Matt Dent)
ee1fde4262
Add GET for filtered forums
2018-08-01 21:14:48 -04:00
Mario
1358303e42
Merge branch 'dev' into 'dev'
...
Update Spanish translation
See merge request hubzilla/core!1249
(cherry picked from commit c17f0fb44fedf83418
2018-07-31 14:42:18 +02:00
Mario
7f6bf7170a
Merge branch 'patch-9' into 'dev'
...
Respect navbar translations
See merge request hubzilla/core!1243
(cherry picked from commit cbd8c0726505b3237b
2018-07-30 10:00:24 +02:00
Mario
0ed9d3c62c
Merge branch 'patch-8' into 'dev'
...
Fix navbar missed translations
See merge request hubzilla/core!1242
(cherry picked from commit 3a6d3cb3960fe7004d4fd9d1ee
2018-07-30 10:00:01 +02:00
Mario
720e691f33
Merge branch 'patch-1' into 'master'
...
Update network.php
See merge request hubzilla/core!1248
2018-07-30 09:47:41 +02:00
gia vec
8db006d9a1
Update network.php
2018-07-29 19:19:37 +02:00
Mario Vavti
d00761628f
fix sql empty query error in db update 1216
...
(cherry picked from commit e4a1286aae
2018-07-29 08:06:29 +02:00
Mario Vavti
6c10af29ee
verrsion bump
2018-07-29 07:09:46 +02:00
Mario Vavti
ae62d6fb86
wrong class name
...
(cherry picked from commit 5dbd11c6ed
2018-07-29 07:05:29 +02:00
zotlabs
d2e0ecd6a3
fix unsanitised xchan_name
...
(cherry picked from commit 9701516228
2018-07-29 07:05:07 +02:00
zotlabs
13386ddbd7
SECURITY: sanitise vcard fields
...
(cherry picked from commit 2367d94a42
2018-07-29 07:04:38 +02:00
zotlabs
17291e04df
app update and ownership issues
...
(cherry picked from commit e28dab17d6
2018-07-28 21:18:28 +02:00
Mario Vavti
7062a7ce66
fix sql error
...
(cherry picked from commit ec3a066e4e
2018-07-26 09:34:48 +02:00
Mario Vavti
52ad5b7df5
version 3.6
2018-07-25 10:28:52 +02:00
Mario Vavti
1b1d11dcf1
Merge branch '3.6RC'
2018-07-25 10:19:19 +02:00
Mario Vavti
35200e5f1b
Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC
2018-07-25 10:15:23 +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
Mario Vavti
aa01c2f4db
update changelog
...
(cherry picked from commit 6be66d6df9
2018-07-21 22:08:12 +02:00
kostikov
740015339d
Add var to respect current hstrings.php format
...
(cherry picked from commit 062633d312
2018-07-21 11:39:20 +02:00
kostikov
b7778ca1f9
Update php2po.php
...
(cherry picked from commit f9b18aa62f
2018-07-21 11:38:35 +02:00
kostikov
ddd77ee6ee
Update update_fail_eml.tpl
...
(cherry picked from commit 8fc7f2aca1
2018-07-21 11:37:27 +02:00
kostikov
b625b5f645
Update register_verify_eml.tpl
...
(cherry picked from commit b6c2c8117e
2018-07-21 11:36:58 +02:00
kostikov
c9e272a78d
Update register_open_eml.tpl
...
(cherry picked from commit 86a42aad16
2018-07-21 11:35:30 +02:00
kostikov
9bfb63fd98
Update passchanged_eml.tpl
...
(cherry picked from commit 8e2e09bb16
2018-07-21 11:35:07 +02:00
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
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
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
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
