aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #897 from HaakonME/devgit-marijus2017-10-301-0/+12
|\ | | | | Added mode to Portfolio widget
| * Added mode to Portfolio widgetHaakon Meland Eriksen2017-10-291-0/+12
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-292-9/+9
| |\ | |/ |/|
* | Merge pull request #894 from mjfriaza/devgit-marijus2017-10-292-9/+9
|\ \ | | | | | | Spanish translation revised again.
| * | Spanish translation revised again.Manuel Jiménez Friaza2017-10-282-9/+9
| | |
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-271-0/+20
| | |\ | |_|/ |/| |
* | | Merge pull request #888 from anaqreon/card-contextgit-marijus2017-10-251-0/+20
|\ \ \ | | | | | | | | Context help for cards
| * | | Context help for cardsAndrew Manning2017-10-241-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 devMario Vavti2017-10-246-22/+103
|\ \ \
| * \ \ Merge pull request #884 from dawnbreak/devgit-marijus2017-10-243-21/+53
| |\ \ \ | | | | | | | | | | Update composer autoload cache.
| | * | | 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 update
* | | | | | comment out statistics link in mod pubsites until we have something ↵Mario Vavti2017-10-241-2/+2
|/ / / / / | | | | | | | | | | | | | | | functional again
| | | | * 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
| | |\ \ \ | | | | |/ | | | |/| Updated the Spanish translation
| | | * | 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 strings (also for 2.8RC)
| | | * | | 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 ↵Mario Vavti2017-10-224-37/+47
| | |/ / / | |/| | | | | | | | | | | | | instead. Update notifications count also on notifications updates
* | | | | bring back the markdown post feature (after investing some effort to make it ↵zotlabs2017-10-224-41/+29
| |/ / / |/| | | | | | | | | | | work)
* | | | 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 code
| * | 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 ↵Mario Vavti2017-10-193-6/+27
| | | | | | | | partent mid in /modrate
* | 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 ↵Mario Vavti2017-10-183-58/+21
| | | | | | | | exclamation-triangle if we have personal notifications
* | 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 ↵zotlabs2017-10-161-1/+1
| | | | | | | | remote servers doesn't come up mis-attributing the token. Future work should probably provide an actual page at this location describing it as a guest account of 'xyz'.
* | 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
| | |