aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-2611-19/+19
|\
| * Merge pull request #570 from fsteinel/issue-NEWzotlabs2016-10-2711-19/+19
| |\
| | * sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and p...Florian Steinel2016-10-2711-19/+19
* | | modernise chanview, which has a renewed purpose - to provide a connect link t...zotlabs2016-10-262-17/+33
|/ /
* | zot_finger from navbar people search loopingzotlabs2016-10-261-5/+24
* | when inserting a link, if the url begins with '!' ignore oembed and do everyt...zotlabs2016-10-261-5/+12
|/
* the logic is much too complicated for the notifier. Let plugins know if they ...zotlabs2016-10-261-1/+4
* allow .htpreconfig.php to be loaded if you can't install without special sett...zotlabs2016-10-261-0/+6
* For z_dns_check() use config values from memory and ignore DB - as this funct...zotlabs2016-10-251-1/+6
* make the edited header stand out slightlyzotlabs2016-10-251-1/+1
* send "hidden" edit activities to networks which don't support edits themselveszotlabs2016-10-255-4/+39
* 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
|\
| * found it...zotlabs2016-10-231-2/+2
| * this seems to work, but there are unanswered questions and is still undergoin...zotlabs2016-10-231-5/+8
| * 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 u...zotlabs2016-10-202-15/+21
| * | 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 fileAndrew Manning2016-10-223-0/+35
| * | | | | Merge pull request #562 from fsteinel/issue-561zotlabs2016-10-232-12/+26
| |\ \ \ \ \
| | * | | | | until we've settled on what they should be, set os_path and display_path to a...Florian Steinel2016-10-221-2/+2
| | * | | | | 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 n...Florian Steinel2016-10-222-12/+22
* | | | | | | need to perform dbunescbin on stored filenames as well as binary data - this ...zotlabs2016-10-233-5/+5
* | | | | | | 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 ...ilu332016-10-221-1/+1
| | |/ / / /