Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-25 | 17 | -22/+47 |
|\ | |||||
| * | drop box-shadow from generic-content-wrapper (it's probably too 90') and use ↵ | Mario Vavti | 2018-04-25 | 3 | -9/+10 |
| | | | | | | | | transparent colors for borders to work better with alternate background colors | ||||
| * | rename boxy schema to focus-boxy and bs-default to focus-light | Mario Vavti | 2018-04-25 | 5 | -7/+15 |
| | | |||||
| * | mark simple_* schemas unmaintained and deprecated | Mario Vavti | 2018-04-25 | 6 | -0/+0 |
| | | |||||
| * | more css fixes for bs-default schema | Mario Vavti | 2018-04-25 | 1 | -1/+1 |
| | | |||||
| * | css fixes for bs-default schema | Mario Vavti | 2018-04-25 | 1 | -6/+3 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-25 | 1 | -6/+1 |
| |\ | |||||
| * | | show caret-down on item-photo hover to indicate a dropdown menu | Mario Vavti | 2018-04-25 | 3 | -0/+19 |
| | | | |||||
* | | | don't load jot autosave content into other document types or edits of other ↵ | zotlabs | 2018-04-25 | 2 | -11/+16 |
| | | | | | | | | | | | | items, but do save these edits in case you need to recover them | ||||
* | | | some tagging work | zotlabs | 2018-04-25 | 1 | -15/+15 |
| |/ |/| | |||||
* | | make tag autocomplete less scary looking in the editor. If this works out we ↵ | zotlabs | 2018-04-24 | 1 | -6/+1 |
|/ | | | | can simplify and get rid of a huge amount of spaghetti tag logic. | ||||
* | reverse f325c29b48b2bf954d13e89035c1e9abecdca780 - this needs discussion. ↵ | Mario Vavti | 2018-04-23 | 1 | -1/+0 |
| | | | | there is a link to source in the item menu. we might consider linking the timestamp to the source item (like some of the federated networks do) but then remove it from the item dropdown (having things double proved to confuse people). imo the link in the dropdown menu should be sufficient though. | ||||
* | Merge pull request #1094 from mrjive/dev | git-marijus | 2018-04-23 | 3 | -1600/+1416 |
|\ | | | | | Adding link to post source | ||||
| * | updated Italian translation | mrjive | 2018-04-20 | 2 | -1600/+1415 |
| | | |||||
| * | adding link to post source | mrjive | 2018-04-20 | 1 | -0/+1 |
| | | |||||
* | | Proposed fix for issue #1091 - mod-help.css | Mario Vavti | 2018-04-23 | 1 | -2/+2 |
| | | | | | | | | - this is taken from pr #1098 which was against wrong branch | ||||
* | | Merge pull request #1097 from galettesaucisse/patch-13 | git-marijus | 2018-04-23 | 1 | -1/+1 |
|\ \ | | | | | | | Proposed fix for issue #1091 - mod-help.js | ||||
| * | | Proposed fix for issue #1091 | Galette Saucisse | 2018-04-20 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1093 from mjfriaza/dev | git-marijus | 2018-04-23 | 2 | -1499/+1764 |
|\ \ | | | | | | | Updated Spanish translation | ||||
| * | | Updated Spanish translation | Manuel Jiménez Friaza | 2018-04-20 | 2 | -1499/+1764 |
| | | | |||||
* | | | Merge pull request #1084 from galettesaucisse/patch-9 | git-marijus | 2018-04-23 | 1 | -1434/+1642 |
|\ \ \ | | | | | | | | | Update French hmessages.po from Transifex | ||||
| * | | | Update French hmessages.po from Transifex | Galette Saucisse | 2018-04-18 | 1 | -1434/+1642 |
| | | | | |||||
* | | | | Merge pull request #1083 from galettesaucisse/patch-8 | git-marijus | 2018-04-23 | 1 | -62/+105 |
|\ \ \ \ | | | | | | | | | | | Update French hstrings.php from Transifex | ||||
| * | | | | Update French hstrings.php from Transifex | Galette Saucisse | 2018-04-18 | 1 | -62/+105 |
| |/ / / | |||||
* | | / | fix navbar contact autocomplete 'undefined' hovertip | zotlabs | 2018-04-19 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-19 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | just provide the trending tags in public stream by default and simplify the ↵ | zotlabs | 2018-04-18 | 1 | -1/+0 |
| | | | | | | | | | | | | query to improve load times; I intend to do additional work on this feature later | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-18 | 3 | -2/+11 |
|\| | | |||||
| * | | fine tuning the public stream tag results | zotlabs | 2018-04-17 | 1 | -1/+1 |
| | | | |||||
| * | | public stream tag enhancements | zotlabs | 2018-04-17 | 1 | -0/+4 |
| | | | |||||
| * | | when changing cover photo, show existing | zotlabs | 2018-04-17 | 2 | -2/+7 |
| | | | |||||
* | | | update to bootstrap-4.1 and improve visibility of some text when using ↵ | Mario Vavti | 2018-04-17 | 3 | -5/+6 |
|/ / | | | | | | | custom panel colours | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-16 | 1 | -0/+3 |
|\ \ | |||||
| * | | css fixes | Mario Vavti | 2018-04-15 | 1 | -0/+3 |
| | | | |||||
* | | | update the search js | zotlabs | 2018-04-16 | 1 | -1/+10 |
|/ / | |||||
* | | Update hstrings.php | Galette Saucisse | 2018-04-13 | 1 | -338/+478 |
| | | |||||
* | | Update hmessages.po | Galette Saucisse | 2018-04-13 | 1 | -3013/+3790 |
| | | |||||
* | | fix illegal string offset warning | Mario Vavti | 2018-04-13 | 2 | -2/+2 |
| | | |||||
* | | fix wrong item key | Mario Vavti | 2018-04-13 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-13 | 1 | -15/+36 |
|\ \ | |||||
| * | | autosave comment enhancements | zotlabs | 2018-04-12 | 1 | -9/+15 |
| | | | |||||
| * | | work on autosave | zotlabs | 2018-04-12 | 1 | -15/+30 |
| | | | |||||
* | | | provide visible star status for starred posts | Mario Vavti | 2018-04-13 | 3 | -58/+26 |
| | | | |||||
* | | | move the thread author menu to to the wall item photo. the menu list was ↵ | Mario Vavti | 2018-04-13 | 2 | -14/+20 |
|/ / | | | | | | | getting too long. | ||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-12 | 1 | -1/+0 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-11 | 3 | -2/+4 |
| |\ \ | |||||
| * | | | channel delegation: push current identity and pop it on logout from the ↵ | zotlabs | 2018-04-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | delegated channel. This fixes the known issue of being forced to log back in after leaving the delegated channel. | ||||
* | | | | fix issue #1047 | Mario Vavti | 2018-04-12 | 1 | -1/+3 |
| |/ / |/| | | |||||
* | | | also clean localStorage upon logout or channel switch | Mario Vavti | 2018-04-11 | 1 | -1/+2 |
| | | | |||||
* | | | allow to toggle visibility of likes/dislikes in notifications | Mario Vavti | 2018-04-11 | 1 | -0/+1 |
| | | |