dbeee4707b
don't try to handle OAEP for plugin crypto methods; let them do it if desired
2018-02-20 11:56:51 -08:00
ae8623e3af
encrypt/decrypt function not found
2018-02-20 11:51:59 -08:00
76b5c68646
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-19 16:19:14 -08:00
b6b4827680
OAEP padding mismatch on some newer encryption methods
2018-02-19 15:44:18 -08:00
a310cb2fbb
more logging
2018-02-19 14:37:49 -08:00
67069beddc
add logging
2018-02-19 14:27:27 -08:00
43992dc463
do not show summary if it is equal to body and some styling for the summary/article toggle links
2018-02-19 14:11:58 +01:00
fac5d81790
Merge pull request #981 from anaqreon/dev
...
Update code tag styling so bbcode [code] blocks and wiki markdown ...
2018-02-19 11:11:31 +01:00
c444e40c01
Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely.
2018-02-18 10:09:05 -05:00
46cb45d94b
crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding)
2018-02-16 18:45:15 -08:00
45b42cbc1c
Merge remote-tracking branch 'mike/master' into dev
2018-02-15 09:00:52 +01:00
c11ebd12d5
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-14 15:37:35 -08:00
465d89129c
provide option to block the public stream unless authenticated, since there could be legal issues with unmoderated content
2018-02-14 15:32:33 -08:00
d826515ba8
since we only save the parent mid in notify we must look for thr_parent when dealing with likes
2018-02-13 11:01:58 +01:00
b221c68e4b
fix parent id for likes in status notifications.
2018-02-13 10:29:32 +01:00
0f8d2d4e58
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-02-11 19:36:37 -08:00
a31331bfd9
hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments
2018-02-11 18:02:28 -08:00
0dbb024c99
purify summary
2018-02-11 14:12:24 -08:00
ba954b8cfe
Merge pull request #976 from phellmes/time-ago-strings
...
more flexibility for relative date/time translations
2018-02-11 22:50:39 +01:00
3fa809ae79
this might seem rediculous but it helps mysql to find the better index for this query
2018-02-11 20:53:27 +01:00
c6b2652c01
add flexibility to prefix/suffix string translations for jquery.timeago
...
In addition to use the defaults or any other translated strings this allows
now to force an empty string by setting the translation to NONE.
Translators can choose to either use prefixes only, suffixes only,
none of them or both of them - whatever sounds best in their language.
2018-02-11 16:08:34 +01:00
2227de5f65
Merge remote-tracking branch 'mike/master' into dev
2018-02-09 06:58:12 +01:00
3dfafb710c
cosmetic
2018-02-08 21:32:18 -08:00
9f5d44fa32
turn the logs down again
2018-02-08 16:30:44 -08:00
cd1e5d4171
zot6 testing
2018-02-08 16:22:10 -08:00
635c5e532b
z6 testing
2018-02-08 15:32:54 -08:00
9e64ce7da7
Merge remote-tracking branch 'mike/master' into dev
2018-02-08 10:12:04 +01:00
6cf2e9945a
encrypt the httpsig for zot6 transport
2018-02-07 21:53:47 -08:00
b21a5c3ce9
compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present
2018-02-07 20:17:32 -08:00
5057a4bd4c
zot6 delivery work
2018-02-07 19:15:56 -08:00
3a0db39fa0
more zot6 delivery work
2018-02-07 18:38:10 -08:00
1d8d2c6e55
Merge branch 'master' into z6
2018-02-07 17:54:21 -08:00
dc88ccdc0b
remove dead code
2018-02-07 17:53:54 -08:00
b512780e37
do not spam the log
2018-02-07 10:27:00 +01:00
91dda86a74
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
2018-02-07 09:03:49 +01:00
4171854e2f
slight improvement in ostatus protocol detection from xml feed
2018-02-06 17:00:56 -08:00
24a650d7ec
Merge pull request #971 from dawnbreak/QA_testing
...
UnitTests for database classes and bit cleanup and docu
2018-02-06 12:48:34 +01:00
cb042e32bc
code cleanup
2018-02-05 20:57:07 -08:00
5e94187d03
remove dead code
2018-02-05 20:31:24 -08:00
b41c5f3497
Merge branch 'master' into z6
2018-02-05 15:58:28 -08:00
930e1fdbdc
feedutils: separate the parsing of author information from the parsing of item/activity information
2018-02-05 15:14:57 -08:00
f15fd93f90
implode can take its arguments in either order, but let's try to be consistent
2018-02-04 17:01:59 -08:00
3e7dffb676
decomplicate cont.
2018-02-03 12:50:07 -08:00
512f3a7643
provide summaries in feeds under very limited cases, but never in compat (GNU-Social) mode
2018-02-01 21:26:34 -08:00
dd35cad62a
some feed cleanup
2018-02-01 19:52:40 -08:00
cc0cd0b292
more generalisation of commonly used code constructs
2018-02-01 17:17:23 -08:00
c92bb6176a
more separation of complex code into separate functions
2018-02-01 15:09:51 -08:00
8d479aa1c7
redirect to the email_validation page if login was attempted after account creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it.
2018-01-29 16:58:55 -08:00
c1e44c0f54
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
2018-01-28 21:43:50 -08:00
56d1614ea6
provide a default video image if nothing else is available. Allow sites to change it.
2018-01-28 20:35:05 -08:00
zotlabs
Mario Vavti
Andrew Manning
phellmes