aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* put all dns checking into one function, allow it to be ignoredzotlabs2016-10-255-11/+24
|
* first cut at edit activitieszotlabs2016-10-254-5/+66
|
* pdo - fetch assoc onlyzotlabs2016-10-251-1/+1
|
* set port if non-zero (instead of non-null)zotlabs2016-10-242-2/+2
|
* Merge pull request #559 from zotlabs/pdozotlabs2016-10-255-54/+123
|\ | | | | Pdo DB driver
| * 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-2319-3082/+3114
| |\
| * | 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-204-36/+146
| |\ \
| * | | 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-1983-5111/+10022
| |\ \ \
| * | | | some pdo workzotlabs2016-10-171-6/+12
| | | | |
* | | | | not null violation in mailzotlabs2016-10-241-3/+4
| | | | |
* | | | | some more places which require dbescbin and dbunescbinzotlabs2016-10-241-8/+9
| | | | |
* | | | | profile photo issue on postgreszotlabs2016-10-232-2/+3
| | | | |
* | | | | correct encodingzotlabs2016-10-232-3/+3
| |_|_|/ |/| | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-235-12/+61
|\ \ \ \
| * \ \ \ Merge pull request #565 from anaqreon/wiki-downloadzotlabs2016-10-233-0/+35
| |\ \ \ \ | | | | | | | | | | | | Add wiki download button to export the selected wiki repo to a zip file
| | * | | | Add wiki download button to export the selected wiki repo to a zip fileAndrew Manning2016-10-223-0/+35
| | | | | |
| * | | | | Merge pull request #562 from fsteinel/issue-561zotlabs2016-10-232-12/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | add column display_path to inserts into attachment, as this column is…
| | * | | | | until we've settled on what they should be, set os_path and display_path to ↵Florian Steinel2016-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | an emtpy string
| | * | | | | 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-222-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
* | | | | | | need to perform dbunescbin on stored filenames as well as binary data - this ↵zotlabs2016-10-233-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | is a no-op under mysql but could provide unpredictable data under postgres
* | | | | | | misplaced parenszotlabs2016-10-231-1/+1
|/ / / / / /
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-223-17/+3
|\ \ \ \ \ \
| * | | | | | provide lockstate for events and remove obsolete codeMario Vavti2016-10-223-17/+3
| | |/ / / / | |/| | | |
* / | | | | php warning, $uplink didn't have a defaultzotlabs2016-10-221-1/+1
|/ / / / /
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-211-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #563 from ilu33/devzotlabs2016-10-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Postgres complaining again ...
| | * | | | | Postgres complaining again ...ilu332016-10-221-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```sql UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = 13 LIMIT 1) WHERE abook_profile = '' AND abook_channel = 13 ; returned false ERROR: syntax error at or near "profile" LINE 1: ... SET abook_profile = (SELECT profile_guid AS FROM profile WH... ^ ```
* | / / / / issue #564zotlabs2016-10-212-2/+2
|/ / / / /
* / / / / squash timezone adjusted birthdays into a single day in the calendar, by ↵zotlabs2016-10-211-0/+6
|/ / / / | | | | | | | | | | | | lying and telling the js calendar that the end date/time is unknown
* | | | better fix for navbar channel autocomplete, refrain from search until a ↵zotlabs2016-10-211-1/+1
| | | | | | | | | | | | | | | | minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results.
* | | | full revert, that wasn't working at all. Not sure why.zotlabs2016-10-211-3/+1
| | | |
* | | | partial revertzotlabs2016-10-211-3/+2
| | | |
* | | | fine tune the navbar people autocomplete, as the check for minimum length ↵zotlabs2016-10-211-1/+4
| | | | | | | | | | | | | | | | wasn't taking into consideration the initial tag character, and one char search provides way too many results. The autocomplete cache doesn't search again but just searches through its cache. This means as you type more chars, if the answer wasn't included in the very first search (one char), it won't be returned. This may need further tweaking as the network grows.
* | | | string updatezotlabs2016-10-211-3031/+3032
| | | |
* | | | remove more corporate code - https url conversion for youtube is now handled ↵zotlabs2016-10-201-11/+1
| |_|/ |/| | | | | | | | by std_embeds plugin
* | | Merge pull request #558 from dawnbreak/devzotlabs2016-10-212-28/+136
|\ \ \ | | | | | | | | [BUGFIX] for fromStandalonePermission().
| * | | [BUGFIX] for fromStandalonePermission().Klaus Weidenbach2016-10-202-28/+136
|/ / / | | | | | | | | | | | | | | | Not sure if this method is used anywhere, but it should not have worked correctly. This should correct it. Add a unit test for this class.
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-201-7/+5
|\ \ \