Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-03 | 1 | -97/+616 |
|\ | | | | | | | | | | | | | Conflicts: boot.php include/items.php util/messages.po | ||||
| * | in hubzilla we're going to convert doco to items. define it here so that an ↵ | redmatrix | 2015-07-03 | 1 | -249/+300 |
| | | | | | | | | accidental import/export doesn't chuck a wobbly. | ||||
| * | project updates | redmatrix | 2015-06-26 | 1 | -194/+211 |
| | | |||||
| * | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -108/+112 |
| | | | | | | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. | ||||
| * | weekly string update | redmatrix | 2015-06-13 | 1 | -4400/+4581 |
| | | |||||
| * | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 1 | -4615/+4472 |
| | | | | | | | | util/messages.po. | ||||
| * | string/version update | redmatrix | 2015-06-06 | 1 | -174/+175 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 1 | -752/+813 |
|\| | |||||
| * | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -752/+813 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -521/+524 |
|\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | ||||
| * | add local_dir_update hook | redmatrix | 2015-05-23 | 1 | -521/+524 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -322/+327 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| * | new string file - isolating the projectname from translated strings so that ↵ | redmatrix | 2015-05-17 | 1 | -30/+31 |
| | | | | | | | | translation files will work across multiple projects. | ||||
| * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -295/+299 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -45/+61 |
|\| | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| * | rev update | redmatrix | 2015-05-10 | 1 | -45/+61 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -200/+209 |
|\| | |||||
| * | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 1 | -200/+209 |
| | | |||||
* | | second pass name change | redmatrix | 2015-05-05 | 1 | -10/+10 |
| | | |||||
* | | first pass name change | redmatrix | 2015-05-05 | 1 | -12/+12 |
|/ | |||||
* | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -1026/+982 |
| | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | ||||
* | hide event share button when editing an event | friendica | 2015-04-17 | 1 | -387/+413 |
| | |||||
* | rev update, string update | friendica | 2015-04-11 | 1 | -850/+842 |
| | |||||
* | strings update | friendica | 2015-04-03 | 1 | -1640/+1628 |
| | |||||
* | issue #941 | friendica | 2015-03-28 | 1 | -586/+660 |
| | |||||
* | config to hide version tag from siteinfo - on my site it's meaningless. | friendica | 2015-03-20 | 1 | -366/+385 |
| | |||||
* | update to-do list | friendica | 2015-03-13 | 1 | -3959/+2152 |
| | |||||
* | reverse smilie storage also | friendica | 2015-03-06 | 1 | -593/+2499 |
| | |||||
* | Fix a couple of places where we weren't checking for dead hublocs. Add a ↵ | friendica | 2015-02-27 | 1 | -2345/+2369 |
| | | | | function to mark a hubloc dead. | ||||
* | doc update | friendica | 2015-02-20 | 1 | -389/+445 |
| | |||||
* | missing param | friendica | 2015-02-13 | 1 | -3604/+3750 |
| | |||||
* | get_rel_link broken - also weekly doc updates | friendica | 2015-02-06 | 1 | -1243/+1277 |
| | |||||
* | let zot_refresh continue without a primary hub if one cannot be found. also ↵ | friendica | 2015-01-30 | 1 | -3303/+3324 |
| | | | | weekly doc updates | ||||
* | doc updates | friendica | 2015-01-23 | 1 | -875/+897 |
| | |||||
* | mod_prep usability enhancements, doc updates | friendica | 2015-01-16 | 1 | -2618/+2660 |
| | |||||
* | doc updates | friendica | 2015-01-10 | 1 | -840/+864 |
| | |||||
* | doc updates | friendica | 2015-01-02 | 1 | -1960/+1971 |
| | |||||
* | doc update | friendica | 2014-12-26 | 1 | -270/+286 |
| | |||||
* | doc updates | friendica | 2014-12-19 | 1 | -2989/+2995 |
| | |||||
* | don't import to sys channel from self-censored authors | friendica | 2014-12-12 | 1 | -807/+820 |
| | |||||
* | block adult channels from inclusion in public content feeds | friendica | 2014-12-10 | 1 | -703/+703 |
| | |||||
* | update mozilla cacert.pem | friendica | 2014-11-28 | 1 | -471/+479 |
| | |||||
* | random block widget | friendica | 2014-11-22 | 1 | -2647/+2672 |
| | |||||
* | minor changes to support forum mode | friendica | 2014-11-15 | 1 | -2942/+2956 |
| | |||||
* | rev update | friendica | 2014-11-07 | 1 | -521/+608 |
| | |||||
* | doc updates | friendica | 2014-10-31 | 1 | -1789/+1809 |
| | |||||
* | string update | friendica | 2014-10-24 | 1 | -3704/+3868 |
| | |||||
* | New util/messages.po | Jeroen | 2014-10-17 | 1 | -4009/+3853 |
| | |||||
* | improvement in source route checking when handling complex *upstream* ↵ | friendica | 2014-10-10 | 1 | -1049/+1075 |
| | | | | delivery chains, which were not adequately accounted for in the earlier checkin. | ||||
* | rev update | friendica | 2014-10-03 | 1 | -341/+346 |
| |