aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* more api re-orgzotlabs2016-11-081-36/+40
|
* move twitter api to addon; there's still a bit of cleanup remaining, mostly ↵zotlabs2016-11-081-1590/+29
| | | | dealing with abstracting the authentication calls and separating out the twitter authentication structure from the zot api.
* fix a fatal error with incorrect DB object accesszottel2016-11-071-2/+2
|
* reorganise emoticonszotlabs2016-11-061-33/+33
|
* provide /locs link on settings page if there is more than one hubloc for ↵zotlabs2016-11-052-3/+3
| | | | this channnel *that isn't deleted*.
* ignore flags to dns_get_record() and look for anythingzotlabs2016-11-021-4/+7
|
* issue #409 - use item_notshown for file activities to prevent display but ↵zotlabs2016-11-021-1/+1
| | | | allow transmitting to other sites. We currently allow file acitivies with item_hidden to be transmitted as a special case but eventually we want to remove the special case and disallow items with item_hidden from being propagated.
* convert manual page updates to a display setting instead of a featurezotlabs2016-11-022-9/+11
|
* if connecting to a channel that is already pending, undo the pending and set ↵zotlabs2016-11-021-2/+23
| | | | connect permissions accordingly. issue #577 - this will mostly affect channels that were connected out of band, but will also auto-friend somebody that has already connected to you, if you reciprocate prior to seeing and/or acting on the pending connection notice.
* feature: static page update as opposed to live update of conversations on ↵zotlabs2016-11-011-0/+9
| | | | the page. Changes will be queued until the page is reloaded. There may or may not be notifications of pending activity updates depending on your notification preferences. Endless scrolling (append) is still performed either way. This only affects changed and new/unseen items being inserted into the page.
* bbcode event formatting issuezotlabs2016-10-312-2/+3
|
* provide plugin restrictions based on config settingszotlabs2016-10-311-0/+7
|
* improve the check in 9b42bc860zotlabs2016-10-301-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-10-301-3/+3
|\
| * change log string on pdo log messageszotlabs2016-10-271-3/+3
| |
* | possible fix for https://zothub.de/display/2d4996dd629504851dMario Vavti2016-10-301-2/+2
|/
* sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and ↵Florian Steinel2016-10-275-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 ↵zotlabs2016-10-251-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 slightlyzotlabs2016-10-251-1/+1
|
* send "hidden" edit activities to networks which don't support edits themselveszotlabs2016-10-252-3/+36
|
* put all dns checking into one function, allow it to be ignoredzotlabs2016-10-254-9/+23
|
* first cut at edit activitieszotlabs2016-10-253-5/+64
|
* 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-236-25/+27
| |\
| * | 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
| |\ \
| * | | 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
| |\ \ \
| * | | | 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-231-1/+2
| | | | |
* | | | | correct encodingzotlabs2016-10-232-3/+3
| |_|_|/ |/| | |
* | | | 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
| | | | |