Commit Graph
19297 Commits
Author SHA1 Message Date
zotlabs 76d78571d6 don't allow html in plugin comment blocks 2017-05-09 20:33:25 -07:00
zotlabs 556407408f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-09 19:12:23 -07:00
zotlabs a862bf488c use correct data type 2017-05-09 19:03:16 -07:00
zotlabs f629dc51aa zot protocol doco updates 2017-05-09 19:02:02 -07:00
Mario Vavti 6c0e0b3eae make all label bold 2017-05-09 10:25:12 +02:00
git-marijusandGitHub 9a0400c93a Merge pull request #763 from anaqreon/dev
Implemented switch statement logic in Comanche layout parser.
2017-05-09 10:16:11 +02:00
git-marijusandGitHub 13b5eb0ad8 Merge pull request #762 from mjfriaza/dev
Updated the Spanish translation
2017-05-09 10:07:51 +02:00
zotlabs e059efb4c4 handle mastodon urls in markdown/bbcode conversion 2017-05-08 19:10:08 -07:00
root 0be74c6551 Implemented switch statement logic in Comanche layout parser. 2017-05-08 20:55:31 -04:00
Manuel Jiménez Friaza 6fe6e1596f Updated the Spanish translation 2017-05-08 13:12:26 +02:00
zotlabsandMario Vavti 40c8549cf5 get rid of edit activities 2017-05-08 11:12:09 +02:00
zotlabsandMario Vavti a7ea370ec3 cover photo was unintentionally disabled when block_public in effect 2017-05-08 11:11:50 +02:00
zotlabs 2e531c103f error 2017-05-08 02:00:00 -07:00
zotlabs 1a05939e0b cleanup of last checkin 2017-05-07 18:05:29 -07:00
zotlabs acb8e85b61 cover photo was unintentionally disabled when block_public in effect 2017-05-07 17:25:38 -07:00
zotlabs 8c38841a4d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-07 14:43:38 -07:00
zotlabs 2c2ee706ac get rid of edit activities 2017-05-07 14:40:11 -07:00
git-marijusandGitHub bd3708870d Merge pull request #756 from dawnbreak/QA_testing
:construction_worker::white_check_mark:🐛 Import table structure in TravisCI.
2017-05-07 15:06:45 +02:00
git-marijusandGitHub 2aa699d03e Merge pull request #761 from anaqreon/dev
Mail subject bug fix
2017-05-07 15:05:50 +02:00
Andrew Manning 1d20b2603a Mail subject bug fix 2017-05-07 08:52:26 -04:00
zotlabs f840082aae Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-05-05 16:58:46 -07:00
Klaus Weidenbach f162508ad1 :construction_worker::white_check_mark:🐛 Import table structure in TravisCI.
Fix a syntax error in schema_postres.sql which was discovered while
working on this.
2017-05-06 01:07:15 +02:00
Mario Vavti 3ccefa20e8 collapse sysapps if viewing a remote channel 2017-05-05 16:33:28 +02:00
Mario Vavti dcc8a94d07 css hack to make remote channel menu header look in line with the rest if in collapsed state 2017-05-05 14:40:35 +02:00
Mario Vavti 5dd501e0ea css fix 2017-05-05 12:58:27 +02:00
git-marijusandGitHub 3d1df8337e Merge pull request #751 from dawnbreak/docu
💡 Add Doxygen fix for @var member variable documentation.
2017-05-05 12:33:58 +02:00
git-marijusandGitHub f08001a5a6 Merge pull request #753 from zotlabs/mdauto
markdown autolinks - hubzilla bug #752
2017-05-05 12:33:39 +02:00
zotlabs ecbba93784 markdown autolinks - hubzilla bug #752 2017-05-05 02:28:38 -07:00
zotlabs 47ebddf99f markdown autolinks - hubzilla bug #752 2017-05-05 02:27:24 -07:00
zotlabs c70ac572fa do away with single delivery (delivery from clones to singleton networks attached to other clones) 2017-05-04 22:08:12 -07:00
zotlabs f0a2747d80 make service_plink pluggable 2017-05-04 21:55:56 -07:00
zotlabs 67918033f9 oauth2 dynamic client registration 2017-05-04 20:58:19 -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
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