aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* work through a few more autocomplete minor nitszotlabs2018-04-261-7/+6
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2522-28/+304
|\
| * Update CHANGELOGMike Macgirvin2018-04-261-1/+1
| | | | | | more than oauth2
| * bump versionMario Vavti2018-04-251-1/+1
| |
| * drop box-shadow from generic-content-wrapper (it's probably too 90') and use ↵Mario Vavti2018-04-253-9/+10
| | | | | | | | transparent colors for borders to work better with alternate background colors
| * changelogMario Vavti2018-04-251-1/+3
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-251-3/+6
| |\
| * | rename boxy schema to focus-boxy and bs-default to focus-lightMario Vavti2018-04-255-7/+15
| | |
| * | mark simple_* schemas unmaintained and deprecatedMario Vavti2018-04-256-0/+0
| | |
| * | more css fixes for bs-default schemaMario Vavti2018-04-251-1/+1
| | |
| * | css fixes for bs-default schemaMario Vavti2018-04-251-6/+3
| | |
| * | Merge pull request #1112 from galettesaucisse/patch-16git-marijus2018-04-251-0/+179
| |\ \ | | | | | | | | Create /doc/fr/project.bb
| | * | Create /doc/fr/project.bbGalette Saucisse2018-04-251-0/+179
| | | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-253-46/+77
| |\ \ \
| * | | | show caret-down on item-photo hover to indicate a dropdown menuMario Vavti2018-04-253-0/+19
| | |/ / | |/| |
| * | | changelogMario Vavti2018-04-241-0/+70
| | | |
| * | | fix regression with forum widget unseen countMario Vavti2018-04-241-2/+2
| | | |
| * | | fix php warningsMario Vavti2018-04-241-3/+3
| | | |
* | | | function doc updatezotlabs2018-04-251-0/+1
| | | |
* | | | mod_network: privacy group query returning results when group is empty. ↵zotlabs2018-04-251-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 ↵zotlabs2018-04-252-11/+16
| | | | | | | | | | | | | | | | items, but do save these edits in case you need to recover them
* | | | malformed embeds from gfycat hubzilla issue #1108zotlabs2018-04-251-2/+4
| | | |
* | | | fine tuningzotlabs2018-04-251-1/+1
| | | |
* | | | some tagging workzotlabs2018-04-253-24/+39
| | | |
* | | | generating random numbers too large for 32-bit systemszotlabs2018-04-251-2/+2
| |_|/ |/| |
* | | undo_post_tagging - don't waste a connection query if we're undoing a ↵zotlabs2018-04-251-3/+6
| |/ |/| | | | | hashtag and not a mention.
* | make tag autocomplete less scary looking in the editor. If this works out we ↵zotlabs2018-04-243-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 ↵zotlabs2018-04-231-0/+2
| | | | signed and we may need to forward the signed data.
* minor tweak to utf8 usernames after some testing of the underlying ↵zotlabs2018-04-232-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_mergezotlabs2018-04-2317-4718/+5329
|\
| * possible fix for issue #1101Mario Vavti2018-04-231-1/+1
| |
| * strings updateMario Vavti2018-04-232-76/+108
| |
| * reverse f325c29b48b2bf954d13e89035c1e9abecdca780 - this needs discussion. ↵Mario Vavti2018-04-231-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/devgit-marijus2018-04-233-1600/+1416
| |\ | | | | | | Adding link to post source
| | * Merge pull request #10 from redmatrix/devmrjive2018-04-223-4/+28
| | |\ | | | | | | | | Dev
| | * | updated Italian translationmrjive2018-04-202-1600/+1415
| | | |
| | * | adding link to post sourcemrjive2018-04-201-0/+1
| | | |
| | * | Merge pull request #9 from redmatrix/devmrjive2018-04-1954-9094/+9274
| | |\ \ | | | | | | | | | | Dev
| | * \ \ Merge pull request #8 from redmatrix/devmrjive2018-04-166-17/+30
| | |\ \ \ | | | | | | | | | | | | Dev
| | * \ \ \ Merge pull request #7 from redmatrix/devmrjive2018-04-1417-4887/+5989
| | |\ \ \ \ | | | | | | | | | | | | | | Dev
| | * \ \ \ \ Merge pull request #6 from redmatrix/devmrjive2018-04-1312-49/+86
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ Merge pull request #5 from redmatrix/devmrjive2018-04-1253-99/+922
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ \ Merge pull request #3 from redmatrix/devmrjive2018-04-0548-222/+1068
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ \ \ Merge pull request #1 from redmatrix/devmrjive2018-03-2914-28/+57
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Dev
| * | | | | | | | | | update zot.php to fix php warning invalid argument supplied for foreach()Mario Vavti2018-04-231-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1085 which was against wrong branch
| * | | | | | | | | | Proposed fix for issue #1091 - mod-help.cssMario Vavti2018-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1098 which was against wrong branch
| * | | | | | | | | | Merge pull request #1097 from galettesaucisse/patch-13git-marijus2018-04-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Proposed fix for issue #1091 - mod-help.js
| | * | | | | | | | | | Proposed fix for issue #1091Galette Saucisse2018-04-201-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1093 from mjfriaza/devgit-marijus2018-04-232-1499/+1764
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated Spanish translation
| | * | | | | | | | | | Updated Spanish translationManuel Jiménez Friaza2018-04-202-1499/+1764
| | | | | | | | | | | |