aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-0146-461/+295
|\
| * more db column renamesredmatrix2016-05-3136-163/+210
| * more removal of reserved words from DB schemasredmatrix2016-05-3112-37/+54
| * provide a sort of mutex lock around db logging so it can't possibly recurse. ...redmatrix2016-05-312-10/+18
| * don't remove missing hooks while update_r1169 is happpening - temp fixredmatrix2016-05-311-5/+8
| * remove unused tablesredmatrix2016-05-305-258/+17
* | Merge branch 'dev' into sabre32Mario Vavti2016-05-31360-55169/+272
|\|
| * remove a bunch of unused stuff, some of which is orphaned and some which repr...redmatrix2016-05-30343-54949/+0
| * don't update hubloc_connected any more often than 15 minutes. We don't requir...redmatrix2016-05-301-5/+11
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-303-18/+21
| |\
| | * Merge pull request #405 from git-marijus/devhubzilla2016-05-313-18/+21
| | |\
| | | * render code bbcode inline if there are no linebreaks in the text.Mario Vavti2016-05-303-18/+21
| * | | start removing reserved words from database column names (this run: addon and...redmatrix2016-05-3010-33/+51
| * | | begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-302-144/+183
| |/ /
| * / redundant dev line from an earlier modification causes issue #404redmatrix2016-05-302-20/+6
| |/
* | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32Mario Vavti2016-05-300-0/+0
|\ \
| * | Merge branch 'dev' into sabre32Mario Vavti2016-05-305-5/+7
| |\|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-05-305-5/+7
|\ \ \ | |/ / |/| / | |/
| * undefined functionredmatrix2016-05-291-1/+1
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-294-4/+6
* | use composer to install sabre32Mario Vavti2016-05-2947-1338/+125
* | missed some filesMario Vavti2016-05-2938-1276/+2663
* | upgrade to sabre32Mario Vavti2016-05-28228-8563/+10075
|/
* allow objs to represent inventoryredmatrix2016-05-274-4/+25
* strings updateredmatrix2016-05-271-2109/+2099
* check for session before querying session varsredmatrix2016-05-271-10/+27
* link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
* track down some issues from the application logsredmatrix2016-05-263-4/+13
* don't need quite so many backslashesredmatrix2016-05-261-11/+11
* consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-2616-100/+82
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-263-7/+9
|\
| * another typoMario Vavti2016-05-261-1/+1
| * check if $addonDir is a dir to silence warning if it does not existMario Vavti2016-05-261-5/+7
| * typoMario Vavti2016-05-261-1/+1
* | kill off mcryptredmatrix2016-05-262-10/+11
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-252-0/+4
|\
| * Merge pull request #402 from git-marijus/devhubzilla2016-05-262-0/+4
| |\
| | * another try on #385 - replace sabres restrictive CSP with what we do in boot.phpMario Vavti2016-05-252-0/+4
* | | update to the bug docoredmatrix2016-05-251-15/+1
|/ /
* | run background/daemon tasks at approximately 4 hour intervals from web access...redmatrix2016-05-251-5/+10
* | some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-254-23/+41
* | app rendering issues, typo in class name and could not find icon 'fa-arrow-ci...redmatrix2016-05-252-2/+2
* | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-253-9/+0
|\ \
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-05-251-1/+1
| |\ \
| * | | remove the add others button for now - after some research it turned out not ...Mario Vavti2016-05-253-9/+0
| | |/ | |/|
* | | Just set it and forget it.redmatrix2016-05-251-3/+1
| |/ |/|
* | hubzilla is not a legal entity. the hubzilla community encompasses a group of...redmatrix2016-05-251-1/+1
|/
* require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-245-23/+50
* code cleanupredmatrix2016-05-2430-584/+28