aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* profile field admin page (functional only: still needs a lot of HTML/CSS ↵redmatrix2016-03-014-19/+138
| | | | cleanup)
* 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 schema
| | | | * 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 ↵jeroenpraat2016-03-011-1/+1
| | | | | | | | | | | | after migration from RM on 1 or 2 channels)
* | | Allow configuration of the display order of profile fields. This is an ↵redmatrix2016-03-012-9/+83
| | | | | | | | | | | | important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
* | | 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 ↵Mario Vavti2016-02-291-28/+19
| | | | | | | | code a little
| * 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
|/
* I haven't investigated 'why', but the addition of the router class in ↵redmatrix2016-02-271-0/+3
| | | | https://github.com/redmatrix/hubzilla/commit/1db3409f36f408bfc49816e1fab3df4b53b8f19e resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented.
* 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 strings
| | * Update DE translation stringsphellmes2016-02-272-1342/+1326
| | |
| * | 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
| | | | | | | | this is not supported by the backend at the moment.
* | z_fetch_url and z_post_url returning falseredmatrix2016-02-272-3/+3
|/
* 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 ↵Mario Vavti2016-02-262-4/+4
| | | | | | | | by body text.
| * several photo item template fixesMario Vavti2016-02-263-19/+25
| |
| * some improvement for file activityMario Vavti2016-02-261-7/+8
| |
| * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-02-264-6/+22
| |\
| * | get rid of duplicate functionMario Vavti2016-02-261-27/+2
| | |
* | | turn timezone aware birthdays into a feature for those who want an ↵redmatrix2016-02-265-1081/+1068
| | | | | | | | | | | | uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone.