aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into pdozotlabs2016-10-2319-3082/+3114
|\
| * 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
| | | |/
| * | / issue #564zotlabs2016-10-212-2/+2
| |/ /
| * / squash timezone adjusted birthdays into a single day in the calendar, by lyin...zotlabs2016-10-211-0/+6
| |/
| * better fix for navbar channel autocomplete, refrain from search until a minim...zotlabs2016-10-211-1/+1
| * 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 was...zotlabs2016-10-211-1/+4
| * string updatezotlabs2016-10-211-3031/+3032
| * remove more corporate code - https url conversion for youtube is now handled ...zotlabs2016-10-201-11/+1
* | 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
|\|
| * Merge pull request #558 from dawnbreak/devzotlabs2016-10-212-28/+136
| |\
| | * [BUGFIX] for fromStandalonePermission().Klaus Weidenbach2016-10-202-28/+136
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-201-7/+5
| |\
| | * Merge pull request #556 from dawnbreak/QA_testingzotlabs2016-10-201-7/+5
| | |\
| | | * [TASK] Fix travis' phpunit execution.Klaus Weidenbach2016-10-191-7/+5
| | |/
| * | discover tab showing on network page using fresh site with no settings (it is...zotlabs2016-10-191-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-1983-5111/+10022
|\| |
| * | when translating like activities, we're distinguishing comments from posts by...zotlabs2016-10-181-1/+1
| |/
| * remove requirement that imported profile photos be in the profile photos albumzotlabs2016-10-181-1/+1
| * Change the behaviour of 'use existing photo for profile'. For a channel with ...zotlabs2016-10-182-11/+36
| * change event behaviour - share by default.zotlabs2016-10-182-6/+4
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-1816-122/+321
| |\
| | * Merge pull request #555 from dawnbreak/QA_testingzotlabs2016-10-1916-122/+321
| | |\
| | | * [TASK] Restructure tests/ folder.Klaus Weidenbach2016-10-1916-122/+321
| | |/
| * | more fixes to addons doc, include project addons in string extraction for tra...zotlabs2016-10-183-4458/+7490
| * | bring the addons list up to datezotlabs2016-10-181-5/+8
| |/
| * Merge pull request #554 from dawnbreak/composer-lightzotlabs2016-10-1951-483/+2090
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 10:14:06 +0000