Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
|/ | ||||||
* | additional array checking | zotlabs | 2016-10-13 | 4 | -7/+26 | |
| | ||||||
* | consolidate duplicated code for creating table entries from an array | zotlabs | 2016-10-12 | 3 | -132/+43 | |
| | ||||||
* | remove special handling of lookalike '@ char from attach path | zotlabs | 2016-10-12 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #545 from dawnbreak/atfix | zotlabs | 2016-10-13 | 1 | -3/+3 | |
|\ | | | | | Comment and code about UTF-8 @-sign do not match. | |||||
| * | Comment and code about UTF-8 @-sign do not match. | Klaus Weidenbach | 2016-10-11 | 1 | -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 checkin | zotlabs | 2016-10-12 | 1 | -1/+1 | |
| | | ||||||
* | | remove the rest of the backticks from sql queries; replace with TQUOT const ↵ | zotlabs | 2016-10-12 | 6 | -116/+125 | |
| | | | | | | | | which is driver dependent | |||||
* | | add the twitter API 1.1 code points | zotlabs | 2016-10-12 | 1 | -4/+44 | |
| | | ||||||
* | | some more api work | zotlabs | 2016-10-12 | 1 | -2/+2 | |
| | | ||||||
* | | bbcode: remove the inserted <br /> between list elements due to linefeeds in ↵ | zotlabs | 2016-10-12 | 1 | -0/+4 | |
| | | | | | | | | the textarea. | |||||
* | | more api work, mostly bringing the file up to speed with the project coding ↵ | zotlabs | 2016-10-11 | 1 | -175/+135 | |
| | | | | | | | | style guidelines | |||||
* | | more api work | zotlabs | 2016-10-11 | 1 | -109/+11 | |
| | | ||||||
* | | When importing a channel from another server, try to auto-discover the best ↵ | zotlabs | 2016-10-11 | 1 | -0/+19 | |
| | | | | | | | | available api path. | |||||
* | | more api cleanup | zotlabs | 2016-10-11 | 1 | -200/+183 | |
| | | ||||||
* | | start on the API re-write | zotlabs | 2016-10-11 | 3 | -386/+388 | |
|/ | ||||||
* | make diaspora w2w appear as a quote to make a little bit more clear what is ↵ | Mario Vavti | 2016-10-11 | 1 | -2/+5 | |
| | | | | happening | |||||
* | api issues | zotlabs | 2016-10-10 | 1 | -4/+13 | |
| | ||||||
* | spaghetti | zotlabs | 2016-10-10 | 1 | -3/+6 | |
| |