aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-104-19/+25
|\
| * foreach: invalid argumentredmatrix2016-06-092-14/+16
| |
| * namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| |
| * allow an exclusion for transmitting hidden file activities. There may be a ↵redmatrix2016-06-091-1/+5
| | | | | | | | better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue.
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-086-10/+429
|\|
| * Finish the config familyredmatrix2016-06-075-1/+424
| |
| * 'recent photos' query was buggered, also fix issue #163 by adding ↵redmatrix2016-06-071-9/+5
| | | | | | | | configurable sort order to the album widget - default is album name ascending
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-071-43/+63
|\|
| * rename admin/users to admin/accounts, provide sortable columns in account ↵redmatrix2016-06-061-43/+63
| | | | | | | | and channel summaries - issue #255
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-062-1/+190
|\|
| * move pconfig to static classredmatrix2016-06-051-0/+189
| |
| * We need a laugh icon more than we need a cry icon.redmatrix2016-06-051-1/+1
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-054-10/+22
|\|
| * short-term solution to emoji size issue - make them 32px from the senderredmatrix2016-06-041-1/+1
| |
| * class functions called incorrectlyredmatrix2016-06-041-3/+3
| |
| * need to set item_origin on locally created reactions so they propagate properlyredmatrix2016-06-031-0/+1
| |
| * missed table rename in event query in mod_manageredmatrix2016-06-031-5/+5
| |
| * allow any (current) emoji to be displayed on any site, and provide a default ↵redmatrix2016-06-031-1/+11
| | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
| * turn emoji ability into a feature so that either a member or the site admin ↵redmatrix2016-06-031-0/+1
| | | | | | | | can disable it. Default is enabled.
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-032-7/+103
|\|
| * experimental emoji supportredmatrix2016-06-021-0/+50
| |
| * preserve app categories when updating a system appredmatrix2016-06-021-7/+25
| |
| * adjust algorithm to ensure new system apps are installed.redmatrix2016-06-021-3/+12
| |
| * install system apps if a) they have never been installed, or b) if the app ↵redmatrix2016-06-021-10/+29
| | | | | | | | version changes
* | 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
| | | | | | | | e.g. embedphotos and chess. $item['object'] is now $item['obj'] and $photo['type'] is $photo['mimetype'], $photo['scale'] is $photo['imgscale'] and $photo['data'] is now $photo['content']. There are a number of other changes, but these are the ones noted to cause issues with third-party plugins. The project plugins have been updated. Please note any new issues as this effort touched a lot of code in a lot of files.
* | 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 ↵redmatrix2016-05-302-5/+5
| | | | | | | | and hook)
| * begin moving config to zotlabs. Leave procedural stubs for backward ↵redmatrix2016-05-301-0/+166
| | | | | | | | comaptibility
* | 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 ↵redmatrix2016-05-261-59/+1
| | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so.
* 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.php
| * 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 ↵redmatrix2016-05-251-1/+1
| | | | | | | | minified version appears to require a mapping file and causes a lot of server fetch errors trying to load it.
* | duplicate daemon run of cronhooksredmatrix2016-05-251-5/+0
|/
* require token signatures in zot_refresh, also move channel specific stuff ↵redmatrix2016-05-241-0/+1
| | | | into include/channel.php from include/connections.php
* more work associated with DBA and index.php shuffleredmatrix2016-05-242-42/+14
|
* relocate index and dbredmatrix2016-05-242-12/+205
|