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
zotlabs
8a34f7ca7b
Merge branch 'dev' into pdo
2016-10-20 16:14:01 -07:00
zotlabs
e2e3b81f32
more pdo tweaks
2016-10-20 16:13:06 -07:00
zotlabs
b4b5eb5bab
pdo testing
2016-10-20 15:45:48 -07:00
zotlabs
edde785219
Merge pull request #558 from dawnbreak/dev
...
[BUGFIX] for fromStandalonePermission().
2016-10-21 06:15:03 +11:00
Klaus Weidenbach
b71e148cea
[BUGFIX] for fromStandalonePermission().
...
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.
2016-10-20 20:22:39 +02:00
zotlabs
0d939b5ab0
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-20 00:33:23 -07:00
zotlabs
b983cf8b5f
Merge pull request #556 from dawnbreak/QA_testing
...
[TASK] Fix travis' phpunit execution.
2016-10-20 18:33:03 +11:00
zotlabs
81f3a5cf94
discover tab showing on network page using fresh site with no settings (it is disabled by default, but the admin setting has not yet been committed to disk).
2016-10-19 21:50:26 -07:00
zotlabs
3726b546d5
use pdo for postgres also
2016-10-19 19:24:12 -07:00
zotlabs
2702b82bc3
pdo fixes
2016-10-19 17:23:06 -07:00
zotlabs
aee4f8d2fe
pdo changes first cut
2016-10-19 16:58:26 -07:00
zotlabs
c79c1b3913
Merge branch 'dev' into pdo
2016-10-19 16:31:35 -07:00
Klaus Weidenbach
3da72c1ff1
[TASK] Fix travis' phpunit execution.
...
Removed php5.4 and php5.5 from test matrix, as they are not compatible
with new phpunit releases and have reached EOL anyway.
2016-10-19 21:22:28 +02:00
zotlabs
b926a4c67e
when translating like activities, we're distinguishing comments from posts by mid and parent_mid; neither if which are present in the stored activity object
2016-10-18 21:42:54 -07:00
zotlabs
29320f8aad
remove requirement that imported profile photos be in the profile photos album
2016-10-18 18:37:58 -07:00
zotlabs
2a59f45a3b
Change the behaviour of 'use existing photo for profile'. For a channel with one profile, works just as it did previously. For multiple profiles, go back to the "upload form" but with a pre-existing file selected so that the correct profile can be selected. The text on this page and the resulting form are changed to remove the 'upload' text and file selection; but falls through to cropping in either case.
2016-10-18 18:30:50 -07:00
zotlabs
2db7b2d948
change event behaviour - share by default.
2016-10-18 16:46:09 -07:00
zotlabs
d55fcd055d
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
2016-10-18 16:29:36 -07:00
zotlabs
9e3032e919
more fixes to addons doc, include project addons in string extraction for translations, fix the string extractor which was looking in the old places for version info
2016-10-18 16:26:54 -07:00
zotlabs
c2e2994403
Merge pull request #555 from dawnbreak/QA_testing
...
[TASK] Restructure tests/ folder.
2016-10-19 09:53:59 +11:00
Klaus Weidenbach
b92e3ca3ee
[TASK] Restructure tests/ folder.
...
Move unit tests to tests/unit/. Get the old still working UnitTests
into a working state again.
Updated composer.json with required-dev packages.
Create a new folder tests/acceptance for Behat functional/acceptance
testing. Add a first Feature draft of a Behat functional test for
local login.
2016-10-19 00:46:41 +02:00
