zotlabs
2b3b5d2c8a
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-26 21:52:53 -07:00
zotlabs
d46fe20986
modernise chanview, which has a renewed purpose - to provide a connect link to foreign network members. The iframe no longer works due to content security policies, and people hated this with a passion anyway; so just provide a URL to visit.
2016-10-26 21:50:30 -07:00
zotlabs
9e46409517
Merge pull request #570 from fsteinel/issue-NEW
...
sql: limit 1 for UPDATE and DELETE is not supported …
2016-10-27 12:38:46 +11:00
zotlabs
d42da529ec
zot_finger from navbar people search looping
2016-10-26 18:35:10 -07:00
Florian Steinel
c1c96e01fa
sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and postgresql
...
(see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 )
2016-10-27 02:41:32 +02:00
zotlabs
aee2742951
when inserting a link, if the url begins with '!' ignore oembed and do everytthing old school.
2016-10-26 16:44:54 -07:00
zotlabs
c3af36d33b
the logic is much too complicated for the notifier. Let plugins know if they are going upstream or downstream with a simple binary variable.
2016-10-26 02:46:14 -07:00
zotlabs
3885aa1e8c
allow .htpreconfig.php to be loaded if you can't install without special settings or require PHP logging
...
at that time; it is ignored during normal use.
2016-10-26 00:17:23 -07:00
zotlabs
33b1c57092
For z_dns_check() use config values from memory and ignore DB - as this function can be called in the early stages of Setup when we first try to connect to the database.
2016-10-25 23:32:24 -07:00
zotlabs
441d3bf1ed
make the edited header stand out slightly
2016-10-25 20:46:57 -07:00
zotlabs
bd83936e5d
send "hidden" edit activities to networks which don't support edits themselves
2016-10-25 20:43:24 -07:00
zotlabs
88a68b941f
put all dns checking into one function, allow it to be ignored
2016-10-25 18:27:32 -07:00
zotlabs
084b41fc2c
first cut at edit activities
2016-10-25 16:21:56 -07:00
zotlabs
7b713e2576
pdo - fetch assoc only
2016-10-25 16:15:39 -07:00
zotlabs
25982f0475
set port if non-zero (instead of non-null)
2016-10-24 18:55:11 -07:00
zotlabs
2d2ac98b3d
Merge pull request #559 from zotlabs/pdo
...
Pdo DB driver
2016-10-25 11:48:22 +11:00
zotlabs
f1fc201862
not null violation in mail
2016-10-24 17:14:06 -07:00
zotlabs
681f45943b
some more places which require dbescbin and dbunescbin
2016-10-24 00:36:38 -07:00
zotlabs
5dc8c54b8d
found it...
2016-10-23 21:35:06 -07:00
zotlabs
20194bed42
this seems to work, but there are unanswered questions and is still 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.
2016-10-23 21:27:10 -07:00
zotlabs
06bbf494bb
profile photo issue on postgres
2016-10-23 20:01:39 -07:00
zotlabs
21b919a76b
correct encoding
2016-10-23 19:04:42 -07:00
zotlabs
39f0707201
fetch bytea as stream
2016-10-23 17:53:34 -07:00
zotlabs
8d52a278a9
Merge branch 'dev' into pdo
2016-10-23 17:49:15 -07:00
zotlabs
5fbba27d17
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-23 17:48:33 -07:00
zotlabs
5c891bcfb5
need to perform dbunescbin on stored filenames as well as binary data - this is a no-op under mysql but could provide unpredictable data under postgres
2016-10-23 17:46:29 -07:00
zotlabs
547c700764
misplaced parens
2016-10-23 17:23:53 -07:00
zotlabs
d30892ea60
pdo hacks
2016-10-23 17:05:08 -07:00
zotlabs
0b5d550780
Merge pull request #565 from anaqreon/wiki-download
...
Add wiki download button to export the selected wiki repo to a zip file
2016-10-23 07:28:38 +11:00
zotlabs
ac5ad0b9ce
Merge pull request #562 from fsteinel/issue-561
...
add column display_path to inserts into attachment, as this column is…
2016-10-23 07:27:48 +11:00
zotlabs
823c0ebb47
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-22 13:22:01 -07:00
zotlabs
8fc87411fa
php warning, $uplink didn't have a default
2016-10-22 13:20:51 -07:00
Mario Vavti
5fb173149a
provide lockstate for events and remove obsolete code
2016-10-22 20:44:41 +02:00
Andrew Manning
02cf7274d2
Add wiki download button to export the selected wiki repo to a zip file
2016-10-22 08:52:26 -04:00
Florian Steinel
43de0e7f16
until we've settled on what they should be, set os_path and display_path to an emtpy string
2016-10-22 08:17:26 +02:00
Florian Steinel
f84530c285
attach_mkdir use $os_path and $display_path initilized to an empty string
2016-10-22 08:07:27 +02:00
zotlabs
6bf92979a2
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-21 21:44:37 -07:00
zotlabs
c5dcac4dbb
issue #564
2016-10-21 21:44:15 -07:00
zotlabs
bb1b6c906d
Merge pull request #563 from ilu33/dev
...
Postgres complaining again ...
2016-10-22 15:07:08 +11:00
zotlabs
aa9fef7778
squash timezone adjusted birthdays into a single day in the calendar, by lying and telling the js calendar that the end date/time is unknown
2016-10-21 20:56:01 -07:00
ilu33
351f21c89f
Postgres complaining again ...
...
```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...
^
```
2016-10-22 05:52:29 +02:00
Florian Steinel
ca97130a29
add column display_path to inserts into attachment, as this column is a not null column
...
Conflicts:
Zotlabs/Storage/Directory.php
include/attach.php
amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
2016-10-22 05:07:06 +02:00
zotlabs
9fea44cbc3
better fix for navbar channel autocomplete, refrain from search until a minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results.
2016-10-21 18:15:44 -07:00
zotlabs
5e761a1068
full revert, that wasn't working at all. Not sure why.
2016-10-21 14:27:29 -07:00
zotlabs
afff751ff1
partial revert
2016-10-21 14:23:49 -07:00
zotlabs
222186d5f7
fine tune the navbar people autocomplete, as the check for minimum length 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.
2016-10-21 14:15:29 -07:00
zotlabs
632ad7d7f9
string update
2016-10-21 13:50:00 -07:00
zotlabs
331412ddff
remove more corporate code - https url conversion for youtube is now handled by std_embeds plugin
2016-10-20 17:53:15 -07:00
zotlabs
04ac04e0ad
allow a dsn override to the database via the server argument. This could be used to allow unix domain sockets and other unusual configurations.
2016-10-20 17:04:43 -07:00
zotlabs
29340152b6
pdo - cleanup
2016-10-20 16:21:15 -07:00