aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-2413-1710/+1761
|\
| * After reading and talking with experts I came to the conclusion that es-es an...jeroenpraat2015-12-2412-23098/+1
| * reverted my previous commit. this is going to be fixed remotely upstream. Mea...jeroenpraat2015-12-2321-20/+1
| * Spanish language codes. See issue #234jeroenpraat2015-12-2341-0/+23117
| * update es+nl stringsjeroenpraat2015-12-224-1710/+1760
* | start on refactor of plugin/theme/widget info block parsingredmatrix2015-12-221-6/+7
|/
* merge hellredmatrix2015-12-201-30/+39
* Updated Norwegian strings for HubzillaHaakon Meland Eriksen2015-12-202-1591/+1669
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-202-841/+867
|\
| * Merge pull request #230 from wave72/masterWave2015-12-202-841/+867
| |\
| | * Updated Italian stringswave722015-12-202-841/+867
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-186-7957/+8261
|\| |
| * | fix search item attachment renderingMario Vavti2015-12-171-5/+6
| * | update to German stringszottel2015-12-162-6969/+7218
| * | Merge pull request #222 from wave72/masterWave2015-12-162-983/+1036
| |\|
| | * Updated Italian stringsPaolo Tacconi2015-12-162-983/+1036
| * | Invitation only added to the admin site page. Plus css wrapper class to docu ...jeroenpraat2015-12-151-0/+1
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-1412-1532/+1575
|\| |
| * | es+nl strings updatejeroenpraat2015-12-124-1504/+1508
| * | some minor cleanup - change the default of the discover tab (public stream ac...redmatrix2015-12-101-5/+5
| * | Some work on the login, register and default home page. Mostly neatly centeri...jeroenpraat2015-12-095-20/+61
| * | Fix #109.jeroenpraat2015-12-093-3/+3
| * | remove some unused stuffredmatrix2015-12-081-2/+0
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-121-1/+1
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-111-1/+1
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-111-4/+0
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-101-1/+2
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-101-1/+1
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-091-1/+1
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-091-6/+6
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - second versionHaakon Meland Eriksen2015-12-091-6/+3
* | | Hubzilla textbox - promoting Hubzilla features in jot.tplHaakon Meland Eriksen2015-12-091-29/+26
|/ /
* | move the diaspora templates out of core (except for diaspora_vcard, which is ...redmatrix2015-12-0715-194/+0
* | update es+nljeroenpraat2015-12-074-752/+854
* | mod_mitem.js is obsoleteMario Vavti2015-12-071-17/+0
* | some style.css janitor workMario Vavti2015-12-072-279/+20
* | override bs default marginMario Vavti2015-12-071-0/+1
* | make justify gallery work with more than one albums per page (eg album widget)Mario Vavti2015-12-074-9/+9
* | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-071-1/+1
|\ \
| * \ Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-063-6/+6
| |\ \
| * | | change text "Red developers" in update failed emailredmatrix2015-12-051-1/+1
* | | | css fixes for blockquote and code (use same padding)Mario Vavti2015-12-071-4/+2
| |/ / |/| |
* | | fix css issue in directoryMario Vavti2015-12-063-6/+6
|/ /
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-051-0/+4
|\ \
| * | Enlarge the default mail composition text area.Andrew Manning2015-12-041-0/+4
* | | Updated Norwegian translationHaakon Meland Eriksen2015-12-052-7002/+7197
|/ /
* | es+nl and bluegrid updatejeroenpraat2015-12-035-13295/+13301
* | fix nav search popup active background colorMario Vavti2015-12-021-0/+7
* | fix attachment rendering for mailMario Vavti2015-12-022-0/+10
* | fix badge padding in narrow navbarMario Vavti2015-12-012-1/+1