Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-09 | 2 | -10/+184 |
|\ | |||||
| * | cosmetic | zotlabs | 2018-02-08 | 1 | -2/+1 |
| | | |||||
| * | turn the logs down again | zotlabs | 2018-02-08 | 1 | -2/+1 |
| | | |||||
| * | zot6 testing | zotlabs | 2018-02-08 | 1 | -4/+8 |
| | | |||||
| * | z6 testing | zotlabs | 2018-02-08 | 2 | -4/+2 |
| | | |||||
| * | encrypt the httpsig for zot6 transport | zotlabs | 2018-02-07 | 2 | -4/+24 |
| | | |||||
| * | compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is ↵ | zotlabs | 2018-02-07 | 1 | -1/+1 |
| | | | | | | | | present | ||||
| * | zot6 delivery work | zotlabs | 2018-02-07 | 1 | -3/+3 |
| | | |||||
| * | more zot6 delivery work | zotlabs | 2018-02-07 | 2 | -11/+89 |
| | | |||||
| * | Merge branch 'master' into z6 | zotlabs | 2018-02-07 | 4 | -228/+25 |
| |\ | |||||
| * \ | Merge branch 'master' into z6 | zotlabs | 2018-02-05 | 20 | -591/+452 |
| |\ \ | |||||
| * | | | initial z6 delivery | zotlabs | 2018-01-16 | 2 | -33/+29 |
| | | | | |||||
| * | | | z6 deliver | zotlabs | 2018-01-16 | 2 | -9/+89 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-02-08 | 1 | -44/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | remove dead code | zotlabs | 2018-02-07 | 1 | -44/+0 |
| | | | | |||||
* | | | | do not spam the log | Mario Vavti | 2018-02-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-02-07 | 5 | -333/+62 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge pull request #971 from dawnbreak/QA_testing | git-marijus | 2018-02-06 | 5 | -333/+62 |
| |\ \ \ | | | | | | | | | | | UnitTests for database classes and bit cleanup and docu | ||||
| | * | | | :white_check_mark: Add tests for non existent tables. | Klaus Weidenbach | 2018-01-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Prevent PHP warnings "Undefined variable" in dba_pdo::q(); | ||||
| | * | | | :fire: Cleanup old database related files. | Klaus Weidenbach | 2018-01-28 | 5 | -332/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove non used database drivers, remove unused methods. Improve documentation. | ||||
* | | | | | slight improvement in ostatus protocol detection from xml feed | zotlabs | 2018-02-06 | 1 | -7/+8 |
|/ / / / | |||||
* | | | | code cleanup | zotlabs | 2018-02-05 | 1 | -81/+16 |
| | | | | |||||
* | | | | remove dead code | zotlabs | 2018-02-05 | 1 | -96/+1 |
| |_|/ |/| | | |||||
* | | | feedutils: separate the parsing of author information from the parsing of ↵ | zotlabs | 2018-02-05 | 1 | -94/+126 |
| | | | | | | | | | | | | item/activity information | ||||
* | | | implode can take its arguments in either order, but let's try to be consistent | zotlabs | 2018-02-04 | 1 | -26/+29 |
| | | | |||||
* | | | decomplicate cont. | zotlabs | 2018-02-03 | 1 | -0/+60 |
| | | | |||||
* | | | provide summaries in feeds under very limited cases, but never in compat ↵ | zotlabs | 2018-02-01 | 1 | -3/+19 |
| | | | | | | | | | | | | (GNU-Social) mode | ||||
* | | | some feed cleanup | zotlabs | 2018-02-01 | 1 | -26/+9 |
| | | | |||||
* | | | more generalisation of commonly used code constructs | zotlabs | 2018-02-01 | 2 | -15/+29 |
| | | | |||||
* | | | more separation of complex code into separate functions | zotlabs | 2018-02-01 | 1 | -0/+32 |
| | | | |||||
* | | | redirect to the email_validation page if login was attempted after account ↵ | zotlabs | 2018-01-29 | 2 | -1/+2 |
| | | | | | | | | | | | | creation but prior to successful verification. This presents the link to resend the verification email and/or allows you to enter it. | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-28 | 2 | -0/+13 |
|\| | | |||||
| * | | query optimisations for notifications - use a specific index only | Mario Vavti | 2018-01-28 | 2 | -0/+13 |
| | | | |||||
* | | | provide a default video image if nothing else is available. Allow sites to ↵ | zotlabs | 2018-01-28 | 1 | -1/+5 |
|/ / | | | | | | | change it. | ||||
* | | typo from previous checkin and partial fix to hubzilla #965 - show any ↵ | zotlabs | 2018-01-26 | 2 | -2/+9 |
| | | | | | | | | connection without comment permission as archived in contact_block(). | ||||
* | | Issue with configurable site age limit, vagueness when informing about email ↵ | zotlabs | 2018-01-26 | 1 | -11/+33 |
| | | | | | | | | 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. | ||||
* | | don't do any bbcode translation within code blocks (except baseurl, ↵ | zotlabs | 2018-01-25 | 1 | -14/+28 |
| | | | | | | | | observer, and linefeeds) | ||||
* | | improve browser language detection by offering fallback of (for instance) ↵ | zotlabs | 2018-01-24 | 1 | -1/+34 |
| | | | | | | | | fr-fr to fr if no other language matches could be found | ||||
* | | remove unused prototype importer template and obsolete reflection cms importer | zotlabs | 2018-01-24 | 2 | -365/+0 |
| | | |||||
* | | siteinfo embellishments | zotlabs | 2018-01-22 | 1 | -1/+3 |
| | | |||||
* | | ensure filter words are not empty | zotlabs | 2018-01-21 | 1 | -4/+7 |
| | | |||||
* | | zot api: provide channel list function (list all channel usernames [e.g. ↵ | zotlabs | 2018-01-18 | 1 | -0/+24 |
| | | | | | | | | channel_address] associated with the logged in account) | ||||
* | | Merge branch 'dev' of https://github.com/dawnbreak/hubzilla | zotlabs | 2018-01-18 | 1 | -2/+2 |
|\ \ | |||||
| * | | Change dsn port handling in dba_pdo. | Klaus Weidenbach | 2018-01-18 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-01-18 | 1 | -32/+0 |
|\| | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-01-18 | 3 | -23/+16 |
| |\ \ | |||||
| * | | | consolidate navbar tucson and some javascript cleanup | Mario Vavti | 2018-01-18 | 1 | -32/+0 |
| | |/ | |/| | |||||
* | | | simplify interactions with the get_features hook by calling it before any ↵ | zotlabs | 2018-01-18 | 1 | -12/+14 |
| |/ |/| | | | | | filtering takes place | ||||
* | | simplify dir_tagadelic dramatically | zotlabs | 2018-01-17 | 1 | -18/+4 |
| | | |||||
* | | remove sendzid core code from core (put in plugin where it belongs) | zotlabs | 2018-01-17 | 2 | -5/+12 |
|/ |