Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-10-30 | 1 | -3/+3 |
|\ | |||||
| * | change log string on pdo log messages | zotlabs | 2016-10-27 | 1 | -3/+3 |
| | | |||||
* | | possible fix for https://zothub.de/display/2d4996dd629504851d | Mario Vavti | 2016-10-30 | 1 | -2/+2 |
|/ | |||||
* | sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and ↵ | Florian Steinel | 2016-10-27 | 5 | -12/+12 |
| | | | | | | postgresql (see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 ) | ||||
* | For z_dns_check() use config values from memory and ignore DB - as this ↵ | zotlabs | 2016-10-25 | 1 | -1/+6 |
| | | | | function can be called in the early stages of Setup when we first try to connect to the database. | ||||
* | make the edited header stand out slightly | zotlabs | 2016-10-25 | 1 | -1/+1 |
| | |||||
* | send "hidden" edit activities to networks which don't support edits themselves | zotlabs | 2016-10-25 | 2 | -3/+36 |
| | |||||
* | put all dns checking into one function, allow it to be ignored | zotlabs | 2016-10-25 | 4 | -9/+23 |
| | |||||
* | first cut at edit activities | zotlabs | 2016-10-25 | 3 | -5/+64 |
| | |||||
* | pdo - fetch assoc only | zotlabs | 2016-10-25 | 1 | -1/+1 |
| | |||||
* | set port if non-zero (instead of non-null) | zotlabs | 2016-10-24 | 2 | -2/+2 |
| | |||||
* | Merge pull request #559 from zotlabs/pdo | zotlabs | 2016-10-25 | 5 | -54/+123 |
|\ | | | | | Pdo DB driver | ||||
| * | found it... | zotlabs | 2016-10-23 | 1 | -2/+2 |
| | | |||||
| * | this seems to work, but there are unanswered questions and is still ↵ | zotlabs | 2016-10-23 | 1 | -5/+8 |
| | | | | | | | | undergoing investigation. It appears that the data stored with os_content = 1 is not being escaped in all circumstances or the scaled image data is being escaped twice. | ||||
| * | fetch bytea as stream | zotlabs | 2016-10-23 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'dev' into pdo | zotlabs | 2016-10-23 | 6 | -25/+27 |
| |\ | |||||
| * | | pdo hacks | zotlabs | 2016-10-23 | 2 | -4/+18 |
| | | | |||||
| * | | allow a dsn override to the database via the server argument. This could be ↵ | zotlabs | 2016-10-20 | 2 | -15/+21 |
| | | | | | | | | | | | | used to allow unix domain sockets and other unusual configurations. | ||||
| * | | pdo - cleanup | zotlabs | 2016-10-20 | 1 | -7/+3 |
| | | | |||||
| * | | Merge branch 'dev' into pdo | zotlabs | 2016-10-20 | 1 | -1/+5 |
| |\ \ | |||||
| * | | | more pdo tweaks | zotlabs | 2016-10-20 | 1 | -3/+24 |
| | | | | |||||
| * | | | pdo testing | zotlabs | 2016-10-20 | 2 | -7/+17 |
| | | | | |||||
| * | | | use pdo for postgres also | zotlabs | 2016-10-19 | 5 | -17/+32 |
| | | | | |||||
| * | | | pdo fixes | zotlabs | 2016-10-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | pdo changes first cut | zotlabs | 2016-10-19 | 2 | -30/+27 |
| | | | | |||||
| * | | | Merge branch 'dev' into pdo | zotlabs | 2016-10-19 | 3 | -4/+30 |
| |\ \ \ | |||||
| * | | | | some pdo work | zotlabs | 2016-10-17 | 1 | -6/+12 |
| | | | | | |||||
* | | | | | not null violation in mail | zotlabs | 2016-10-24 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | some more places which require dbescbin and dbunescbin | zotlabs | 2016-10-24 | 1 | -8/+9 |
| | | | | | |||||
* | | | | | profile photo issue on postgres | zotlabs | 2016-10-23 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | correct encoding | zotlabs | 2016-10-23 | 2 | -3/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-23 | 1 | -10/+22 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #562 from fsteinel/issue-561 | zotlabs | 2016-10-23 | 1 | -10/+22 |
| |\ \ \ \ | | | | | | | | | | | | | add column display_path to inserts into attachment, as this column is… | ||||
| | * | | | | attach_mkdir use $os_path and $display_path initilized to an empty string | Florian Steinel | 2016-10-22 | 1 | -2/+6 |
| | | | | | | |||||
| | * | | | | add column display_path to inserts into attachment, as this column is a not ↵ | Florian Steinel | 2016-10-22 | 1 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path | ||||
* | | | | | | misplaced parens | zotlabs | 2016-10-23 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | php warning, $uplink didn't have a default | zotlabs | 2016-10-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | issue #564 | zotlabs | 2016-10-21 | 2 | -2/+2 |
|/ / / / | |||||
* | | / | remove more corporate code - https url conversion for youtube is now handled ↵ | zotlabs | 2016-10-20 | 1 | -11/+1 |
| |_|/ |/| | | | | | | | | by std_embeds plugin | ||||
* | | | discover tab showing on network page using fresh site with no settings (it ↵ | zotlabs | 2016-10-19 | 1 | -1/+5 |
| |/ |/| | | | | | is disabled by default, but the admin setting has not yet been committed to disk). | ||||
* | | when translating like activities, we're distinguishing comments from posts ↵ | zotlabs | 2016-10-18 | 1 | -1/+1 |
| | | | | | | | | by mid and parent_mid; neither if which are present in the stored activity object | ||||
* | | issue #549, ACL has 'public' selected even when restrictive ACL is being used. | zotlabs | 2016-10-17 | 1 | -2/+28 |
| | | |||||
* | | issue #553 - negative birthday from directory. This may not completely fix ↵ | zotlabs | 2016-10-17 | 1 | -1/+1 |
|/ | | | | it and may take a profile update to register the change; but it's a start; specifically we need to store 0000-00-00 in the xprof table of the directory server if that's what we get over the wire. Birthday fields are string and are not subject to SQL strict_mode on dates. We want these to be the string '0000-00-00' if not set to a valid date. | ||||
* | rename diaspora2bb() to markdown_to_bb() to reflect that is has a more ↵ | zotlabs | 2016-10-16 | 2 | -2/+2 |
| | | | | generic use | ||||
* | remove corporate codes from diaspora2bb, add plugin hook markdown_to_bb | zotlabs | 2016-10-14 | 1 | -5/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-13 | 15 | -928/+1038 |
|\ | |||||
| * | Merge pull request #547 from dawnbreak/docu | zotlabs | 2016-10-14 | 15 | -928/+1038 |
| |\ | | | | | | | [TASK] Update Doxyfile and fix Doxygen errors. | ||||
| | * | [TASK] Update Doxyfile and fix Doxygen errors. | Klaus Weidenbach | 2016-10-13 | 15 | -928/+1038 |
| | | | | | | | | | | | | | | | | | | Updated Doxyfile to include new folders. Add a list for @hooks tags. Fixed some parsing problems for Doxygen. | ||||
* | | | try to filter any path information from leaking through to zot_finger; and ↵ | zotlabs | 2016-10-13 | 1 | -0/+4 |
|/ / | | | | | | | log the url wherever called to track down where it might be called with a malformed webbie or complete path instead of hostname. | ||||
* / | provide text log results of email success/failure rather than 1 and 0. | zotlabs | 2016-10-13 | 1 | -2/+2 |
|/ |