aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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 file
| | | * 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
| | |\ \ | | | | | | | | | | add column display_path to inserts into attachment, as this column is…
| | | * | until we've settled on what they should be, set os_path and display_path to ↵Florian Steinel2016-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | an emtpy string
| | | * | 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-222-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
| * | | | need to perform dbunescbin on stored filenames as well as binary data - this ↵zotlabs2016-10-233-5/+5
| | | | | | | | | | | | | | | | | | | | is a no-op under mysql but could provide unpredictable data under postgres
| * | | | 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 ...
| | | * | Postgres complaining again ...ilu332016-10-221-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```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... ^ ```
| * | / issue #564zotlabs2016-10-212-2/+2
| |/ /
| * / squash timezone adjusted birthdays into a single day in the calendar, by ↵zotlabs2016-10-211-0/+6
| |/ | | | | | | lying and telling the js calendar that the end date/time is unknown
| * better fix for navbar channel autocomplete, refrain from search until a ↵zotlabs2016-10-211-1/+1
| | | | | | | | minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results.
| * 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 ↵zotlabs2016-10-211-1/+4
| | | | | | | | 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.
| * string updatezotlabs2016-10-211-3031/+3032
| |
| * remove more corporate code - https url conversion for youtube is now handled ↵zotlabs2016-10-201-11/+1
| | | | | | | | by std_embeds plugin
* | 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-204-36/+146
|\|
| * Merge pull request #558 from dawnbreak/devzotlabs2016-10-212-28/+136
| |\ | | | | | | [BUGFIX] for fromStandalonePermission().
| | * [BUGFIX] for fromStandalonePermission().Klaus Weidenbach2016-10-202-28/+136
| |/ | | | | | | | | | | 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.
| * 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.
| | | * [TASK] Fix travis' phpunit execution.Klaus Weidenbach2016-10-191-7/+5
| | |/ | | | | | | | | | | | | Removed php5.4 and php5.5 from test matrix, as they are not compatible with new phpunit releases and have reached EOL anyway.
| * | discover tab showing on network page using fresh site with no settings (it ↵zotlabs2016-10-191-1/+5
| | | | | | | | | | | | is disabled by default, but the admin setting has not yet been committed to disk).
* | | 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 ↵zotlabs2016-10-181-1/+1
| |/ | | | | | | by mid and parent_mid; neither if which are present in the stored activity object
| * 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
| | | | | | | | 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.
| * 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.
| | | * [TASK] Restructure tests/ folder.Klaus Weidenbach2016-10-1916-122/+321
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | more fixes to addons doc, include project addons in string extraction for ↵zotlabs2016-10-183-4458/+7490
| | | | | | | | | | | | translations, fix the string extractor which was looking in the old places for version info
| * | bring the addons list up to datezotlabs2016-10-181-5/+8
| |/
| * Merge pull request #554 from dawnbreak/composer-lightzotlabs2016-10-1951-483/+2090
| |\ | | | | | | [FEATURE] Add config and use composer autoloader.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 23:34:19 +0000