aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-271-0/+20
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-244-23/+55
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-243-3/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-2416-3058/+3859
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | don't perform zot_refresh on dead sites unless $force is setzotlabs2017-11-011-0/+10
* | | | | | | | | | | do not send message_list responses to dead sites (this delivery method bypass...zotlabs2017-11-011-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | support for netselect queryzotlabs2017-11-016-8/+33
* | | | | | | | | | Maria's profile photo issue, please push to master.zotlabs2017-11-012-2/+12
* | | | | | | | | | provide personal config for channel_menu; the site can set an initial site-wi...zotlabs2017-10-312-0/+4
* | | | | | | | | | pdledit - show original/system layout text for comparisonzotlabs2017-10-312-2/+9
* | | | | | | | | | add another delivery control parameter (force queue threshold)zotlabs2017-10-313-3/+17
* | | | | | | | | | bring back sitesearch widget in mod_search because some screen modes don't ha...zotlabs2017-10-311-1/+1
* | | | | | | | | | move tile styles to theme instead of template filezotlabs2017-10-302-7/+30
* | | | | | | | | | use 1) personal setting, 2) site setting, 3) default false - for system.chann...zotlabs2017-10-301-1/+1
* | | | | | | | | | provide a 'tile' view (view only) mode to mod_cloudzotlabs2017-10-304-0/+73
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | memory overflow trying to delete a connection with a very high noise to signa...zotlabs2017-10-291-1/+1
* | | | | | | | | add some documentation about shareable widgetszotlabs2017-10-291-2/+32
* | | | | | | | | allow plugin class widgets, fix sql error in page modulezotlabs2017-10-293-12/+4
* | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-292-9/+9
|\| | | | | | | |
| * | | | | | | | Merge pull request #894 from mjfriaza/devgit-marijus2017-10-292-9/+9
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Spanish translation revised again.Manuel Jiménez Friaza2017-10-282-9/+9
* | | | | | | | | fix "unstar"zotlabs2017-10-281-1/+1
* | | | | | | | | 1/2 of hubzilla issue #893zotlabs2017-10-261-0/+6
* | | | | | | | | encrypt the owa tokenzotlabs2017-10-262-4/+13
* | | | | | | | | hubzilla issue #890, separate the pdl preview feature from the mod_page webpa...zotlabs2017-10-251-7/+15
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-2510-27/+128
|\| | | | | | |
| * | | | | | | Merge pull request #888 from anaqreon/card-contextgit-marijus2017-10-251-0/+20
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Context help for cardsAndrew Manning2017-10-241-0/+20
| |/ / / / /
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-10-246-22/+103
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #884 from dawnbreak/devgit-marijus2017-10-243-21/+53
| | |\ \ \ \ \
| | | * | | | | We call Theme:url() statically, make it also static.Klaus Weidenbach2017-10-231-17/+27
| | | * | | | | Update composer autoload cache.Klaus Weidenbach2017-10-232-4/+26
| | * | | | | | Merge pull request #882 from HaakonME/devgit-marijus2017-10-243-1/+50
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | / | | | |_|_|_|/ | | |/| | | |
| | | * | | | Portfolio widget - CSS updateHaakon Meland Eriksen2017-10-223-1/+50
| * | | | | | comment out statistics link in mod pubsites until we have something functiona...Mario Vavti2017-10-241-2/+2
| |/ / / / /
| * | | | | not sure when but the hcard went missing in webfingerzotlabs2017-10-231-0/+7
| * | | | | acl encoding issueszotlabs2017-10-232-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-237-95/+152
|\| | | |
| * | | | hubzilla issue #885zotlabs2017-10-231-0/+8
| * | | | mod_display: provide alternate serialisations (starting with atom)zotlabs2017-10-222-54/+115
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-229-2959/+3712
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | bring back the markdown post feature (after investing some effort to make it ...zotlabs2017-10-224-41/+29
* | | | | not sure when but the hcard went missing in webfingerzotlabs2017-10-231-0/+7
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-2217-3017/+3883
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-10-224-2922/+3658
| |\ \ \ \
| | * \ \ \ Merge pull request #880 from mjfriaza/devgit-marijus2017-10-222-1460/+1828
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed the Spanish translationManuel Jiménez Friaza2017-10-212-1460/+1828
| | * | | | Merge pull request #881 from phellmes/devgit-marijus2017-10-222-1462/+1830
| | |\ \ \ \
| | | * | | | Update DE translation stringsphellmes2017-10-212-1462/+1830
| | | | |_|/ | | | |/| |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-221-4/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |