aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* | 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.
| * [FEATURE] Add config and use composer autoloader.Klaus Weidenbach2016-10-1851-483/+2090
|/ | | | | | | | | | | | | We use composer already to install SabreDAV. Include config composer.(json|lock) to install and manage more dependencies in future. Also provide PSR-4 autoloading for our namespaced classes, e.g. "Zotlabs\". To regenerate autoloader maps use: $ composer install --optimize-autoloader --no-dev We could also remove the whole vendor/ folder from our repository, but that would need changes in deployment and how to install hubs and needs more discussion first.
* add get_photo hook to go along with get_profile_photo hook. This allows a ↵zotlabs2016-10-174-14/+29
| | | | plugin to over-ride the permissions for cover photos or insert a different photo in place of that requested
* array_key_exists warning on PConfig::Delete()zotlabs2016-10-171-6/+9
|
* issue #549, ACL has 'public' selected even when restrictive ACL is being used.zotlabs2016-10-172-5/+31
|
* issue #553 - negative birthday from directory. This may not completely fix ↵zotlabs2016-10-171-1/+1
| | | | it and may take a profile update to register the change; but it's a start; specifically we need to store 0000-00-00 in the xprof table of the directory server if that's what we get over the wire. Birthday fields are string and are not subject to SQL strict_mode on dates. We want these to be the string '0000-00-00' if not set to a valid date.
* if we have to go through this contortion every time we change a DB column ↵zotlabs2016-10-171-1/+4
| | | | from unsigned to signed...
* "alter table alter" has completely different rules between postgres and mysqlzotlabs2016-10-171-1/+7
|
* rename diaspora2bb() to markdown_to_bb() to reflect that is has a more ↵zotlabs2016-10-164-4/+4
| | | | generic use
* issue #550zotlabs2016-10-161-1/+1
|
* add new hook doczotlabs2016-10-142-0/+8
|
* remove corporate codes from diaspora2bb, add plugin hook markdown_to_bbzotlabs2016-10-141-5/+2
|
* remove loggingzotlabs2016-10-141-1/+1
|
* permissions issuezotlabs2016-10-142-4671/+4690
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-1336-1783/+1864
|\
| * Merge pull request #547 from dawnbreak/docuzotlabs2016-10-1436-1786/+1868
| |\ | | | | | | [TASK] Update Doxyfile and fix Doxygen errors.
| | * [TASK] Update Doxyfile and fix Doxygen errors.Klaus Weidenbach2016-10-1336-1786/+1868
| | | | | | | | | | | | | | | | | | Updated Doxyfile to include new folders. Add a list for @hooks tags. Fixed some parsing problems for Doxygen.
* | | try to filter any path information from leaking through to zot_finger; and ↵zotlabs2016-10-132-1/+7
|/ / | | | | | | log the url wherever called to track down where it might be called with a malformed webbie or complete path instead of hostname.
* / provide text log results of email success/failure rather than 1 and 0.zotlabs2016-10-133-7/+7
|/
* additional array checkingzotlabs2016-10-135-14/+27
|
* consolidate duplicated code for creating table entries from an arrayzotlabs2016-10-124-161/+51
|
* minorzotlabs2016-10-122-1/+2
|
* allow hooks to have negative priorityzotlabs2016-10-124-4/+17
|
* remove special handling of lookalike '@ char from attach pathzotlabs2016-10-121-2/+2
|
* Merge pull request #545 from dawnbreak/atfixzotlabs2016-10-131-3/+3
|\ | | | | Comment and code about UTF-8 @-sign do not match.
| * Comment and code about UTF-8 @-sign do not match.Klaus Weidenbach2016-10-111-3/+3
| | | | | | | | | | | | Changed code according to comment: First AT is now full-width AT U+FF20. Do we also need to replace small AT U+FE6B?
* | caught one typo from the last checkinzotlabs2016-10-121-1/+1
| |
* | remove the rest of the backticks from sql queries; replace with TQUOT const ↵zotlabs2016-10-128-132/+141
| | | | | | | | which is driver dependent
* | add the twitter API 1.1 code pointszotlabs2016-10-121-4/+44
| |
* | some more api workzotlabs2016-10-122-10/+10
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-10-123-7/+13
|\ \
| * | update changelogMario Vavti2016-10-121-1/+6
| | |
| * | fix connected time not shown on ajax loaded connectionsMario Vavti2016-10-122-6/+7
| | |
* | | bbcode: remove the inserted <br /> between list elements due to linefeeds in ↵zotlabs2016-10-121-0/+4
|/ / | | | | | | the textarea.
* | more api work, mostly bringing the file up to speed with the project coding ↵zotlabs2016-10-111-175/+135
| | | | | | | | style guidelines
* | more api workzotlabs2016-10-111-109/+11
| |
* | When importing a channel from another server, try to auto-discover the best ↵zotlabs2016-10-112-10/+33
| | | | | | | | available api path.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 12:42:26 +0000