Mario Vavti
e4ca3609d9
Merge branch '4.2RC'
2019-06-04 10:19:04 +02:00
Mario Vavti
bc092d8d78
version 4.2
2019-06-04 10:16:06 +02:00
Mario Vavti
dd5933b048
Merge branch 'dev' into 4.2RC
2019-06-04 10:13:59 +02:00
Mario Vavti
24cb04c346
do not change default timezone in parse_ical_file()
...
(cherry picked from commit f1b54cf0a4
2019-06-03 22:43:20 +02:00
Mario Vavti
e64a7b87a8
fix timezone issue when importing adjusted events
...
(cherry picked from commit 2b452ea3e8
2019-06-03 21:04:51 +02:00
Mario
5b4aa1afc2
regard timezones in calendar import/export
2019-06-03 13:25:48 +02:00
Mario Vavti
89205276ab
update changelog
...
(cherry picked from commit 6d2ab6a7d6
2019-06-03 11:49:04 +02:00
Mario Vavti
e6da910ee2
Merge branch 'dev' into 4.2RC
2019-06-03 11:44:31 +02:00
Mario Vavti
b6bd2884d5
Merge branch 'dev' into 4.2RC
2019-05-29 09:08:40 +02:00
Mario Vavti
097b2390db
update changelog
...
(cherry picked from commit ca8d252ad7
2019-05-28 12:31:48 +02:00
Mario Vavti
23a0dbe3cc
4.2RC2
2019-05-27 08:19:23 +02:00
Mario Vavti
545ece82b3
Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RC
2019-05-27 08:09:36 +02:00
Mario Vavti
eaea947b74
Merge branch 'dev' into 4.2RC
2019-05-27 08:07:26 +02:00
Mario Vavti
385be35ed5
fix #1374
...
(cherry picked from commit 528b9b6a60
2019-05-24 12:27:14 +02:00
Mario Vavti
dd374eaebf
get channel from photo uid
...
(cherry picked from commit 9ea483d1dc
2019-05-24 09:59:17 +02:00
Mario Vavti
8715f74d29
Merge branch 'dev' into 4.2RC
2019-05-23 08:44:44 +02:00
Mario Vavti
152224944b
add new directory fallback server
2019-05-23 08:43:48 +02:00
Mario Vavti
f86d12c8f4
Merge branch 'dev' into 4.2RC
2019-05-23 08:37:52 +02:00
Mario
e130b58b20
Merge branch 'es-es' into '4.2RC'
...
Update es-es
See merge request hubzilla/core!1652
2019-05-20 13:06:55 +02:00
Xanthor
a921deafd1
Fix a really disturbing comment
...
(cherry picked from commit 823c0434ebaf2b263bc7
2019-05-17 12:28:41 +02:00
Mario Vavti
071fba2f71
wiki: urlencode the entire share link
...
(cherry picked from commit aa120e0478
2019-05-17 12:28:13 +02:00
Mario Vavti
9de729e3e7
wiki: urlencode the entire share link
...
(cherry picked from commit aa120e0478
2019-05-17 12:27:54 +02:00
Mario Vavti
7cf5bd30f2
use escape_tags() wiki headers
...
(cherry picked from commit e7f1f496c5
2019-05-17 12:27:18 +02:00
Mario Vavti
e6cee2965a
use escape_tags() wiki headers
...
(cherry picked from commit e7f1f496c5
2019-05-17 12:26:03 +02:00
Mario
b07c55a0d9
Merge branch 'patch-1' into 'master'
...
Fix a really disturbing comment
See merge request hubzilla/core!1650
2019-05-17 12:01:21 +02:00
Xanthor
823c0434eb
Fix a really disturbing comment
2019-05-17 05:23:12 +02:00
Mario Vavti
22162635e7
calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries
...
(cherry picked from commit 8be0031602
2019-05-15 18:25:59 +02:00
Mario Vavti
29c5e74d31
missing backslash
...
(cherry picked from commit 3c8867a1e8
2019-05-15 11:40:36 +02:00
Mario Vavti
c439fe0437
add autocomplete js to calendar and fix issue with extended likes mid
...
(cherry picked from commit 15a000bb45
2019-05-14 09:14:04 +02:00
Max Kostikov
b21db670b4
Fix comments scroll button CSS
...
(cherry picked from commit d0322f5fbd
2019-05-14 09:13:40 +02:00
Mario Vavti
1f84aa9809
css fixes
...
(cherry picked from commit c1f01b7e35
2019-05-14 09:13:19 +02:00
Mario Vavti
4ac249c26c
deal with privacy mentions in event descriptions
...
(cherry picked from commit 71064f481b
2019-05-14 09:13:02 +02:00
zotlabs
85a29fce94
bbcode map bypass wasn't catching all map forms.
...
(cherry picked from commit 436293713b
2019-05-14 09:12:35 +02:00
Mario Vavti
fc726bfb4b
fix button size
2019-05-13 13:11:14 +02:00
Mario
f6a4084f81
bump version
2019-04-26 11:30:23 +02:00
Mario Vavti
d5f89c165a
update changelog
...
(cherry picked from commit a518471a27
2019-04-26 11:29:01 +02:00
zotlabs
dce5080e53
permissions cleanup
...
(cherry picked from commit 2d886b65ce
2019-04-26 10:52:35 +02:00
zotlabs
2221d4d612
add attachments to zot6 event objects, add zot6 to federated transports (webfinger)
...
(cherry picked from commit 0615709a7a
2019-04-26 10:43:56 +02:00
Zot
5f73a46c05
import/export zot6 hublocs+xchans
...
(cherry picked from commit e2dfa1d72f
2019-04-26 10:42:09 +02:00
Zot
b782c6bd16
update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master)
...
(cherry picked from commit f8c583636c
2019-04-26 10:41:52 +02:00
Zot
ab8d8aa552
hubloc confusion in magic auth
...
(cherry picked from commit 3c8f8b76aa
2019-04-26 10:41:35 +02:00
Daniel Lowe
f955276694
Fix infinite loop using postgres as backend
...
unescapebin is handed a string in some cases, and it causes an infinite
loop when it does. This ensures that the argument is a resource before
loading its contents.
(cherry picked from commit 9a6531e2a2
2019-04-26 10:41:04 +02:00
zotlabs
77cc60faf2
required php version not available but allowed to continue
...
(cherry picked from commit 6feddcbced
2019-04-26 10:40:02 +02:00
Mario Vavti
dcd8a05809
version bump
2019-04-08 11:12:02 +02:00
Mario Vavti
62e466f774
Merge branch 'dev'
2019-04-08 11:10:10 +02:00
Mario Vavti
70777a047d
Merge branch 'master' of https://framagit.org/hubzilla/core
2019-04-08 11:09:55 +02:00
zotlabs
a93bd8d944
security: perms_pending not evaluated correctly
...
(cherry picked from commit 5a46f1229d
2019-04-06 10:30:32 +02:00
Mario Vavti
28c3259449
Revert "item_store(): deduplicate by mid OR uuid"
...
This reverts commit 0d0ede7b14
2019-03-24 15:49:03 +01:00
Mario Vavti
0d0ede7b14
item_store(): deduplicate by mid OR uuid
2019-03-24 15:47:57 +01:00
Mario Vavti
33ac85f637
bump version
2019-03-21 11:16:35 +01:00
Mario Vavti
efd9421dc9
Merge branch 'dev'
2019-03-21 11:13:54 +01:00
Mario Vavti
578230e32c
fix typos
...
(cherry picked from commit d486b03089
2019-03-18 21:59:09 +01:00
Mario Vavti
8559334339
some more xss prevention
...
(cherry picked from commit 968c6ed8be
2019-03-18 21:37:02 +01:00
Mario Vavti
8893d9edc4
use urlencode
...
(cherry picked from commit 2ec3e4a912
2019-03-18 13:31:25 +01:00
Mario Vavti
43753ec113
ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS
...
(cherry picked from commit a086745ec0
2019-03-18 13:31:03 +01:00
Mario Vavti
f1fee1239b
Merge branch 'dev'
2019-03-14 09:40:26 +01:00
Mario Vavti
9772726065
merge text.php and hmessages.po
2019-03-08 12:32:20 +01:00
Mario Vavti
8ecdde6cb5
Merge branch '4.0RC'
2019-03-08 11:52:57 +01:00
Mario Vavti
5b3824917d
update changelog
2019-03-08 11:48:01 +01:00
Mario Vavti
ca4f10dc5e
bump version
2019-03-08 11:46:36 +01:00
Mario
853fb33913
$sender is supposed to be string in libzot
...
(cherry picked from commit 507c71f64c
2019-03-08 09:45:15 +01:00
zotlabs
e352cfc861
fetch private objects using delivery channel credentials
...
(cherry picked from commit 1f7622e4c4
2019-03-08 09:35:04 +01:00
Mario Vavti
b019ca0746
update changelog
...
(cherry picked from commit 04fe7e61de
2019-03-07 09:32:39 +01:00
zotlabs
beb4e00afb
guest access tokens: xchan record not created on URL login
...
(cherry picked from commit 0b2213dd41
2019-03-07 09:30:38 +01:00
Mario Vavti
9450305568
changelog
...
(cherry picked from commit 08725c44c6
2019-03-06 21:10:51 +01:00
Mario Vavti
e18c64c9d9
bump version
2019-03-06 10:02:33 +01:00
Mario Vavti
7b018c60cb
while in legacy zot $sender is expected to be an array, in zot6 $sender is expected to be a string (xchan_hash)
...
(cherry picked from commit 117a8cafca
2019-03-06 09:58:11 +01:00
M. Dent
a81286c795
Add CURLOPT_CONNECTTIMEOUT
...
(cherry picked from commit 0c05e6593e
2019-03-06 09:56:01 +01:00
zotlabs
571e9bf26a
channel_type is not integer
...
(cherry picked from commit 26e7da0b96
2019-03-06 09:49:40 +01:00
zotlabs
c4714e95b6
maintain compatibility with recent zot6 changes
...
(cherry picked from commit 98b1c7a38c
2019-03-06 09:49:18 +01:00
zotlabs
d407e5556e
api_router - allow parameters as final path argument
...
(cherry picked from commit 47001c3303
2019-03-05 09:44:36 +01:00
zotlabs
6a3cfe54af
remove clones from delivery recipients for top-level posts - they will get the post via clone sync
...
(cherry picked from commit 8e50fecccc
2019-03-05 09:43:51 +01:00
zotlabs
a0bffe4a78
mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash and is throwing php warnings when trying to decode
...
(cherry picked from commit 938fcdd1a6
2019-03-05 09:43:29 +01:00
zotlabs
336c716a44
translate name of content filter (addon) app.
...
(cherry picked from commit 29cb62af3d
2019-03-05 09:42:58 +01:00
mike
8810658858
Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de'
...
(cherry picked from commit e26de9c1d1
2019-03-04 09:50:47 +01:00
mike
337dfd5ee4
Mention php-zip module dependency in administrator guide
...
(cherry picked from commit 747ce9b1f1
2019-03-02 15:37:47 +01:00
DM42.Net (Matt Dent)
e37c9ed0a1
Use sender hash
...
(cherry picked from commit 5febc3e07d
2019-03-02 15:37:22 +01:00
Mario Vavti
aa6a31eba5
iron out some kinks with scrollToItem() in combination with collapsed content and images
...
(cherry picked from commit 2244bf2ba2
2019-03-02 15:32:36 +01:00
Mario Vavti
6aa041b193
version
2019-02-26 09:30:54 +01:00
Mario Vavti
0fdc0a01d0
Merge branch 'dev' into 4.0RC
2019-02-26 09:29:00 +01:00
Mario Vavti
08cacc4943
Merge branch 'dev' into 4.0RC
2019-02-26 09:06:46 +01:00
Klaus Weidenbach
87482e3746
Update PHP Version check during Setup.
...
Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1.
So check during Setup for PHP >= 7.1.
(cherry picked from commit 3f13c85b64
2019-02-22 12:52:25 +01:00
Manuel Jiménez Friaza
8bb2d29a8d
Update Spanish translation
...
(cherry picked from commit e6f289deb6a3a90ea09b
2019-02-21 12:43:03 +01:00
Mario Vavti
93039081d5
fix summary and use item_normal_search() for viewsrc so we can also view the source for articles, cards, etc.
...
(cherry picked from commit a0ad110cff
2019-02-21 12:10:31 +01:00
Max Kostikov
89ee28f858
Update Russian hstrings.php
...
(cherry picked from commit 3a6ea57d2c
2019-02-20 09:20:31 +01:00
Max Kostikov
5917786296
Update Russian hmessages.po
...
(cherry picked from commit e960bcfd1c
2019-02-20 09:20:09 +01:00
Mario
90fd323ac5
bump version
2019-02-03 15:03:56 +01:00
Mario Vavti
b6c384a0f7
cleanup logging and return if query returns empty result
...
(cherry picked from commit c657d766cf
2019-02-03 15:02:06 +01:00
Mario Vavti
cda8a7be38
do not overwrite $sql_extra
...
(cherry picked from commit 4706ff6938
2019-02-03 15:01:39 +01:00
Mario Vavti
ddbc35181c
fix page jumping when liking a collapsed/expanded post
...
(cherry picked from commit 54806f6ee8
2019-01-24 13:39:49 +01:00
zotlabs
57dde3e980
failure to import mail
...
(cherry picked from commit 7b30fc4b82
2019-01-11 12:20:50 +01:00
Mario Vavti
3eba0c2297
do not count removed channels
...
(cherry picked from commit 01f4ce96f1
2019-01-10 13:36:31 +01:00
Mario
414b7e28d3
bump version
2018-12-22 21:02:49 +01:00
Mario Vavti
fca464071f
update changelog
...
(cherry picked from commit cdb85f1309
2018-12-22 21:01:50 +01:00
Mario Vavti
4f08f4b84c
use count() instead of sizeof()
...
(cherry picked from commit 774dd6d5e3
2018-12-22 20:20:58 +01:00
Mario Vavti
1b5175d018
check if we deal with an array before sizeof()
...
(cherry picked from commit 339c9cceec
2018-12-22 20:20:13 +01:00
Mario Vavti
0bfda6d4c8
revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text.
...
(cherry picked from commit fac3579fb0
2018-12-22 20:18:12 +01:00
Mario
880b22604b
manualy Fix cURL with HTTP/2 due to merge conflicts
2018-12-22 20:17:20 +01:00
Mario
04a2dc075f
manualy remove scale_external_images() due to merge conflicts
2018-12-22 20:08:44 +01:00
Max Kostikov
01448c152c
Remove scale_external_images()
...
(cherry picked from commit 1541f67eab
2018-12-22 20:04:09 +01:00
Max Kostikov
a09beb3833
Remove scale_external_images()
...
(cherry picked from commit a2959c6e9e
2018-12-22 20:03:49 +01:00
phani00
feda1e6d84
remove color from style.css (default) but add a little padding; add color & border radius to dark.css.
...
(cherry picked from commit 2354bb5427
2018-12-22 19:54:48 +01:00
phani00
4256bea418
change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css.
...
(cherry picked from commit b97143e9db
2018-12-22 19:54:31 +01:00
phani00
4d47b098e5
remove some fancy formatting.
...
(cherry picked from commit aaab905e72
2018-12-22 19:54:11 +01:00
Mario Vavti
163754a46c
make mod channel deal with b64 encoded mid\s
...
;
(cherry picked from commit bc6d384ca9
2018-12-22 19:53:37 +01:00
phani00
66b56416b6
new fix for dark theme
...
change implementation of hl-tags in include/bbcode.php
insert class='default-highlight' instead of background-color: 'yellow' into span
add span.default-highlight definition to view/theme/redbasic/css/style.css
this works for all schemas incl. dark.
(cherry picked from commit aace8a14ce
2018-12-22 19:52:39 +01:00
phani00
c855346358
remove my dark theme fixes.
...
(cherry picked from commit 70a7661711
2018-12-22 19:52:09 +01:00
Pascal Deklerck
0e32c86c3d
Update OAuth2Storage.php - fix email retrieval in getUser
...
(cherry picked from commit 6a825cc504
2018-12-22 19:51:16 +01:00
M. Dent
19952264c8
Add reload to util/addons
...
(cherry picked from commit 0e5d76e735
2018-12-22 19:43:16 +01:00
Mario Vavti
5ec1e97cae
do not add timestamp to the photo src. caching is handled in mod photo now.
...
(cherry picked from commit e34853e19e
2018-12-21 21:45:33 +01:00
zotlabs
5f5746a2f6
like permission issue
...
(cherry picked from commit 389b4beba4
2018-12-21 21:44:33 +01:00
Mario Vavti
d0ee6d1ad2
missing observer check
...
(cherry picked from commit ec769bc9f9
2018-12-20 19:45:59 +01:00
zotlabs
06c71eec65
default curl to http/1.1
...
(cherry picked from commit 04a45a407e
2018-12-17 12:17:44 +01:00
DM42.Net (Matt Dent)
aabc6c2825
Add return if no local_channel()
...
(cherry picked from commit 5bcc379530
2018-12-17 10:46:43 +01:00
DM42.Net (Matt Dent)
8323458da9
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.
...
(cherry picked from commit 3f06a857c2
2018-12-17 10:46:24 +01:00
Mario Vavti
d7c7ff1c12
fix wiki preview issue with hyperlinks
...
(cherry picked from commit 919ea9f750
2018-12-15 18:20:21 +01:00
Mario Vavti
d77c7d51e3
update changelog
...
(cherry picked from commit 4ff3c57976
2018-12-14 21:47:20 +01:00
Mario Vavti
d51d0160d3
fix issue with linkdropper
...
(cherry picked from commit f81a3ba45d
2018-12-14 21:32:23 +01:00
zotlabs
c2ad9d4996
regression: the ability to order apps messed up since adding pinned apps to the ordering
...
(cherry picked from commit 6464099364
2018-12-14 21:31:02 +01:00
Mario
79f828125d
version bump
2018-12-14 11:47:02 +01:00
Mario Vavti
ad4b18cbbe
return on readImageBlob() exception
...
(cherry picked from commit 993db01400
2018-12-14 11:31:11 +01:00
Mario Vavti
1bd49671b7
add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error
...
(cherry picked from commit 7894fed741
2018-12-14 11:30:57 +01:00
zotlabs
9896057549
home notifications won't expand if there are more than 300 unseen network notifications ahead of them.
...
(cherry picked from commit 30efeb5bec
2018-12-14 11:30:25 +01:00
phani00
44832bbacb
change redbasic dark schema to make categories and highlights readable
...
additions to /view/theme/redbasic/schema/dark.css to change the appearance of category
badges and highlighted text ([hl]...[/hl]).
hl text changed from master: it's not 'strong' anymore. commented out the pseudo-class
selector that works in master but not in dev anymore.
(cherry picked from commit 18caf0273f
2018-12-14 11:30:05 +01:00
zotlabs
f20a923dd7
total_identities restriction off by one
...
(cherry picked from commit e60fb17524
2018-12-14 11:29:33 +01:00
zotlabs
30403da326
reset page title if article has no title.
...
(cherry picked from commit 8ab1f31058
2018-12-14 11:29:06 +01:00
Mario Vavti
6b68a76bbe
quickfix for es-es language
2018-12-03 21:22:02 +01:00
Mario Vavti
8f10b58cb1
version 3.8.6
2018-12-03 12:23:55 +01:00
Mario Vavti
f8bc408abc
update strings
2018-12-03 12:07:56 +01:00
Mario Vavti
f581f6163a
optimize autoload cache
2018-12-03 11:52:38 +01:00
Mario Vavti
88486a1278
changelog
2018-12-03 11:47:28 +01:00
Mario Vavti
9fcadc2d7c
prevent incompatible export files (osada/zap) from being imported (manual patch from dev)
2018-12-03 11:08:39 +01:00
Mario Vavti
9ef6c57ca5
more notifications fixes
2018-12-03 10:46:49 +01:00
Mario Vavti
443d7684db
catch exception if readImageBlob() receives bogus data
2018-12-03 10:45:43 +01:00
Mario Vavti
a3ba7f0788
fallback to url if we have not got an addr
2018-12-02 11:38:13 +01:00
Mario Vavti
f083c0cba1
fix filtering by addr in handleNotificationsItems()
2018-12-02 10:58:54 +01:00
Mario Vavti
defa2d9df1
make pdf preview 100% width and 300px height to match it openstreetmaps preview
...
(cherry picked from commit df84352385
2018-12-02 10:18:37 +01:00
Mario Vavti
05c422ef23
redbasic sticky aside fixes
...
(cherry picked from commit 8d4f6a7865
2018-12-02 10:18:20 +01:00
zotlabs
51d274961b
typo
...
(cherry picked from commit 6f22e47feb
2018-12-02 10:18:05 +01:00
zotlabs
4b4cc04897
allow notification filtering by name or addr
...
(cherry picked from commit c6acb6191c
2018-12-02 10:17:45 +01:00
zotlabs
4bf3d4d87a
attached photo permissions regression
...
(cherry picked from commit 6cade7d935
2018-12-02 10:17:29 +01:00
Manuel Jiménez Friaza
71cc980e96
Revision 1 doc/es-es/about/about.bb
...
(cherry picked from commit 5ac08ec3aa37d563c30e
2018-12-02 10:16:50 +01:00
Mario
58c0b81908
use flex for the default template
...
(cherry picked from commit 3775be4ce9
2018-12-02 10:16:24 +01:00
M. Dent
3b42bd43ab
Do not store serialized pconfig value received via to Module/Pconfig.php
...
(cherry picked from commit 6b02c664fb
2018-12-02 10:15:55 +01:00
Mario
a151532ffa
update jquery-file-upload and psr-log via composer
...
(cherry picked from commit c7ae3fdc9a
2018-12-02 10:14:58 +01:00
Mario
a0d1ce77dc
update imagesloaded to version 4.1.4 via composer
...
(cherry picked from commit c667572d3e
2018-12-02 10:14:37 +01:00
Manuel Jiménez Friaza
863cae1bab
Update es-es
...
(cherry picked from commit ca98a566ee
2018-12-02 10:13:43 +01:00
zotlabs
4010ea814a
fix mastodon tag notifications (again)
...
(cherry picked from commit 8e71324514
2018-12-02 10:13:12 +01:00
zotlabs
8e25c091f4
no mention notifications from mastodon (and pleroma)
...
(cherry picked from commit ea235c0c67
2018-12-02 10:12:44 +01:00
