Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 08:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22026 commits 7 branches 30 tags 160 MiB
Commit graph

22026 commits

This branch
This branch
All branches
Author SHA1 Message Date
zotlabs
28819baa72 sort out some setup issues 2018-07-30 19:25:35 -07:00
zotlabs
a87d5aa730 Merge branch 'red' into red_merge 2018-07-30 18:22:25 -07:00
zotlabs
0cfaf34a22 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-30 18:11:49 -07:00
zotlabs
e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable 2018-07-30 17:41:37 -07:00
Mario
4e402dca7d Merge branch 'patch-13' into 'dev' 
Workaround on possible error with php2po

See merge request hubzilla/core!1247
 2018-07-30 10:01:19 +02:00
gia vec
149071bf0c Update network.php 
(cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
 2018-07-30 09:48:24 +02:00
zotlabs
66ab6831cb cleanup 2018-07-29 23:49:37 -07:00
zotlabs
b97ac5acd4 missing encryption on sync 2018-07-29 23:12:05 -07:00
zotlabs
b374a6f911 more channel sync debugging 2018-07-29 22:13:43 -07:00
zotlabs
9c479be7df communication testing 2018-07-29 20:19:02 -07:00
zotlabs
d3686ffee4 missing namespace 2018-07-29 19:19:28 -07:00
zotlabs
9744d35a5c clone issues 2018-07-29 18:58:33 -07:00
zotlabs
d67f335ce8 set directory to master if no fallbacks present 2018-07-29 18:25:11 -07:00
zotlabs
c08d9a3d45 wrong update number 2018-07-29 18:22:49 -07:00
zotlabs
32614e4074 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-29 18:00:56 -07:00
zotlabs
9dc5a3bfc9 this may conflict 2018-07-29 17:59:40 -07:00
zotlabs
ee08b67bb6 zot6 discovery sanitisation 2018-07-29 17:54:53 -07:00
zotlabs
1def8da7bc fix unsanitised xchan_name 2018-07-29 17:36:05 -07:00
zotlabs
f7e9cd5a8f SECURITY: sanitise vcard fields 2018-07-29 17:36:05 -07:00
zotlabs
5ec73e6862 Revert "Merge branch 'red'" 
This reverts commit 159f24afe3, reversing
changes made to dd899418c1.
 2018-07-29 17:17:33 -07:00
zotlabs
159f24afe3 Merge branch 'red' 2018-07-29 16:48:14 -07:00
Max Kostikov
cb4afd39bd Workaround on possible error 2018-07-29 16:26:33 +02:00
Max Kostikov
e078caffd8 Update php2po.php 2018-07-29 14:20:01 +02:00
Max Kostikov
90a9febb6c Workaround on possible error 2018-07-29 12:05:53 +02:00
Mario Vavti
e4a1286aae fix sql empty query error in db update 1216 2018-07-29 08:05:41 +02:00
Mario
08a8011456 Merge branch 'patch-12' into 'dev' 
Process msgctxt plurals

See merge request hubzilla/core!1246
 2018-07-29 07:14:09 +02:00
Mario Vavti
643b6f0aa3 version 2018-07-29 07:00:30 +02:00
Mario Vavti
45d262d6c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-29 06:59:10 +02:00
Mario Vavti
5dbd11c6ed wrong class name 2018-07-29 06:58:35 +02:00
Mario Vavti
3fcb6df0f1 Merge remote-tracking branch 'mike/master' into dev 2018-07-29 06:43:55 +02:00
zotlabs
9701516228 fix unsanitised xchan_name 2018-07-28 17:17:12 -07:00
Max Kostikov
77dfe63d90 Process msgctxt plurals 2018-07-29 02:11:27 +02:00
zotlabs
2367d94a42 SECURITY: sanitise vcard fields 2018-07-28 15:33:20 -07:00
Mario
d85c849668 Merge branch 'patch-11' into 'dev' 
Plural form strings export added

See merge request hubzilla/core!1245
 2018-07-28 21:23:31 +02:00
Mario
cbd8c07265 Merge branch 'patch-9' into 'dev' 
Respect navbar translations

See merge request hubzilla/core!1243
 2018-07-28 21:22:51 +02:00
Mario
3a6d3cb396 Merge branch 'patch-8' into 'dev' 
Fix navbar missed translations

See merge request hubzilla/core!1242
 2018-07-28 21:22:12 +02:00
Mario
6e52f552cf Merge branch 'patch-7' into 'dev' 
Russian translation update

See merge request hubzilla/core!1241
 2018-07-28 21:20:01 +02:00
Mario
973114caf6 Merge branch 'patch-6' into 'dev' 
Fix duplicate transport displaying

See merge request hubzilla/core!1240
 2018-07-28 21:19:40 +02:00
Max Kostikov
e27e0ca198 Plural form strings export added 2018-07-28 17:36:48 +02:00
Mario Vavti
27329e39e4 Merge remote-tracking branch 'mike/master' into dev 2018-07-28 09:33:17 +02:00
zotlabs
dd899418c1 app fixes 
Merge branch 'red'
 2018-07-27 15:31:19 -07:00
zotlabs
38c2070aab Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-27 15:27:52 -07:00
zotlabs
a0f28708ab don't sync system apps 2018-07-27 15:05:29 -07:00
zotlabs
e25d205a7f app delete issue with base installed apps and app photo being reloaded uneccessarily 2018-07-27 14:36:06 -07:00
zotlabs
e28dab17d6 app update and ownership issues 2018-07-27 13:59:27 -07:00
Max Kostikov
05b3237bae Update nav.php 2018-07-27 11:50:04 +02:00
Max Kostikov
4fd9d1ee5f Update Apps.php 2018-07-27 11:29:38 +02:00
Max Kostikov
0fe7004d38 Update Apps.php 2018-07-27 11:03:02 +02:00
zotlabs
07d0921aef fixes to clone import 2018-07-26 19:37:04 -07:00
zotlabs
993e39b192 rewrite the verification/discovery combined step to eliminate looping 2018-07-26 03:51:45 -07:00