aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1810-19/+23
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-1713-230/+599
| |\
| | * whitespaceMario Vavti2015-11-171-1/+1
| | * more css fixesMario Vavti2015-11-176-16/+14
| * | photo album widget permissions issueredmatrix2015-11-174-3/+9
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1714-233/+622
|\ \ \ | | |/ | |/|
| * | missing closing " for src attributeMario Vavti2015-11-171-1/+1
| * | update bootstrap lib 3.3.4 -> 3.3.5Mario Vavti2015-11-176-195/+568
| * | 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-164-16/+34
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-1610-26/+51
|\|
| * tag_deliver of an edit to an already uplinked item wasn't resetting permissio...redmatrix2015-11-151-1/+4
| * allow plugins to also log to a different named logfile and also alter the log...redmatrix2015-11-151-1/+1
| * add logger plugin hookredmatrix2015-11-151-0/+16
| * permission issues editing wall-to-wall postsredmatrix2015-11-153-9/+19
| * issue with dead hub detectionredmatrix2015-11-151-1/+1
| * revert html in markdown for posts, but trim the input before processing the m...redmatrix2015-11-152-2/+2
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-157-1138/+1160
| |\
| * | issues connecting to local forumredmatrix2015-11-153-13/+9
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-157-1138/+1160
|\ \ \ | | |/ | |/|
| * | nl+es and some other bitsjeroenpraat2015-11-147-1138/+1160
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-144-533/+543
|\|
| * superblock enhancementsredmatrix2015-11-134-533/+543
* | 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-1316-10/+132
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-123-4/+4
| |\
| | * Add note about base64 and urlencode.ken restivo2015-11-121-2/+2
| | * Fix spelling of documentation.ken restivo2015-11-122-2/+2
| * | really basic photo album widget for content regionsredmatrix2015-11-123-0/+87
| |/
| * allow pdl contentredmatrix2015-11-124-1/+23
| * issue #154redmatrix2015-11-121-0/+11
| * small fixes, removed old unused database row, and log more prominently a miss...redmatrix2015-11-123-2/+3
| * Small update to Bluegrid and generic-content-wrapper-styled to dreportjeroenpraat2015-11-122-3/+4
* | 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
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-125-10/+34
|\|
| * will also need api docoredmatrix2015-11-112-1/+24
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-111-7/+7
| |\
| | * Merge pull request #149 from waitman/masterredmatrix2015-11-121-7/+7
| | |\
| | | * updates to Postgres schemaWaitman Gobble2015-11-111-7/+7
| * | | run markdown through html purifier for those who insist on mixing html with m...redmatrix2015-11-112-2/+3
| |/ /
* | | 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-14 18:56:32 +0000