aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-0319-13331/+13365
|\
| * non-functional changes (changes to comments, etc.)redmatrix2015-12-021-9/+3
| * provide correct error if a directory server requires a realm_token and one wa...redmatrix2015-12-021-2/+2
| * prevent function name re-declaration in widget spaceredmatrix2015-12-021-4/+5
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-0210-13301/+13326
| |\
| | * es+nl and bluegrid updatejeroenpraat2015-12-035-13295/+13301
| | * fix nav search popup active background colorMario Vavti2015-12-021-0/+7
| | * fix mail attachment and photo permissions. issue #202Mario Vavti2015-12-021-4/+5
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-024-7/+11
| | |\
| | * | fix attachment rendering for mailMario Vavti2015-12-024-2/+13
| * | | introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin...redmatrix2015-12-023-5/+17
| | |/ | |/|
| * | issue #204redmatrix2015-12-011-1/+1
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-011-1/+6
| |\ \
| | * \ Merge pull request #200 from anaqreon/update-addon-scriptredmatrix2015-12-021-1/+6
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-ad...Andrew Manning2015-11-306-122/+177
| | | |\
| | | * | Abort addon update if repo does not existAndrew Manning2015-11-301-1/+6
| * | | | usercache is no longer usedredmatrix2015-12-012-5/+4
| |/ / /
| * | | fix badge padding in narrow navbarMario Vavti2015-12-012-1/+1
| * | | make narrow navbar setting work againMario Vavti2015-12-012-3/+1
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-0111-6759/+6830
|\| | |
| * | | versionredmatrix2015-11-301-1/+1
| * | | Merge pull request #201 from wave72/masterWave2015-11-302-6634/+6637
| |\ \ \ | | |_|/ | |/| |
| | * | Updated Italian stringsPaolo Tacconi2015-11-302-6634/+6637
| | * | Merge pull request #3 from redmatrix/masterWave2015-11-25525-14424/+116761
| | |\ \
| * | | | generalise the site black|white allow lists, also add a channel black|white l...redmatrix2015-11-294-26/+63
| * | | | report correct directory mode for standalone directories in siteinforedmatrix2015-11-291-1/+1
| * | | | create get_site_info() function so we can have a siteinfo.json module instead...redmatrix2015-11-293-97/+115
| | |_|/ | |/| |
| * | | issue #189redmatrix2015-11-292-1/+7
| * | | don't try to pull public content from dead sitesredmatrix2015-11-291-1/+4
| * | | log whatever is showing up in the delivery hash array since it seems that one...redmatrix2015-11-292-1/+5
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-297-30/+51
|\| | |
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-287-30/+51
| |\ \ \
| | * | | reflect in form if we are editing or creatingMario Vavti2015-11-281-7/+7
| | * | | css fixesMario Vavti2015-11-285-22/+43
| * | | | versionredmatrix2015-11-281-1/+1
* | | | | Resolving merge conflictHaakon Meland Eriksen2015-11-299-302/+49
* | | | | My version of jot.tplHaakon Meland Eriksen2015-11-281-49/+58
* | | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-2827-4462/+4962
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | fix tpl if clauseMario Vavti2015-11-281-1/+1
| |/ / /
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-2713-107/+128
| |\ \ \
| | * | | Reverted.ken restivo2015-11-271-6/+0
| | * | | Re-reading zottel's excellent docs, 70 seems the recommended default. Changed.ken restivo2015-11-271-1/+1
| | * | | More sane defaults, to avoid problems. Addresses #188ken restivo2015-11-271-0/+1
| | * | | Safe defaults to prevent #188ken restivo2015-11-271-0/+6
| | * | | add templatesMario Vavti2015-11-272-0/+23
| | * | | move events tools to aside widgetMario Vavti2015-11-275-25/+34
| | * | | css fixesMario Vavti2015-11-273-71/+23
| | * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-271-0/+41
| | |\ \ \
| | | * \ \ Merge pull request #193 from zzottel/mastergit-marijus2015-11-271-0/+41
| | | |\ \ \
| | | | * | | added info about Apache settings to avoid Apache running wildzottel2015-11-271-0/+41
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:44:10 +0000