Commit Graph

19100 Commits

Author SHA1 Message Date
git-marijus 76a8711570 Merge pull request #766 from phellmes/dev
Update DE translation strings (also for 2.4RC)
2017-05-10 14:52:41 +02:00
zotlabs 60204becf4 don't allow html in plugin comment blocks 2017-05-10 14:49:32 +02:00
zotlabs 032216153f use correct data type 2017-05-10 14:49:07 +02:00
zotlabs dac4447e33 zot protocol doco updates 2017-05-10 14:48:49 +02:00
zotlabs fa94c0a65b handle mastodon urls in markdown/bbcode conversion 2017-05-10 14:48:04 +02:00
phellmes 96cc6a916d Update DE translation strings 2017-05-09 16:00:02 +02:00
Mario Vavti 6c0e0b3eae make all label bold 2017-05-09 10:25:12 +02:00
git-marijus 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-marijus 13b5eb0ad8 Merge pull request #762 from mjfriaza/dev
Updated the Spanish translation
2017-05-09 10:07:51 +02: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
zotlabs 40c8549cf5 get rid of edit activities 2017-05-08 11:12:09 +02:00
zotlabs a7ea370ec3 cover photo was unintentionally disabled when block_public in effect 2017-05-08 11:11:50 +02:00
git-marijus 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-marijus 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
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-marijus 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-marijus 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 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
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-marijus 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-marijus 45c64c2d2e Merge pull request #749 from anaqreon/dev
German translations for demohub
2017-05-04 09:56:45 +02:00
git-marijus 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 Manning 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-marijus 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
zotlabs d8460f147b use hostname, not url 2017-05-01 15:14:25 +02:00
zotlabs 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
zotlabs d3fcef43f8 ugly postgres fixes 2017-05-01 15:13:53 +02:00
zotlabs cbc906c438 more work on client side e2ee 2017-05-01 15:12:43 +02:00
zotlabs 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