aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-02-1913-83/+84
| | |\ \
| | * | | pimp up mod new_channelMario Vavti2016-02-198-239/+68
| * | | | get_feature_default() was using filtered view, preventing it from working in ...redmatrix2016-02-191-1/+1
| | |/ / | |/| |
| * | | issue #287 require old password to change passwordredmatrix2016-02-192-29/+40
| * | | no linefeed at endredmatrix2016-02-191-1/+1
| * | | finish up the storage moveredmatrix2016-02-197-1447/+5
| * | | move storage assets to zotlabs/storageredmatrix2016-02-1911-39/+1471
| |/ /
| * | siteinfo regression with Zotlabs\Project - add an autoloaderredmatrix2016-02-182-2/+19
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-188-2565/+2667
| |\ \
| * | | Provide Zotlabs\Project and System class for querying details about the proje...redmatrix2016-02-1816-77/+87
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-1855-11648/+14661
|\ \ \ \ | | |/ / | |/| |
| * | | h1>h2 (thanks to Mario) and help text below label on register page (like on n...jeroenpraat2016-02-184-7/+10
| * | | Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a...jeroenpraat2016-02-184-11/+22
| * | | Merge pull request #286 from wave72/masterWave2016-02-182-2549/+2637
| |\ \ \ | | |/ / | |/| / | | |/
| | * updated Italian stringsPaolo Tacconi2016-02-182-2549/+2637
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 12:17:11 +0000