Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove more corporate code - https url conversion for youtube is now handled ↵ | zotlabs | 2016-10-20 | 1 | -11/+1 |
| | | | | by std_embeds plugin | ||||
* | Merge pull request #558 from dawnbreak/dev | zotlabs | 2016-10-21 | 2 | -28/+136 |
|\ | | | | | [BUGFIX] for fromStandalonePermission(). | ||||
| * | [BUGFIX] for fromStandalonePermission(). | Klaus Weidenbach | 2016-10-20 | 2 | -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_merge | zotlabs | 2016-10-20 | 1 | -7/+5 |
|\ | |||||
| * | Merge pull request #556 from dawnbreak/QA_testing | zotlabs | 2016-10-20 | 1 | -7/+5 |
| |\ | | | | | | | [TASK] Fix travis' phpunit execution. | ||||
| | * | [TASK] Fix travis' phpunit execution. | Klaus Weidenbach | 2016-10-19 | 1 | -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 ↵ | zotlabs | 2016-10-19 | 1 | -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 ↵ | zotlabs | 2016-10-18 | 1 | -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 album | zotlabs | 2016-10-18 | 1 | -1/+1 |
| | |||||
* | Change the behaviour of 'use existing photo for profile'. For a channel with ↵ | zotlabs | 2016-10-18 | 2 | -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. | zotlabs | 2016-10-18 | 2 | -6/+4 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-18 | 16 | -122/+321 |
|\ | |||||
| * | Merge pull request #555 from dawnbreak/QA_testing | zotlabs | 2016-10-19 | 16 | -122/+321 |
| |\ | | | | | | | [TASK] Restructure tests/ folder. | ||||
| | * | [TASK] Restructure tests/ folder. | Klaus Weidenbach | 2016-10-19 | 16 | -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 ↵ | zotlabs | 2016-10-18 | 3 | -4458/+7490 |
| | | | | | | | | translations, fix the string extractor which was looking in the old places for version info | ||||
* | | bring the addons list up to date | zotlabs | 2016-10-18 | 1 | -5/+8 |
|/ | |||||
* | Merge pull request #554 from dawnbreak/composer-light | zotlabs | 2016-10-19 | 51 | -483/+2090 |
|\ | | | | | [FEATURE] Add config and use composer autoloader. | ||||
| * | [FEATURE] Add config and use composer autoloader. | Klaus Weidenbach | 2016-10-18 | 51 | -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 ↵ | zotlabs | 2016-10-17 | 4 | -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() | zotlabs | 2016-10-17 | 1 | -6/+9 |
| | |||||
* | issue #549, ACL has 'public' selected even when restrictive ACL is being used. | zotlabs | 2016-10-17 | 2 | -5/+31 |
| | |||||
* | issue #553 - negative birthday from directory. This may not completely fix ↵ | zotlabs | 2016-10-17 | 1 | -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 ↵ | zotlabs | 2016-10-17 | 1 | -1/+4 |
| | | | | from unsigned to signed... | ||||
* | "alter table alter" has completely different rules between postgres and mysql | zotlabs | 2016-10-17 | 1 | -1/+7 |
| | |||||
* | rename diaspora2bb() to markdown_to_bb() to reflect that is has a more ↵ | zotlabs | 2016-10-16 | 4 | -4/+4 |
| | | | | generic use | ||||
* | issue #550 | zotlabs | 2016-10-16 | 1 | -1/+1 |
| | |||||
* | add new hook doc | zotlabs | 2016-10-14 | 2 | -0/+8 |
| | |||||
* | remove corporate codes from diaspora2bb, add plugin hook markdown_to_bb | zotlabs | 2016-10-14 | 1 | -5/+2 |
| | |||||
* | remove logging | zotlabs | 2016-10-14 | 1 | -1/+1 |
| | |||||
* | permissions issue | zotlabs | 2016-10-14 | 2 | -4671/+4690 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-13 | 36 | -1783/+1864 |
|\ | |||||
| * | Merge pull request #547 from dawnbreak/docu | zotlabs | 2016-10-14 | 36 | -1786/+1868 |
| |\ | | | | | | | [TASK] Update Doxyfile and fix Doxygen errors. | ||||
| | * | [TASK] Update Doxyfile and fix Doxygen errors. | Klaus Weidenbach | 2016-10-13 | 36 | -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 ↵ | zotlabs | 2016-10-13 | 2 | -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. | zotlabs | 2016-10-13 | 3 | -7/+7 |
|/ | |||||
* | additional array checking | zotlabs | 2016-10-13 | 5 | -14/+27 |
| | |||||
* | consolidate duplicated code for creating table entries from an array | zotlabs | 2016-10-12 | 4 | -161/+51 |
| | |||||
* | minor | zotlabs | 2016-10-12 | 2 | -1/+2 |
| | |||||
* | allow hooks to have negative priority | zotlabs | 2016-10-12 | 4 | -4/+17 |
| | |||||
* | remove special handling of lookalike '@ char from attach path | zotlabs | 2016-10-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #545 from dawnbreak/atfix | zotlabs | 2016-10-13 | 1 | -3/+3 |
|\ | | | | | Comment and code about UTF-8 @-sign do not match. | ||||
| * | Comment and code about UTF-8 @-sign do not match. | Klaus Weidenbach | 2016-10-11 | 1 | -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 checkin | zotlabs | 2016-10-12 | 1 | -1/+1 |
| | | |||||
* | | remove the rest of the backticks from sql queries; replace with TQUOT const ↵ | zotlabs | 2016-10-12 | 8 | -132/+141 |
| | | | | | | | | which is driver dependent | ||||
* | | add the twitter API 1.1 code points | zotlabs | 2016-10-12 | 1 | -4/+44 |
| | | |||||
* | | some more api work | zotlabs | 2016-10-12 | 2 | -10/+10 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-10-12 | 3 | -7/+13 |
|\ \ | |||||
| * | | update changelog | Mario Vavti | 2016-10-12 | 1 | -1/+6 |
| | | | |||||
| * | | fix connected time not shown on ajax loaded connections | Mario Vavti | 2016-10-12 | 2 | -6/+7 |
| | | | |||||
* | | | bbcode: remove the inserted <br /> between list elements due to linefeeds in ↵ | zotlabs | 2016-10-12 | 1 | -0/+4 |
|/ / | | | | | | | the textarea. |