| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | not sure when but the hcard went missing in webfinger | zotlabs | 2017-10-23 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-22 | 17 | -3017/+3883 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-10-22 | 4 | -2922/+3658 |
| | |\ | |||||
| | | * | Merge pull request #880 from mjfriaza/dev | git-marijus | 2017-10-22 | 2 | -1460/+1828 |
| | | |\ | | | | | | | | | Updated the Spanish translation | ||||
| | | | * | Fixed the Spanish translation | Manuel Jiménez Friaza | 2017-10-21 | 2 | -1460/+1828 |
| | | | | | |||||
| | | * | | Merge pull request #881 from phellmes/dev | git-marijus | 2017-10-22 | 2 | -1462/+1830 |
| | | |\ \ | | | | | | | | | | | Update DE translation strings (also for 2.8RC) | ||||
| | | | * | | Update DE translation strings | phellmes | 2017-10-21 | 2 | -1462/+1830 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-22 | 1 | -4/+2 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | | * | | | wrong key | zotlabs | 2017-10-22 | 1 | -4/+2 |
| | | | | | | |||||
| | * | | | | do not show seen notifys in notifications - show them in mod notifications ↵ | Mario Vavti | 2017-10-22 | 4 | -37/+47 |
| | | |/ / | |/| | | | | | | | | | | instead. Update notifications count also on notifications updates | ||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-20 | 8 | -53/+171 |
| | |\| | | |||||
| | | * | | register workflow was getting over-ridden in include/security | zotlabs | 2017-10-19 | 2 | -5/+6 |
| | | | | | |||||
| | | * | | typo | zotlabs | 2017-10-19 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | table structure for pseudo or proxy channels (pchan) | zotlabs | 2017-10-19 | 6 | -51/+165 |
| | | | | | |||||
| | * | | | Merge pull request #879 from redmatrix/anaqreon-patch-1 | git-marijus | 2017-10-20 | 1 | -1/+5 |
| | |\ \ \ | | |/ / | |/| | | Display different info message if using invite code | ||||
| | | * | | Display different info message if using invite code | Andrew Manning | 2017-10-19 | 1 | -1/+5 |
| | |/ / | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-19 | 10 | -1465/+1867 |
| |\| | | |||||
| | * | | changelog | Mario Vavti | 2017-10-20 | 1 | -0/+111 |
| | | | | |||||
| | * | | strings | Mario Vavti | 2017-10-19 | 1 | -1380/+1689 |
| | | | | |||||
| | * | | version | Mario Vavti | 2017-10-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | redirect to be moderated items to /moderate and change the conv link to ↵ | Mario Vavti | 2017-10-19 | 3 | -6/+27 |
| | | | | | | | | | | | | | partent mid in /modrate | ||||
| | * | | fix issue #837 - w2w posts not removed in contact_remove() | Mario Vavti | 2017-10-19 | 1 | -1/+2 |
| | | | | |||||
| | * | | remove redundant js | Mario Vavti | 2017-10-18 | 1 | -19/+16 |
| | | | | |||||
| | * | | streamline the notifications js and change notification icon to ↵ | Mario Vavti | 2017-10-18 | 3 | -58/+21 |
| | | | | | | | | | | | | | exclamation-triangle if we have personal notifications | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-17 | 3 | -5/+12 |
| |\| | | |||||
| | * | | update notifications if a notification area remains open | Mario Vavti | 2017-10-18 | 1 | -0/+7 |
| | | | | |||||
| | * | | don't translate 'guest:' since it is part of a url | zotlabs | 2017-10-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | ensure guests hve a unique (non-existent) url so that network discovery on ↵ | zotlabs | 2017-10-16 | 1 | -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_merge | zotlabs | 2017-10-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | mod_register - don't re-use the password, force them to type it in twice ↵ | zotlabs | 2017-10-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | each time unless their browser saves passwords. | ||||
| | * | | | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-16 | 13 | -33/+104 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | fix typos in comment | Felix Wolfsteller | 2017-10-16 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | documentation updates. I've been sitting on these for quite some time ↵ | zotlabs | 2017-10-15 | 2 | -1/+13 |
| | | | | | | | | | | | | | waiting for the current documentation work to complete; but if I leave this any longer I may forget the changes that I need to make. The last time there was a major documentation update all my intervening changes were lost, so hopefully I won't lose these and have to do them over again. | ||||
| | * | | was unable to make the modal login dialog work on the channel page with a ↵ | zotlabs | 2017-10-14 | 3 | -11/+44 |
| | | | | | | | | | | | | | cover photo. So for mod_channel, send login to the login page instead of the modal popup. | ||||
| | * | | template not hidden | zotlabs | 2017-10-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | create an actual logout module instead of relying on internal variables | zotlabs | 2017-10-12 | 2 | -5/+16 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-12 | 1 | -3/+19 |
| | |\ \ | |||||
| | * | | | sort out the notification ids | zotlabs | 2017-10-12 | 4 | -15/+22 |
| | | | | | |||||
| | * | | | typo | zotlabs | 2017-10-11 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | add local_channel as a comanche condition variable | zotlabs | 2017-10-11 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-11 | 11 | -46/+76 |
| | |\ \ \ | |||||
| | * | | | | the template is needed for the old-style notifications | zotlabs | 2017-10-11 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-12 | 1 | -3/+19 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | remove redundant classes | Mario Vavti | 2017-10-12 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | missing login and register links | Mario Vavti | 2017-10-12 | 1 | -1/+17 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-11 | 20 | -60/+200 |
| |\| | | | |||||
| | * | | | z-index issue and some icons. rename notifications-btn-1 to notifications-btn | Mario Vavti | 2017-10-11 | 4 | -6/+10 |
| | | | | | |||||
| | * | | | only show pubs notifications if discovery_tab != disabled | Mario Vavti | 2017-10-11 | 2 | -15/+19 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |