aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-0228-1505/+1764
|\
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-0112-52/+57
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-03-0121-62/+244
| | |\
| | | * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-011-1/+1
| | | |\
| | | | * Merge pull request #304 from phormanns/masterredmatrix2016-03-021-1/+1
| | | | |\
| | | | | * fix typo in postgres schemaPeter Hormanns2016-03-011-1/+1
| | | | |/
| | | * / fix js error and add id to field input blockMario Vavti2016-03-012-2/+2
| | | |/
| | | * fix paddingMario Vavti2016-03-011-1/+1
| | | * do not show empty buttons if not logged inMario Vavti2016-03-012-2/+2
| | | * another resize issueMario Vavti2016-03-011-0/+1
| | | * fix resize issueMario Vavti2016-03-011-1/+6
| | | * move preview content outside of editor spaceMario Vavti2016-03-011-1/+2
| | | * adjust paddingMario Vavti2016-03-011-2/+2
| | | * set line-height to initialMario Vavti2016-03-011-1/+1
| | | * another css fixMario Vavti2016-03-011-1/+1
| | | * css fixes to make jot look better with background colors or imagesMario Vavti2016-03-015-44/+42
| | * | Small fix for deleted forum channels showing in the forum widget (had this af...jeroenpraat2016-03-011-1/+1
| * | | Allow configuration of the display order of profile fields. This is an import...redmatrix2016-03-012-9/+83
| * | | revupredmatrix2016-03-011-1/+1
| | |/ | |/|
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-299-92/+9774
| |\|
| | * provide footer bbcodeMario Vavti2016-02-293-5/+14
| | * remove unused variableMario Vavti2016-02-291-4/+0
| | * simplify profile edit button(s) and make it useful for multiple profilesMario Vavti2016-02-293-53/+72
| | * update es-es. tested it and it works now. Don't know what happened earlier.jeroenpraat2016-02-292-1342/+1326
| | * fix deletion of files from filesystemMario Vavti2016-02-291-1/+1
| | * do not process update activity if there is no item to update and simplify cod...Mario Vavti2016-02-291-28/+19
| | * revert es-es update. something went wrong. later today I will examine what.jeroenpraat2016-02-292-84/+9767
| * | abconfigredmatrix2016-02-2910-10/+187
| * | revupredmatrix2016-02-291-1/+1
| |/
| * build_sync_packet - no need to sleep after the last sync delivery.redmatrix2016-02-281-1/+5
| * stop the PHP warnings from Thomas's buggered sitekeyredmatrix2016-02-281-1/+1
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-282-9767/+84
| |\
| | * update es-es stringsjeroenpraat2016-02-282-9767/+84
| * | revupredmatrix2016-02-281-1/+1
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-285-1345/+1332
|\|
| * I haven't investigated 'why', but the addition of the router class in https:/...redmatrix2016-02-271-0/+3
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-276-2697/+2670
| |\
| | * Merge pull request #302 from phellmes/de20160227redmatrix2016-02-282-1342/+1326
| | |\
| | | * Update DE translation stringsphellmes2016-02-272-1342/+1326
| * | | z_fetch_url and z_post_url returning falseredmatrix2016-02-272-3/+3
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-274-1355/+1344
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-02-272-1355/+1339
| |\ \ \
| | * | | update NL stringsjeroenpraat2016-02-272-1355/+1339
| | | |/ | | |/|
| * / | missing includeMario Vavti2016-02-271-0/+1
| |/ /
| * / make attach_delete() return and comment out album rename functionality since ...Mario Vavti2016-02-272-0/+4
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2725-1160/+1170
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-266-57/+39
| |\
| | * fix link to photo album and make sure that small photos are not overwritten b...Mario Vavti2016-02-262-4/+4
| | * several photo item template fixesMario Vavti2016-02-263-19/+25
| | * some improvement for file activityMario Vavti2016-02-261-7/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 13:05:48 +0000