aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-0225-196/+189
|\
| * the rest of the schema updates - WARNING: some third party plugins may fail; ...redmatrix2016-06-0125-196/+189
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-0121-184/+66
|\|
| * more db column renamesredmatrix2016-05-3117-57/+56
| * more removal of reserved words from DB schemasredmatrix2016-05-314-10/+10
| * remove unused tablesredmatrix2016-05-301-117/+0
* | Merge branch 'dev' into sabre32Mario Vavti2016-05-313-5/+171
|\|
| * start removing reserved words from database column names (this run: addon and...redmatrix2016-05-302-5/+5
| * begin moving config to zotlabs. Leave procedural stubs for backward comaptibi...redmatrix2016-05-301-0/+166
* | Merge branch 'dev' into sabre32Mario Vavti2016-05-302-3/+3
|\|
| * undefined functionredmatrix2016-05-291-1/+1
| * fix remote_channel(), update php minversion requirementredmatrix2016-05-291-2/+2
* | upgrade to sabre32Mario Vavti2016-05-281-2/+2
|/
* link to hubchart site for site detail on pubsites pageredmatrix2016-05-261-2/+3
* track down some issues from the application logsredmatrix2016-05-261-2/+2
* consolidate all the sys_boot functionality that is common between the web ser...redmatrix2016-05-261-59/+1
* 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
* 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
* | some event fixes, also change jquery-textcomplete to un-minified since the mi...redmatrix2016-05-251-1/+1
* | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
|/
* require token signatures in zot_refresh, also move channel specific stuff int...redmatrix2016-05-241-0/+1
* more work associated with DBA and index.php shuffleredmatrix2016-05-242-42/+14
* relocate index and dbredmatrix2016-05-242-12/+205
* moved enotifyredmatrix2016-05-243-5/+691
* typoredmatrix2016-05-231-1/+1
* change the signed token format. We don't folks to be able to submit random te...redmatrix2016-05-221-1/+1
* Can't use "use x as y" aliases in callback function declarationsredmatrix2016-05-221-1/+1
* move chatroom stuff to zlibredmatrix2016-05-223-15/+286
* add missing fileredmatrix2016-05-221-0/+659
* move apps to zlibredmatrix2016-05-222-16/+18
* turn the oft-repeated block_public ... check into a function observer_prohibi...redmatrix2016-05-2212-301/+296
* renamed include files identity.php (channel.php) and Contact.php (connections...redmatrix2016-05-2246-76/+45
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-05-212-9/+15
|\
| * 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
| * 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-211-0/+1
* | include new finger backendredmatrix2016-05-211-0/+130
* | finish updating zot_finger instancesredmatrix2016-05-216-31/+19
* | first cut at zot-finger request signaturesredmatrix2016-05-211-8/+8
|/
* relocate the (unused currently) protocol driverredmatrix2016-05-202-0/+49
* rework the conversation object stuff at a high level - still needs a bit of r...redmatrix2016-05-2010-9/+998
* remove redundant includeredmatrix2016-05-201-3/+0
* consolidate include/*_selectors.php (not touching acl_selectors for the momen...redmatrix2016-05-205-7/+7
* move template stuff to zotlabs/renderredmatrix2016-05-204-0/+445
* remove test fileredmatrix2016-05-191-13/+0