aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* found it...zotlabs2016-10-231-2/+2
|
* this seems to work, but there are unanswered questions and is still ↵zotlabs2016-10-231-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 streamzotlabs2016-10-231-1/+2
|
* Merge branch 'dev' into pdozotlabs2016-10-236-25/+27
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-231-10/+22
| |\
| | * Merge pull request #562 from fsteinel/issue-561zotlabs2016-10-231-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 stringFlorian Steinel2016-10-221-2/+6
| | | |
| | | * add column display_path to inserts into attachment, as this column is a not ↵Florian Steinel2016-10-221-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
| * | | misplaced parenszotlabs2016-10-231-1/+1
| |/ /
| * | php warning, $uplink didn't have a defaultzotlabs2016-10-221-1/+1
| | |
| * | issue #564zotlabs2016-10-212-2/+2
| |/
| * remove more corporate code - https url conversion for youtube is now handled ↵zotlabs2016-10-201-11/+1
| | | | | | | | by std_embeds plugin
* | pdo hackszotlabs2016-10-232-4/+18
| |
* | allow a dsn override to the database via the server argument. This could be ↵zotlabs2016-10-202-15/+21
| | | | | | | | used to allow unix domain sockets and other unusual configurations.
* | pdo - cleanupzotlabs2016-10-201-7/+3
| |
* | Merge branch 'dev' into pdozotlabs2016-10-201-1/+5
|\|
| * discover tab showing on network page using fresh site with no settings (it ↵zotlabs2016-10-191-1/+5
| | | | | | | | is disabled by default, but the admin setting has not yet been committed to disk).
* | more pdo tweakszotlabs2016-10-201-3/+24
| |
* | pdo testingzotlabs2016-10-202-7/+17
| |
* | use pdo for postgres alsozotlabs2016-10-195-17/+32
| |
* | pdo fixeszotlabs2016-10-191-4/+4
| |
* | pdo changes first cutzotlabs2016-10-192-30/+27
| |
* | Merge branch 'dev' into pdozotlabs2016-10-193-4/+30
|\|
| * when translating like activities, we're distinguishing comments from posts ↵zotlabs2016-10-181-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.zotlabs2016-10-171-2/+28
| |
| * issue #553 - negative birthday from directory. This may not completely fix ↵zotlabs2016-10-171-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.
* | some pdo workzotlabs2016-10-171-6/+12
|/
* rename diaspora2bb() to markdown_to_bb() to reflect that is has a more ↵zotlabs2016-10-162-2/+2
| | | | generic use
* remove corporate codes from diaspora2bb, add plugin hook markdown_to_bbzotlabs2016-10-141-5/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-1315-928/+1038
|\
| * Merge pull request #547 from dawnbreak/docuzotlabs2016-10-1415-928/+1038
| |\ | | | | | | [TASK] Update Doxyfile and fix Doxygen errors.
| | * [TASK] Update Doxyfile and fix Doxygen errors.Klaus Weidenbach2016-10-1315-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 ↵zotlabs2016-10-131-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.zotlabs2016-10-131-2/+2
|/
* additional array checkingzotlabs2016-10-134-7/+26
|
* consolidate duplicated code for creating table entries from an arrayzotlabs2016-10-123-132/+43
|
* remove special handling of lookalike '@ char from attach pathzotlabs2016-10-121-2/+2
|
* Merge pull request #545 from dawnbreak/atfixzotlabs2016-10-131-3/+3
|\ | | | | Comment and code about UTF-8 @-sign do not match.
| * Comment and code about UTF-8 @-sign do not match.Klaus Weidenbach2016-10-111-3/+3
| | | | | | | | | | | | Changed code according to comment: First AT is now full-width AT U+FF20. Do we also need to replace small AT U+FE6B?
* | caught one typo from the last checkinzotlabs2016-10-121-1/+1
| |
* | remove the rest of the backticks from sql queries; replace with TQUOT const ↵zotlabs2016-10-126-116/+125
| | | | | | | | which is driver dependent
* | add the twitter API 1.1 code pointszotlabs2016-10-121-4/+44
| |
* | some more api workzotlabs2016-10-121-2/+2
| |
* | bbcode: remove the inserted <br /> between list elements due to linefeeds in ↵zotlabs2016-10-121-0/+4
| | | | | | | | the textarea.
* | more api work, mostly bringing the file up to speed with the project coding ↵zotlabs2016-10-111-175/+135
| | | | | | | | style guidelines
* | more api workzotlabs2016-10-111-109/+11
| |
* | When importing a channel from another server, try to auto-discover the best ↵zotlabs2016-10-111-0/+19
| | | | | | | | available api path.
* | more api cleanupzotlabs2016-10-111-200/+183
| |
* | start on the API re-writezotlabs2016-10-113-386/+388
|/
* make diaspora w2w appear as a quote to make a little bit more clear what is ↵Mario Vavti2016-10-111-2/+5
| | | | happening