aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Wiki deletion worksAndrew Manning2016-05-272-6/+12
|
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-27152-5312/+4411
|\
| * 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 ↵redmatrix2016-05-2616-100/+82
| | | | | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
| * 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.php
| | | * 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 ↵redmatrix2016-05-251-5/+10
| | | | | | | | | | | | accesses if they aren't being run otherwise. This ensures they run, although perhaps a bit infrequently; even if unconfigured. This is not suitable for a production site, but may be acceptable for small single person hubs and test sites. The 'cron warning email' now means that background processes are totally borked; probably due to a fascist hosting provider that has blocked process execution.
| * | some event fixes, also change jquery-textcomplete to un-minified since the ↵redmatrix2016-05-254-23/+41
| | | | | | | | | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
| * | app rendering issues, typo in class name and could not find icon ↵redmatrix2016-05-252-2/+2
| | | | | | | | | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
| * | 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
| | | |/ | | |/| | | | | | | | | beeing so useful
| * | | Just set it and forget it.redmatrix2016-05-251-3/+1
| | |/ | |/|
| * | hubzilla is not a legal entity. the hubzilla community encompasses a group ↵redmatrix2016-05-251-1/+1
| |/ | | | | | | of people who are in fact legal entities.
| * require token signatures in zot_refresh, also move channel specific stuff ↵redmatrix2016-05-245-23/+50
| | | | | | | | into include/channel.php from include/connections.php
| * 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 ↵redmatrix2016-05-231-2/+2
| | | | | | | | the policies of different distributed communication systems.
| * 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 ↵redmatrix2016-05-223-2/+7
| | | | | | | | text for signing by us, as they could then use these to generate known signatures.
| * 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 ↵redmatrix2016-05-2216-307/+311
| | | | | | | | observer_prohibited()
| * 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 ↵redmatrix2016-05-2262-240/+194
| | | | | | | | | | | | (connections.php)
| * | 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
| | |\ | | | | | | | | Plugin repo path
| | | * Temp repo folder error message correctionAndrew Manning2016-05-211-2/+2
| | | |
| | | * Moved git repository storage to store/[data]/git to avoid collision with a ↵Andrew Manning2016-05-211-8/+14
| | | | | | | | | | | | | | | | channel named git. Fixed bug where temp repo folder was never created.
| | * | Merge pull request #399 from phellmes/de20160521hubzilla2016-05-222-661/+701
| | |\ \ | | | |/ | | |/| Update DE translation strings
| | | * Update DE translation stringsphellmes2016-05-212-661/+701
| | |/
| * | include new finger backendredmatrix2016-05-211-0/+130
| | |
| * | finish updating zot_finger instancesredmatrix2016-05-2110-44/+29
| | |