| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #880 from mjfriaza/dev | git-marijus | 2017-10-22 | 2 | -1460/+1828 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | phellmes | 2017-10-21 | 2 | -1462/+1830 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-22 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not show seen notifys in notifications - show them in mod notifications in... | Mario Vavti | 2017-10-22 | 4 | -37/+47 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bring back the markdown post feature (after investing some effort to make it ... | zotlabs | 2017-10-22 | 4 | -41/+29 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong key | zotlabs | 2017-10-22 | 1 | -4/+2 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portfolio widget - CSS update | Haakon Meland Eriksen | 2017-10-22 | 3 | -1/+50 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | Andrew Manning | 2017-10-19 | 1 | -1/+5 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 parte... | Mario Vavti | 2017-10-19 | 3 | -6/+27 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 exclamation-t... | Mario Vavti | 2017-10-18 | 3 | -58/+21 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 re... | zotlabs | 2017-10-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typos in comment | Felix Wolfsteller | 2017-10-16 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_register - don't re-use the password, force them to type it in twice each... | zotlabs | 2017-10-16 | 1 | -3/+3 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation updates. I've been sitting on these for quite some time waiting... | zotlabs | 2017-10-15 | 2 | -1/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | was unable to make the modal login dialog work on the channel page with a cov... | zotlabs | 2017-10-14 | 3 | -11/+44 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | remove redundant classes | Mario Vavti | 2017-10-12 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | missing login and register links | Mario Vavti | 2017-10-12 | 1 | -1/+17 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | move affinity slider lower on screens < 767px to not collide with the page me... | Mario Vavti | 2017-10-11 | 2 | -3/+13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | remove region nav entry in network.pdl - it is not needed | Mario Vavti | 2017-10-11 | 1 | -2/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | nav_set_selected() for apps and apporder. restrict apporder to local_channel(... | Mario Vavti | 2017-10-11 | 2 | -19/+26 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | bring nav pinned apps to navbar_default | Mario Vavti | 2017-10-11 | 2 | -1/+8 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | the template is needed for the old-style notifications | zotlabs | 2017-10-11 | 1 | -0/+3 |
|/ / / / / / / / / / / / / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | bring back some nav stuff (notifications) for alternate navbars; still some t... | zotlabs | 2017-10-11 | 1 | -0/+40 |
* | | | | | | | | | | | | | | | | | | | | | | | | | for federated forums we need to keep track of what protocols are available to... | zotlabs | 2017-10-10 | 1 | -0/+16 |
* | | | | | | | | | | | | | | | | | | | | | | | | | on failed auth due to unverified email, tell the person why and remind them t... | zotlabs | 2017-10-10 | 1 | -2/+5 |