aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-243-3/+10
|\
| * 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 devHaakon Meland Eriksen2017-10-2416-3058/+3859
|\|
| * 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
| |\
| | * 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
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | do not show seen notifys in notifications - show them in mod notifications in...Mario Vavti2017-10-224-37/+47
| | | |/ / | | |/| |
| * | | | bring back the markdown post feature (after investing some effort to make it ...zotlabs2017-10-224-41/+29
| | |/ / | |/| |
| * | | wrong keyzotlabs2017-10-221-4/+2
* | | | Portfolio widget - CSS updateHaakon Meland Eriksen2017-10-223-1/+50
| |/ / |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-208-53/+171
|\| |
| * | register workflow was getting over-ridden in include/securityzotlabs2017-10-192-5/+6
| * | typozotlabs2017-10-191-1/+1
| * | table structure for pseudo or proxy channels (pchan)zotlabs2017-10-196-51/+165
* | | Merge pull request #879 from redmatrix/anaqreon-patch-1git-marijus2017-10-201-1/+5
|\ \ \ | |/ / |/| |
| * | Display different info message if using invite codeAndrew Manning2017-10-191-1/+5
|/ /
* | changelogMario Vavti2017-10-201-0/+111
* | stringsMario Vavti2017-10-191-1380/+1689
* | versionMario Vavti2017-10-191-1/+1
* | redirect to be moderated items to /moderate and change the conv link to parte...Mario Vavti2017-10-193-6/+27
* | fix issue #837 - w2w posts not removed in contact_remove()Mario Vavti2017-10-191-1/+2
* | remove redundant jsMario Vavti2017-10-181-19/+16
* | streamline the notifications js and change notification icon to exclamation-t...Mario Vavti2017-10-183-58/+21
* | update notifications if a notification area remains openMario Vavti2017-10-181-0/+7
* | don't translate 'guest:' since it is part of a urlzotlabs2017-10-161-1/+1
* | ensure guests hve a unique (non-existent) url so that network discovery on re...zotlabs2017-10-161-1/+1
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-161-1/+1
|\ \
| * | fix typos in commentFelix Wolfsteller2017-10-161-1/+1
* | | mod_register - don't re-use the password, force them to type it in twice each...zotlabs2017-10-161-3/+3
* | | regression in zot site info after zot6 workzotlabs2017-10-161-4/+6
|/ /
* | documentation updates. I've been sitting on these for quite some time waiting...zotlabs2017-10-152-1/+13
* | was unable to make the modal login dialog work on the channel page with a cov...zotlabs2017-10-143-11/+44
* | template not hiddenzotlabs2017-10-131-1/+1
* | create an actual logout module instead of relying on internal variableszotlabs2017-10-122-5/+16
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-121-3/+19
|\ \
| * | remove redundant classesMario Vavti2017-10-121-2/+2
| * | missing login and register linksMario Vavti2017-10-121-1/+17
* | | sort out the notification idszotlabs2017-10-124-15/+22
* | | typozotlabs2017-10-111-1/+2
* | | add local_channel as a comanche condition variablezotlabs2017-10-111-0/+4
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1111-46/+76
|\| |
| * | z-index issue and some icons. rename notifications-btn-1 to notifications-btnMario Vavti2017-10-114-6/+10
| * | only show pubs notifications if discovery_tab != disabledMario Vavti2017-10-112-15/+19
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 05:07:17 +0000