Commit graph

7213 commits

Author SHA1 Message Date
zotlabs
0f8d2d4e58 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-02-11 19:36:37 -08:00
zotlabs
a31331bfd9 hubzilla issue #972 - provide system toggle to allow/disallow anonymous comments 2018-02-11 18:02:28 -08:00
zotlabs
0dbb024c99 purify summary 2018-02-11 14:12:24 -08:00
git-marijus
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
Mario Vavti
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
phellmes
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
Mario Vavti
2227de5f65 Merge remote-tracking branch 'mike/master' into dev 2018-02-09 06:58:12 +01:00
zotlabs
3dfafb710c cosmetic 2018-02-08 21:32:18 -08:00
zotlabs
9f5d44fa32 turn the logs down again 2018-02-08 16:30:44 -08:00
zotlabs
cd1e5d4171 zot6 testing 2018-02-08 16:22:10 -08:00
zotlabs
635c5e532b z6 testing 2018-02-08 15:32:54 -08:00
Mario Vavti
9e64ce7da7 Merge remote-tracking branch 'mike/master' into dev 2018-02-08 10:12:04 +01:00
zotlabs
6cf2e9945a encrypt the httpsig for zot6 transport 2018-02-07 21:53:47 -08:00
zotlabs
b21a5c3ce9 compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present 2018-02-07 20:17:32 -08:00
zotlabs
5057a4bd4c zot6 delivery work 2018-02-07 19:15:56 -08:00
zotlabs
3a0db39fa0 more zot6 delivery work 2018-02-07 18:38:10 -08:00
zotlabs
1d8d2c6e55 Merge branch 'master' into z6 2018-02-07 17:54:21 -08:00
zotlabs
dc88ccdc0b remove dead code 2018-02-07 17:53:54 -08:00
Mario Vavti
b512780e37 do not spam the log 2018-02-07 10:27:00 +01:00
Mario Vavti
91dda86a74 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-02-07 09:03:49 +01:00
zotlabs
4171854e2f slight improvement in ostatus protocol detection from xml feed 2018-02-06 17:00:56 -08:00
git-marijus
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
zotlabs
cb042e32bc code cleanup 2018-02-05 20:57:07 -08:00
zotlabs
5e94187d03 remove dead code 2018-02-05 20:31:24 -08:00
zotlabs
b41c5f3497 Merge branch 'master' into z6 2018-02-05 15:58:28 -08:00
zotlabs
930e1fdbdc feedutils: separate the parsing of author information from the parsing of item/activity information 2018-02-05 15:14:57 -08:00
zotlabs
f15fd93f90 implode can take its arguments in either order, but let's try to be consistent 2018-02-04 17:01:59 -08:00
zotlabs
3e7dffb676 decomplicate cont. 2018-02-03 12:50:07 -08:00
zotlabs
512f3a7643 provide summaries in feeds under very limited cases, but never in compat (GNU-Social) mode 2018-02-01 21:26:34 -08:00
zotlabs
dd35cad62a some feed cleanup 2018-02-01 19:52:40 -08:00
zotlabs
cc0cd0b292 more generalisation of commonly used code constructs 2018-02-01 17:17:23 -08:00
zotlabs
c92bb6176a more separation of complex code into separate functions 2018-02-01 15:09:51 -08:00
zotlabs
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
zotlabs
c1e44c0f54 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-28 21:43:50 -08:00
zotlabs
56d1614ea6 provide a default video image if nothing else is available. Allow sites to change it. 2018-01-28 20:35:05 -08:00
Klaus Weidenbach
4bf0c9e36a Add tests for non existent tables.
Prevent PHP warnings "Undefined variable" in dba_pdo::q();
2018-01-28 23:02:46 +01:00
Klaus Weidenbach
509844fd7e 🔥 Cleanup old database related files.
Remove non used database drivers, remove unused methods.
Improve documentation.
2018-01-28 23:02:15 +01:00
Mario Vavti
a86b260f73 query optimisations for notifications - use a specific index only 2018-01-28 12:09:47 +01:00
zotlabs
4eead1c688 typo from previous checkin and partial fix to hubzilla #965 - show any connection without comment permission as archived in contact_block(). 2018-01-26 13:42:53 -08:00
zotlabs
660079bd2a Issue with configurable site age limit, vagueness when informing about email validation policy; added email validation resend ability and the option to input a verification code at a webpage though both require additional work to provide these abilities. 2018-01-26 12:16:47 -08:00
zotlabs
e3c7200b6f don't do any bbcode translation within code blocks (except baseurl, observer, and linefeeds) 2018-01-25 16:18:16 -08:00
zotlabs
f7309b926b improve browser language detection by offering fallback of (for instance) fr-fr to fr if no other language matches could be found 2018-01-24 21:56:25 -08:00
zotlabs
217c324a98 remove unused prototype importer template and obsolete reflection cms importer 2018-01-24 21:35:41 -08:00
zotlabs
4cfd7b65fb siteinfo embellishments 2018-01-22 20:07:08 -08:00
zotlabs
629c915f36 ensure filter words are not empty 2018-01-21 23:30:08 -08:00
zotlabs
764d6e3407 zot api: provide channel list function (list all channel usernames [e.g. channel_address] associated with the logged in account) 2018-01-18 17:20:30 -08:00
zotlabs
6943960f99 Merge branch 'dev' of https://github.com/dawnbreak/hubzilla 2018-01-18 16:08:27 -08:00
Klaus Weidenbach
8a60bb4619 Change dsn port handling in dba_pdo. 2018-01-18 23:46:49 +01:00
zotlabs
03d3cbdbf8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-01-18 14:17:48 -08:00
zotlabs
0fba1bb868 simplify interactions with the get_features hook by calling it before any filtering takes place 2018-01-18 14:11:15 -08:00