Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #894 from mjfriaza/dev | git-marijus | 2017-10-29 | 2 | -9/+9 |
|\ | | | | | Spanish translation revised again. | ||||
| * | Spanish translation revised again. | Manuel Jiménez Friaza | 2017-10-28 | 2 | -9/+9 |
| | | |||||
* | | Merge pull request #882 from HaakonME/dev | git-marijus | 2017-10-24 | 3 | -1/+50 |
|\ \ | | | | | | | Portfolio widget - CSS update | ||||
| * | | Portfolio widget - CSS update | Haakon Meland Eriksen | 2017-10-22 | 3 | -1/+50 |
| | | | |||||
* | | | mod_display: provide alternate serialisations (starting with atom) | zotlabs | 2017-10-22 | 1 | -0/+2 |
| | | | |||||
* | | | 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 |
| | |/ | |/| | |||||
* / | | do not show seen notifys in notifications - show them in mod notifications ↵ | Mario Vavti | 2017-10-22 | 2 | -2/+10 |
|/ / | | | | | | | instead. Update notifications count also on notifications updates | ||||
* | | 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 | ||||
* | | update notifications if a notification area remains open | Mario Vavti | 2017-10-18 | 1 | -0/+7 |
| | | |||||
* | | was unable to make the modal login dialog work on the channel page with a ↵ | zotlabs | 2017-10-14 | 2 | -2/+30 |
| | | | | | | | | 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 |
| | | |||||
* | | 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 | 3 | -14/+20 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-11 | 8 | -12/+33 |
|\| | | |||||
| * | | 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 | 1 | -0/+2 |
| | | | |||||
| * | | move affinity slider lower on screens < 767px to not collide with the page ↵ | Mario Vavti | 2017-10-11 | 2 | -3/+13 |
| | | | | | | | | | | | | menu button | ||||
| * | | remove region nav entry in network.pdl - it is not needed | Mario Vavti | 2017-10-11 | 1 | -2/+0 |
| | | | |||||
| * | | 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 |
|/ / | |||||
* | | rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection ↵ | zotlabs | 2017-10-10 | 1 | -0/+0 |
| | | | | | | | | code is consistent | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-10 | 10 | -209/+67 |
|\ \ | |||||
| * | | css fixes | Mario Vavti | 2017-10-10 | 3 | -4/+7 |
| | | | |||||
| * | | remove notifications code from nav and go live with new notifications | Mario Vavti | 2017-10-10 | 3 | -145/+3 |
| | | | |||||
| * | | remove left_align mode | Mario Vavti | 2017-10-10 | 5 | -24/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-10 | 3 | -53/+40 |
| |\ \ | |||||
| * | | | new notification fixes | Mario Vavti | 2017-10-10 | 3 | -42/+60 |
| | | | | |||||
* | | | | pdledit usability improvements | zotlabs | 2017-10-10 | 1 | -0/+3 |
| |/ / |/| | | |||||
* | | | more custom navbar work | zotlabs | 2017-10-09 | 3 | -53/+40 |
|/ / | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-09 | 5 | -3/+302 |
|\ \ | |||||
| * | | ability to pin apps to the navbar when using named navbars | zotlabs | 2017-10-08 | 2 | -0/+8 |
| | | | |||||
| * | | alternate navbar layouts | zotlabs | 2017-10-08 | 3 | -3/+290 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 7 | -24/+39 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 49 | -21/+229 |
| |\ \ \ | |||||
| * | | | | navbar controls now functionally hidden with too low z-index when ↵ | zotlabs | 2017-10-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | cover_photo is showing and navbar doesn't have class fixed-top | ||||
* | | | | | new notification changes - use sticky_kit instead of position fixed | Mario Vavti | 2017-10-09 | 5 | -16/+19 |
| | | | | | |||||
* | | | | | more new notifications fixes | Mario Vavti | 2017-10-09 | 4 | -30/+26 |
| |_|/ / |/| | | | |||||
* | | | | more fixes | Mario Vavti | 2017-10-08 | 1 | -0/+3 |
| | | | | |||||
* | | | | new notification fixes | Mario Vavti | 2017-10-08 | 6 | -24/+36 |
| |/ / |/| | | |||||
* | | | experimental new notifications - needs pconfig experimental_notif set to 1 ↵ | Mario Vavti | 2017-10-08 | 48 | -17/+221 |
| | | | | | | | | | | | | for your channel to work. | ||||
* | | | fix filestorage spinner | Mario Vavti | 2017-10-07 | 1 | -1/+1 |
| | | | |||||
* | | | introduce public stream notifications | Mario Vavti | 2017-10-06 | 1 | -3/+7 |
|/ / | |||||
* | | update some old spinners which were causing js issues | zotlabs | 2017-10-05 | 5 | -14/+14 |
| | | |||||
* | | Experimental alternate channel_menu navigation. To use, "util/config ↵ | zotlabs | 2017-10-05 | 2 | -3/+15 |
| | | | | | | | | system.channel_menu 1" |