aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Rearranged comment buttonsHaakon Meland Eriksen2015-11-111-10/+13
|/
* add avatars to likes/dislikes/etc.redmatrix2015-11-091-0/+6
* remove list bullets from extended like listredmatrix2015-11-092-1/+5
* This is betterjeroenpraat2015-11-091-2/+2
* Using bootstrap classes, so other themes/schemas also work. Plus margin when ...jeroenpraat2015-11-092-7/+2
* Merge pull request #137 from wave72/masterWave2015-11-092-1823/+1876
|\
| * Updated Italian stringsPaolo Tacconi2015-11-092-1823/+1876
* | some more db docoredmatrix2015-11-081-1/+1
* | make jotnets modalredmatrix2015-11-082-3/+19
* | Quick fix: Moved Twitter select box to the top of ACL selectorTobias Luther2015-11-081-3/+6
* | Fix ffsapi for non-English languages (or better when 's was used in the strin...jeroenpraat2015-11-084-3610/+3716
|/
* Firefox share (that seems now the official name) button added to misc. settings.jeroenpraat2015-11-052-5/+17
* Chat page improved (I think). Works now better with diff. resolutions, font s...jeroenpraat2015-11-046-18/+39
* Merge pull request #125 from wave72/masterWave2015-11-042-638/+678
|\
| * Updated Italian stringsPaolo Tacconi2015-11-042-638/+678
* | Merge pull request #119 from sasiflo/masterredmatrix2015-11-043-5/+5
|\ \
| * \ Merge branch 'rebranding'sasiflo2015-11-033-5/+5
| |\ \
| | * | Some small rebranding for Hubzilla transition from Red Matrixsasiflo2015-11-033-5/+5
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-034-4/+14
|\ \ \ \
| * | | | Update nl+esjeroenpraat2015-10-314-4/+14
* | | | | provide admin setting to change directory serverredmatrix2015-11-031-1/+3
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 01:21:56 +0000