aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-231-1/+1
|\
| * delivery report tweaksredmatrix2015-11-221-1/+1
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-212-0/+3
|\|
| * make calendar week start (sun or mon) configurableMario Vavti2015-11-212-0/+3
* | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-1/+1
* | Space between Preview and Submit in jot.tplHaakon Meland Eriksen2015-11-201-0/+2
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-205-3193/+3279
|\|
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-11-204-3192/+3278
| |\
| | * update es+nljeroenpraat2015-11-204-3192/+3278
| * | make calendar language awareMario Vavti2015-11-201-1/+1
| |/
* | Rearranging buttonsHaakon Meland Eriksen2015-11-201-1/+1
* | Rearranging buttonsHaakon Meland Eriksen2015-11-201-10/+3
* | Rearranging buttonsHaakon Meland Eriksen2015-11-201-3/+5
* | Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+8
* | Rearranging buttonsHaakon Meland Eriksen2015-11-201-6/+6
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-202-2/+8
|\|
| * Had to switch these 2. Sorry.jeroenpraat2015-11-201-0/+2
| * Some bitsjeroenpraat2015-11-201-2/+6
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-194-1/+17
|\|
| * move today button from aside to section titleMario Vavti2015-11-192-1/+1
| * css fixesMario Vavti2015-11-192-0/+16
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-196-87/+69
|\|
| * move moment.min.js and remove unneeded filesMario Vavti2015-11-181-1/+1
| * some events refacturingMario Vavti2015-11-186-87/+69
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-181-2/+2
|\|
| * fix admin plugin hooksredmatrix2015-11-171-2/+2
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-186-17/+15
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-176-34/+30
| |\
| | * more css fixesMario Vavti2015-11-175-15/+13
| * | photo album widget permissions issueredmatrix2015-11-171-2/+2
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-174-33/+49
|\ \ \ | | |/ | |/|
| * | css fixesMario Vavti2015-11-172-7/+9
| * | show jotnets toggle button only if there are jotnets and whitespace fixesMario Vavti2015-11-171-14/+10
| |/
| * fix api/direct_messages/new at least for the json case. We seem to have a mis...redmatrix2015-11-161-12/+30
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-157-1138/+1160
|\|
| * nl+es and some other bitsjeroenpraat2015-11-147-1138/+1160
* | Reorder buttons HMEHaakon Meland Eriksen2015-11-131-45/+43
* | Adding original jot.tpl from GitHubHaakon Meland Eriksen2015-11-131-49/+54
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-132-1/+3
|\|
| * really basic photo album widget for content regionsredmatrix2015-11-121-0/+2
| * Small update to Bluegrid and generic-content-wrapper-styled to dreportjeroenpraat2015-11-121-1/+1
* | Reorder buttonsHaakon Meland Eriksen2015-11-131-53/+48
* | Reverted changes - got white screenHaakon Meland Eriksen2015-11-131-47/+52
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-7/+8
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-131-3/+0
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-21/+12
* | Regrouped post buttonsHaakon Meland Eriksen2015-11-121-31/+29
* | Make upload and encrypt easier on phones by editing jot.tplHaakon Meland Eriksen2015-11-121-13/+11
* | Promoted upload of images and encryptionHaakon Meland Eriksen2015-11-111-0/+10
* | Rearranged comment buttons backHaakon Meland Eriksen2015-11-111-13/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:10:39 +0000