Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-25 | 22 | -28/+304 | |
|\| | | | | ||||||
| * | | | | Update CHANGELOG | Mike Macgirvin | 2018-04-26 | 1 | -1/+1 | |
| | |_|/ | |/| | | | | | | more than oauth2 | |||||
| * | | | bump version | Mario Vavti | 2018-04-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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 | |||||
| * | | | changelog | Mario Vavti | 2018-04-25 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-25 | 1 | -3/+6 | |
| |\ \ \ | ||||||
| * | | | | 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 pull request #1112 from galettesaucisse/patch-16 | git-marijus | 2018-04-25 | 1 | -0/+179 | |
| |\ \ \ \ | | | | | | | | | | | | | Create /doc/fr/project.bb | |||||
| | * | | | | Create /doc/fr/project.bb | Galette Saucisse | 2018-04-25 | 1 | -0/+179 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-25 | 3 | -46/+77 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | show caret-down on item-photo hover to indicate a dropdown menu | Mario Vavti | 2018-04-25 | 3 | -0/+19 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | changelog | Mario Vavti | 2018-04-24 | 1 | -0/+70 | |
| | | | | | | ||||||
| * | | | | | fix regression with forum widget unseen count | Mario Vavti | 2018-04-24 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | fix php warnings | Mario Vavti | 2018-04-24 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | function doc update | zotlabs | 2018-04-25 | 1 | -0/+1 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | mod_network: privacy group query returning results when group is empty. ↵ | zotlabs | 2018-04-25 | 1 | -8/+5 | |
| | | | | | | | | | | | | | | | | | | | | Notification that the group is empty was also displayed twice. | |||||
* | | | | | 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 | |||||
* | | | | | malformed embeds from gfycat hubzilla issue #1108 | zotlabs | 2018-04-25 | 1 | -2/+4 | |
| | | | | | ||||||
* | | | | | fine tuning | zotlabs | 2018-04-25 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | some tagging work | zotlabs | 2018-04-25 | 3 | -24/+39 | |
| | | | | | ||||||
* | | | | | generating random numbers too large for 32-bit systems | zotlabs | 2018-04-25 | 1 | -2/+2 | |
| |_|/ / |/| | | | ||||||
* | | | | undo_post_tagging - don't waste a connection query if we're undoing a ↵ | zotlabs | 2018-04-25 | 1 | -3/+6 | |
| |/ / |/| | | | | | | | | hashtag and not a mention. | |||||
* | | | make tag autocomplete less scary looking in the editor. If this works out we ↵ | zotlabs | 2018-04-24 | 3 | -46/+77 | |
|/ / | | | | | | | can simplify and get rid of a huge amount of spaghetti tag logic. | |||||
* | | added variable to store the raw json string as received, since this is ↵ | zotlabs | 2018-04-23 | 1 | -0/+2 | |
| | | | | | | | | signed and we may need to forward the signed data. | |||||
* | | minor tweak to utf8 usernames after some testing of the underlying ↵ | zotlabs | 2018-04-23 | 2 | -0/+10 | |
| | | | | | | | | encode/decode funations. This probably isn't critical and I do not have a failure case but just trying to cover all bases. | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-04-23 | 17 | -4718/+5329 | |
|\ \ | ||||||
| * | | possible fix for issue #1101 | Mario Vavti | 2018-04-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | strings update | Mario Vavti | 2018-04-23 | 2 | -76/+108 | |
| | | | ||||||
| * | | 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 | |||||
| | * \ | Merge pull request #10 from redmatrix/dev | mrjive | 2018-04-22 | 3 | -4/+28 | |
| | |\ \ | | | | | | | | | | | Dev | |||||
| | * | | | updated Italian translation | mrjive | 2018-04-20 | 2 | -1600/+1415 | |
| | | | | | ||||||
| | * | | | adding link to post source | mrjive | 2018-04-20 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Merge pull request #9 from redmatrix/dev | mrjive | 2018-04-19 | 54 | -9094/+9274 | |
| | |\ \ \ | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ | Merge pull request #8 from redmatrix/dev | mrjive | 2018-04-16 | 6 | -17/+30 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ | Merge pull request #7 from redmatrix/dev | mrjive | 2018-04-14 | 17 | -4887/+5989 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ \ | Merge pull request #6 from redmatrix/dev | mrjive | 2018-04-13 | 12 | -49/+86 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ \ \ | Merge pull request #5 from redmatrix/dev | mrjive | 2018-04-12 | 53 | -99/+922 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ \ \ \ | Merge pull request #3 from redmatrix/dev | mrjive | 2018-04-05 | 48 | -222/+1068 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #1 from redmatrix/dev | mrjive | 2018-03-29 | 14 | -28/+57 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| * | | | | | | | | | | | update zot.php to fix php warning invalid argument supplied for foreach() | Mario Vavti | 2018-04-23 | 1 | -16/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1085 which was against wrong branch | |||||
| * | | | | | | | | | | | 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 #1090 from galettesaucisse/patch-12 | git-marijus | 2018-04-23 | 1 | -0/+73 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Create /doc/fr/toc.html |