Commit Graph
19665 Commits
Author SHA1 Message Date
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
zotlabs faf9814788 typo 2017-05-04 19:18:54 -07:00
Klaus Weidenbach eeb9103e26 💡 correct some Doxygen syntax mistakes. 2017-05-05 00:23:57 +02:00
Klaus Weidenbach 1f6386bd60 💡 Add Doxygen fix for @var member variable documentation.
Add an input filter to Doxygen to parse @var class member variable
documentation, so it is bit more compatible how anybody else interpretes
it.
2017-05-04 21:58:25 +02: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 b08af13872 oauth2/oidc testing (please do not port - this requires several extra DB tables to work) 2017-05-03 22:37:06 -07: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
zotlabs 05cbdc6915 cleanup fallback directory list 2017-05-03 18:30:11 -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
zotlabs c0edfee224 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-03 17:46:51 -07: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
zotlabs 4933aef543 more cleanup 2017-05-02 22:40:31 -07:00
zotlabs 0e5d824bff finish the red conversion of the markdown utilities considering their relation to protocol plugins. 2017-05-02 22:10:53 -07:00
zotlabs b2d2dcc7fe more code refactoring to put external protocol dependencies in plugins. 2017-05-02 20:17:47 -07:00
zotlabs 7acb068590 profile_sidebar hook ignored the updated html content 2017-05-02 18:24:18 -07:00
zotlabs 80ec92ce8d Revert "move theme specific files to theme dir"
This reverts commit e332d1074f.
2017-05-02 12:46:50 -07:00
zotlabs 83c4dd6bda typo 2017-05-01 22:56:11 -07:00
zotlabs e332d1074f move theme specific files to theme dir 2017-05-01 21:10:04 -07:00
zotlabs 42ed73ed4a add cdav files 2017-05-01 21:07:11 -07:00
zotlabs 5ed5c76d3f new function Hook::register_array() to bulk register several hooks from the same file with default settings 2017-05-01 18:02:00 -07:00
zotlabs fe2288a88f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-01 16:42:16 -07: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
zotlabs 3cdcb121c5 use hostname, not url 2017-04-30 19:40:17 -07:00
zotlabs 968209471e authenticate onepoll so we can receive private posts/comments in zotfeed; if local server bypass the network access and invoke zotfeed directly. 2017-04-30 18:24:48 -07:00
zotlabs d71a53f24e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-04-30 16:50:10 -07:00
zotlabs c845d20352 ugly postgres fixes 2017-04-30 16:03:01 -07:00
zotlabs 230617208b more work on client side e2ee 2017-04-29 16:30:11 -07: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