Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-08 | 6 | -3/+74 | |
|\| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | remove extraneous logging | zotlabs | 2018-03-07 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | | | | | | hashtag autocomplete | zotlabs | 2018-03-07 | 2 | -1/+44 | |
| * | | | | | | | | | | | | | | | | | | | | federated polls: GNU-Social requires us to preserve the original order of the... | zotlabs | 2018-03-07 | 4 | -2/+32 | |
* | | | | | | | | | | | | | | | | | | | | | we need the javascript in the template since strings are involved | Mario Vavti | 2018-03-07 | 6 | -162/+181 | |
* | | | | | | | | | | | | | | | | | | | | | more bootstrap accordion fixes | Mario Vavti | 2018-03-07 | 2 | -10/+10 | |
* | | | | | | | | | | | | | | | | | | | | | we do not support separate mobile themes anymore | Mario Vavti | 2018-03-07 | 2 | -8/+8 | |
|/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | federated polls: add poll_author which will be necessary for Diaspora federation | zotlabs | 2018-03-06 | 4 | -1/+31 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-06 | 2 | -0/+144 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | update changelog | Mario Vavti | 2018-03-06 | 1 | -0/+126 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #991 from anaqreon/dev | git-marijus | 2018-03-06 | 1 | -0/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Improve rendering of Readme files in plugin settings | Andrew Manning | 2018-03-05 | 1 | -0/+18 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / | don't add pending connections to the default privacy group until accepted | zotlabs | 2018-03-06 | 1 | -7/+10 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | add pdl file for mod moderate | Mario Vavti | 2018-03-05 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | fix javascript error if there are no notifications | Mario Vavti | 2018-03-05 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | update redbasic theme screenshot | Mario Vavti | 2018-03-05 | 2 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-05 | 6 | -18/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | fix some issues with friend suggestions on standalone sites with no 'suggestm... | zotlabs | 2018-03-04 | 4 | -9/+16 | |
| * | | | | | | | | | | | | | | | | | | | bugfix: unable to reset profile fields to defaults in admin/profs by emptying... | zotlabs | 2018-03-04 | 2 | -9/+31 | |
| * | | | | | | | | | | | | | | | | | | | restrict mail messages to max_import_size | zotlabs | 2018-03-04 | 1 | -0/+7 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #989 from phellmes/dev | git-marijus | 2018-03-05 | 2 | -1466/+1804 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Update DE translation strings | phellmes | 2018-03-05 | 2 | -1466/+1804 | |
|/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | add dummy f= arg to suggestion urls, use directory version of suggest for new... | zotlabs | 2018-03-03 | 3 | -5/+5 | |
* | | | | | | | | | | | | | | | | | | There was no pdl for mod_thing; add one because it's only a link away from pr... | zotlabs | 2018-03-03 | 2 | -0/+12 | |
* | | | | | | | | | | | | | | | | | | more work on federated polls | zotlabs | 2018-03-03 | 1 | -0/+30 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-02 | 6 | -1414/+1786 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #985 from mjfriaza/dev | git-marijus | 2018-03-02 | 3 | -1412/+1748 | |
| |\| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | New strings for Spanish translation. | Manuel Jiménez Friaza | 2018-03-02 | 2 | -169/+257 | |
| | * | | | | | | | | | | | | | | | | | Updated Spanish translation (hmessages.po/php and register_verify_member.tpl). | Manuel Jiménez Friaza | 2018-03-01 | 3 | -1358/+1606 | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-02 | 6 | -11/+54 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | update DB update 1205 to mitigate | Mario Vavti | 2018-03-02 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | | | bump version | Mario Vavti | 2018-03-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | db update to drop index resource_type. we have uid_resource_type now. | Mario Vavti | 2018-03-02 | 2 | -1/+25 | |
* | | | | | | | | | | | | | | | | | | | | string change "Channel added" -> "Connection added" | zotlabs | 2018-03-02 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | process follow from article menu in the background, do not reload page - hubz... | zotlabs | 2018-03-02 | 2 | -3/+9 | |
* | | | | | | | | | | | | | | | | | | | | sort settings/featured | zotlabs | 2018-03-02 | 2 | -3/+22 | |
* | | | | | | | | | | | | | | | | | | | | add icon to any addon settings blocks which don't already have one | zotlabs | 2018-03-02 | 1 | -0/+4 | |
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | background work for caldav integration continued, modify mod_follow to allow ... | zotlabs | 2018-03-02 | 3 | -7/+48 | |
* | | | | | | | | | | | | | | | | | | | zot revision => 6.0a, not yet needed or referenced | zotlabs | 2018-03-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | add federation property to webfinger | zotlabs | 2018-03-01 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-01 | 14 | -236/+943 | |
|\| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-03-01 | 6 | -60/+696 | |
| |\| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge pull request #984 from dawnbreak/dev | git-marijus | 2018-03-01 | 4 | -30/+484 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Update composer autoload cache. | Klaus Weidenbach | 2018-03-01 | 4 | -30/+484 | |
| | * | | | | | | | | | | | | | | | | | | Merge pull request #983 from dawnbreak/QA_testing | git-marijus | 2018-03-01 | 2 | -30/+212 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | :white_check_mark: Unit Test for HTTPSig. | Klaus Weidenbach | 2018-02-28 | 2 | -30/+212 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | ||||||
| * | / | | | | | | | | | | | | | | | | fix issues with accordions in settings and comment out jquery.textinputs.js | Mario Vavti | 2018-03-01 | 6 | -20/+20 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | update strings | Mario Vavti | 2018-03-01 | 1 | -155/+226 | |
| * | | | | | | | | | | | | | | | | | version | Mario Vavti | 2018-03-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | sigh - missed two strings | zotlabs | 2018-03-01 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / / / / / |