Commit Graph
19076 Commits
Author SHA1 Message Date
zotlabs ecbba93784 markdown autolinks - hubzilla bug #752 2017-05-05 02:28:38 -07:00
zotlabs e308c3d34a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-05-04 19:20:29 -07:00
zotlabs 977677d005 typo 2017-05-04 19:19:24 -07:00
Mario Vavti 5c7acf4807 update sabredav to version 3.2.2 2017-05-04 10:51:39 +02:00
Mario Vavti a92b9b7adb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-05-04 10:12:05 +02:00
git-marijusandGitHub bc776a9534 Merge pull request #750 from zotlabs/abnothere
abook_not_here flag created to indicate singleton connections which a…
2017-05-04 09:59:35 +02:00
git-marijusandGitHub 45c64c2d2e Merge pull request #749 from anaqreon/dev
German translations for demohub
2017-05-04 09:56:45 +02:00
git-marijusandGitHub 139c1a956f Merge pull request #747 from dawnbreak/simplepie
⬆️ Update SimplePie library to 1.5.
2017-05-04 09:54:32 +02:00
zotlabs 1e59d9ade5 one file hadn't yet been saved when doing pull request 2017-05-03 19:02:20 -07:00
zotlabs 519aef7ff5 abook_not_here flag created to indicate singleton connections which are connected to this channel but not on this hub. abook_instance enumerates which hubs the connections is valid, but we ultimately need something more efficiently searchable to decide what operations are supported w/r/t this connection in the context of this hub. This flag is ignored during sync to clones although the code to set it correctly during channel creation, import, and sync has not yet been implemented. 2017-05-03 18:50:32 -07:00
Andrew Manning 8d5e028b5b Add contributor to credits 2017-05-03 20:56:55 -04:00
Andrew Manning 394352d882 German translations for demohub 2017-05-03 20:52:00 -04:00
Andrew Manning 06d2d31777 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-05-03 20:44:54 -04:00
Klaus Weidenbach d2058ee151 ⬆️ Update SimplePie library to 1.5.
There is a new stable release, so upgrade from the dev branch to the new
1.5 release.
2017-05-04 00:58:02 +02:00
Mario Vavti 263cfe2538 bump version 2017-05-03 14:46:45 +02:00
Mario Vavti d6a3f7765a add check for php zip extension 2017-05-03 12:29:26 +02:00
Andrew ManningandMario Vavti f9d40adb18 Update INSTALL.txt
The webpage element portation tools need the zip extension, such as the `php7.0-zip` package on Debian.
2017-05-03 11:56:33 +02:00
git-marijusandGitHub 3bd74aabaa Merge pull request #742 from dawnbreak/QA_testing
:white_check_mark:💡 Add Unit Tests for AccessList class.
2017-05-03 11:49:43 +02:00
Klaus Weidenbach 8f0a0add1e :white_check_mark:💡 Add Unit Tests for AccessList class.
Also some Doxygen docu for this class.
2017-05-01 22:23:32 +02:00
Mario Vavti 3645eb18f8 version and strings 2017-05-01 15:43:03 +02:00
Mario Vavti 610e80a19b update bs4-dev 2017-05-01 15:21:02 +02:00
zotlabsandMario Vavti d8460f147b use hostname, not url 2017-05-01 15:14:25 +02:00
zotlabsandMario Vavti 71e508c7cd authenticate onepoll so we can receive private posts/comments in zotfeed; if local server bypass the network access and invoke zotfeed directly. 2017-05-01 15:14:10 +02:00
zotlabsandMario Vavti d3fcef43f8 ugly postgres fixes 2017-05-01 15:13:53 +02:00
zotlabsandMario Vavti cbc906c438 more work on client side e2ee 2017-05-01 15:12:43 +02:00
zotlabsandMario Vavti d57169fcf6 profile_tabs is now channel_apps (except the original was left behind as the gitwiki addon still uses it). A couple of things were modernised but basic functionality is the same as the latest revisions to the original. 2017-05-01 15:11:51 +02:00
zotlabsandMario Vavti fdf639e1fb more work client mail crypto 2017-05-01 15:10:42 +02:00
zotlabsandMario Vavti 25760e30f9 make mail_store() safe for postgres or mysql5.7 - although this interface needs to be refactored in the future 2017-05-01 15:10:08 +02:00
Andrew Manning e99be61d49 Reformatted Webpages.php to clean up whitespace, where there was a mixture of spaces and tabs for indentation. No other changes made. 2017-04-29 12:56:25 -04:00
Andrew ManningandGitHub 635b8ff73a Update api_zot.bb
Fix incorrect parameter name
2017-04-29 12:42:46 -04:00
git-marijusandGitHub c9daafc887 Merge pull request #739 from zotlabs/mast35
update feedutils with as:author changes, also update tests
2017-04-28 09:28:22 +02:00
zotlabs ab32372f8f update feedutils with as:author changes, also update tests 2017-04-27 16:50:37 -07:00
zotlabsandMario Vavti 2778e63d6c issues from hubzilla:#737 2017-04-27 14:33:01 +02:00
git-marijusandGitHub d16fbda0f8 Merge pull request #736 from zotlabs/feedfck
provide a broken feed as a separate module
2017-04-27 09:49:13 +02:00
zotlabs dab3e90353 provide a broken feed as a separate module 2017-04-26 13:26:50 -07:00
Mario Vavti 1c304eb8ba make mastodon happy args 2017-04-26 22:16:23 +02:00
Mario Vavti d1c84ad9f0 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-04-26 14:20:16 +02:00
git-marijusandGitHub c39a680096 Merge pull request #733 from zotlabs/etwoeemail
Etwoeemail
2017-04-26 14:19:54 +02:00
git-marijusandGitHub e8ddee284c Merge pull request #731 from anaqreon/dev
When template "none" is used in a webpage layout, then the contents o…
2017-04-26 14:18:42 +02:00
git-marijusandGitHub abd7cfdc97 Merge pull request #734 from zotlabs/emojionelicense
Emojionelicense
2017-04-26 14:17:32 +02:00
zotlabsandMario Vavti c904bd3a62 The rest of the library and backend changes to support client-side e2ee and deprecate previous uses of item_obscured. 2017-04-26 14:16:07 +02:00
zotlabsandMario Vavti d48bda88e6 In the rare case where a default channel is not selected but channels actually exist, you should be able to visit /manage and set a default channel. Originally I believe this may have been possible but the ability was lost when delegation was added to the interface - which requires an active channel. Remove the active channel restriction so that the rest of the interface works (channel selections can be made and the ability to set a default is provided) however delegation info isn't presented unless there is an active channel. 2017-04-26 14:13:45 +02:00
zotlabsandMario Vavti 4ca24f114b support reverse magic-auth in oembed requests. 2017-04-26 14:12:52 +02:00
zotlabsandMario Vavti 7667c630a4 provide a broken feed for services which require a broken feed 2017-04-26 14:12:11 +02:00
zotlabsandMario Vavti 97458b2885 make it easier to hook into feed headers in the future 2017-04-26 14:11:55 +02:00
zotlabsandMario Vavti 803bff4043 smilies - add param to only list default emoticons 2017-04-26 14:09:45 +02:00
zotlabs 17aa8da9f0 Attribution is required 2017-04-26 01:08:03 -07:00
zotlabs 7d5ee81628 database support for client side e2ee for private mail 2017-04-25 21:52:24 -07:00
zotlabs f36e384ed7 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-04-25 19:42:42 -07:00
Mario Vavti 42d139ee82 Revert "fix the query of last pullrequest"
This reverts commit bda9a833ba.
2017-04-24 09:05:33 +02:00