aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2528-63/+576
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-241-6/+6
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-259-9/+46
| | |\
| | * | another dutch updatejeroenpraat2016-02-251-6/+6
| * | | issue #216 - calendar sharingredmatrix2016-02-248-10/+425
| | |/ | |/|
| * | schema change to support channel move (a completely different operation than ...redmatrix2016-02-245-4/+23
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-244-9/+6
| |\|
| | * interim dutch string updatejeroenpraat2016-02-251-3/+3
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-251-5/+1
| | |\
| | | * fix boxy schemeMario Vavti2016-02-251-5/+1
| | * | fix TOSjeroenpraat2016-02-251-0/+1
| | |/
| | * give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to ...Mario Vavti2016-02-241-1/+1
| * | add 'requires' field to plugin info to list other dependent plugins/addons an...redmatrix2016-02-244-5/+23
| |/
| * missing functionredmatrix2016-02-246-24/+26
| * function to process atom stream without actually storing anythingredmatrix2016-02-232-6/+68
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2477-14152/+14543
|\|
| * Merge pull request #297 from bashrc/bashrc/commagit-marijus2016-02-231-1/+1
| |\
| | * Remove stray commaBob Mottram2016-02-231-1/+1
| |/
| * Merge pull request #296 from wave72/masterWave2016-02-232-1564/+1641
| |\
| | * Updated Italian stringsPaolo Tacconi2016-02-232-1564/+1641
| * | change wording in case where registration is by apprval onlyMario Vavti2016-02-231-1/+1
| * | add salmon key paramredmatrix2016-02-222-1/+6
| * | pubsites: network column is not needed anymore (mentioned in intro text). Bec...jeroenpraat2016-02-221-2/+2
| * | only hubs from local configured project on pubsites (hubzilla by default). as...jeroenpraat2016-02-221-5/+2
| * | change wordingMario Vavti2016-02-221-1/+1
| * | some work on mod/registerMario Vavti2016-02-228-226/+115
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-215-7193/+7480
| |\ \
| | * | I don't think we need redmatrix hubs (or hubs without no project name) in thi...jeroenpraat2016-02-221-1/+6
| | * | Merge pull request #290 from anaqreon/homeinstallredmatrix2016-02-222-8/+26
| | |\ \
| | | * | Renamed homeinstall config file and added check for required config parameter...Andrew Manning2016-02-202-8/+20
| | | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into homeinstallAndrew Manning2016-02-205-1337/+1411
| | | |\ \
| | | * | | Added sendmail installation to .homeinstall script so that hub can send email...Andrew Manning2016-02-191-0/+6
| | * | | | Merge pull request #291 from phellmes/de201602201300redmatrix2016-02-222-7184/+7448
| | |\ \ \ \
| | | * | | | Update DE stringsphellmes2016-02-202-7184/+7448
| * | | | | | remove bookmark identifier from embedded links since they aren't bookmarkable...redmatrix2016-02-211-1/+1
| |/ / / / /
| * | | | | retry the move of AccessList to composer format (one or more third-party plug...redmatrix2016-02-2116-80/+83
| * | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-2111-3169/+3348
| |\ \ \ \ \
| | * | | | | There was nothing wrong with my pimped pubsites (was another problem). Took t...jeroenpraat2016-02-218-3152/+3342
| | * | | | | Revert pubsites.php. There seems something wrong. Let me troubleshoot that fi...jeroenpraat2016-02-211-12/+5
| | * | | | | Pimped the pubsites page. I tried to get this into a .tpl-file, but it was to...jeroenpraat2016-02-212-10/+14
| | | |_|/ / | | |/| | |
| | * | | | grid->network, whitespace and bootstrapify create buttonMario Vavti2016-02-202-12/+4
| | |/ / /
| * / / / fix double encodingredmatrix2016-02-212-4/+5
| |/ / /
| * | | Revert "move accesslist class to namespace"redmatrix2016-02-2015-22/+22
| * | | move accesslist class to namespaceredmatrix2016-02-2015-22/+22
| * | | ensure auto_channel_create() is executed for all workflows when UNO is set.redmatrix2016-02-191-2/+2
| * | | string updateredmatrix2016-02-191-1315/+1364
| * | | issue #288 allow relative_date() to be translated into languages with more th...redmatrix2016-02-191-8/+41
| |/ /
| * | add router classredmatrix2016-02-193-188/+205
| * | move dreport to zotlabs\zot namespaceredmatrix2016-02-192-8/+5
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-198-239/+68
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 07:21:29 +0000