aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge1.3redmatrix2016-03-035-37/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix jot formMario Vavti2016-03-031-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | slide up cover on clickMario Vavti2016-03-031-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-037-17/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | move cover-photo to template, add the ability to define a title and subtitle ...Mario Vavti2016-03-034-26/+98
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the markdown feature. Do not re-enable unless you are willing to suppo...redmatrix2016-03-034-13/+24
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | rename the menu entry and page to 'Profile Fields' to maintain consistencyredmatrix2016-03-022-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI cleanup for admin profile field management pageredmatrix2016-03-022-11/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-027-19/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | little nl string fixJeroen van Riet Paap2016-03-021-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | small fix to simple cover-photoMario Vavti2016-03-022-6/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | add a fade in effect to main while scrolling up cover photoMario Vavti2016-03-021-0/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-027-29/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | a simple cover-photo implementation for redbasic default templateMario Vavti2016-03-026-18/+31
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue #305redmatrix2016-03-023-3/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | sort out the with and howlong dependenciesredmatrix2016-03-012-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile field admin page (functional only: still needs a lot of HTML/CSS clea...redmatrix2016-03-014-19/+138
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / / / / / / / / / /