aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add space between project name and server typeredmatrix2016-05-242-2/+2
* more work associated with DBA and index.php shuffleredmatrix2016-05-246-139/+105
* relocate index and dbredmatrix2016-05-247-221/+253
* moved enotifyredmatrix2016-05-248-140/+136
* Clarify the privacy rights of commenters, as this can be contentious across t...redmatrix2016-05-231-2/+2
* typoredmatrix2016-05-231-1/+1
* remove some doxygen files that leaked into /docredmatrix2016-05-222-577/+0
* change the signed token format. We don't folks to be able to submit random te...redmatrix2016-05-223-2/+7
* Can't use "use x as y" aliases in callback function declarationsredmatrix2016-05-221-1/+1
* move chatroom stuff to zlibredmatrix2016-05-226-281/+288
* add missing fileredmatrix2016-05-221-0/+659
* move apps to zlibredmatrix2016-05-224-677/+20
* turn the oft-repeated block_public ... check into a function observer_prohibi...redmatrix2016-05-2216-307/+311
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-224-1318/+1398
|\
| * Update NL + ES_ESjeroenpraat2016-05-224-1318/+1398
* | renamed include files identity.php (channel.php) and Contact.php (connections...redmatrix2016-05-2262-240/+194
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-216-671/+721
|\|
| * Merge pull request #400 from anaqreon/plugin-repo-pathhubzilla2016-05-221-8/+14
| |\
| | * Temp repo folder error message correctionAndrew Manning2016-05-211-2/+2
| | * Moved git repository storage to store/[data]/git to avoid collision with a ch...Andrew Manning2016-05-211-8/+14
| * | Merge pull request #399 from phellmes/de20160521hubzilla2016-05-222-661/+701
| |\ \ | | |/ | |/|
| | * Update DE translation stringsphellmes2016-05-212-661/+701
| |/
| * revert fix for #385Mario Vavti2016-05-211-4/+0
| * possible better fix for #385Mario Vavti2016-05-212-2/+5
| * possible fix for #385Mario Vavti2016-05-213-1/+6
* | include new finger backendredmatrix2016-05-211-0/+130
* | finish updating zot_finger instancesredmatrix2016-05-2110-44/+29
* | first cut at zot-finger request signaturesredmatrix2016-05-212-8/+14
|/
* relocate the (unused currently) protocol driverredmatrix2016-05-202-26/+32
* rework the conversation object stuff at a high level - still needs a bit of r...redmatrix2016-05-2021-98/+44
* remove redundant includeredmatrix2016-05-201-3/+0
* consolidate include/*_selectors.php (not touching acl_selectors for the momen...redmatrix2016-05-208-104/+77
* code commentsredmatrix2016-05-201-3/+4
* move template stuff to zotlabs/renderredmatrix2016-05-208-129/+145
* cleanup proc_run after messing it up with debugging yesterdayredmatrix2016-05-203-34/+38