Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 4 | -19/+25 |
|\ | |||||
| * | foreach: invalid argument | redmatrix | 2016-06-09 | 2 | -14/+16 |
| | | |||||
| * | namespace issue with openid reverse auth | redmatrix | 2016-06-09 | 1 | -4/+4 |
| | | |||||
| * | allow an exclusion for transmitting hidden file activities. There may be a ↵ | redmatrix | 2016-06-09 | 1 | -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 sabre32 | Mario Vavti | 2016-06-08 | 6 | -10/+429 |
|\| | |||||
| * | Finish the config family | redmatrix | 2016-06-07 | 5 | -1/+424 |
| | | |||||
| * | 'recent photos' query was buggered, also fix issue #163 by adding ↵ | redmatrix | 2016-06-07 | 1 | -9/+5 |
| | | | | | | | | configurable sort order to the album widget - default is album name ascending | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-07 | 1 | -43/+63 |
|\| | |||||
| * | rename admin/users to admin/accounts, provide sortable columns in account ↵ | redmatrix | 2016-06-06 | 1 | -43/+63 |
| | | | | | | | | and channel summaries - issue #255 | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-06 | 2 | -1/+190 |
|\| | |||||
| * | move pconfig to static class | redmatrix | 2016-06-05 | 1 | -0/+189 |
| | | |||||
| * | We need a laugh icon more than we need a cry icon. | redmatrix | 2016-06-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-05 | 4 | -10/+22 |
|\| | |||||
| * | short-term solution to emoji size issue - make them 32px from the sender | redmatrix | 2016-06-04 | 1 | -1/+1 |
| | | |||||
| * | class functions called incorrectly | redmatrix | 2016-06-04 | 1 | -3/+3 |
| | | |||||
| * | need to set item_origin on locally created reactions so they propagate properly | redmatrix | 2016-06-03 | 1 | -0/+1 |
| | | |||||
| * | missed table rename in event query in mod_manage | redmatrix | 2016-06-03 | 1 | -5/+5 |
| | | |||||
| * | allow any (current) emoji to be displayed on any site, and provide a default ↵ | redmatrix | 2016-06-03 | 1 | -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 ↵ | redmatrix | 2016-06-03 | 1 | -0/+1 |
| | | | | | | | | can disable it. Default is enabled. | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 2 | -7/+103 |
|\| | |||||
| * | experimental emoji support | redmatrix | 2016-06-02 | 1 | -0/+50 |
| | | |||||
| * | preserve app categories when updating a system app | redmatrix | 2016-06-02 | 1 | -7/+25 |
| | | |||||
| * | adjust algorithm to ensure new system apps are installed. | redmatrix | 2016-06-02 | 1 | -3/+12 |
| | | |||||
| * | install system apps if a) they have never been installed, or b) if the app ↵ | redmatrix | 2016-06-02 | 1 | -10/+29 |
| | | | | | | | | version changes | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-02 | 25 | -196/+189 |
|\| | |||||
| * | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 25 | -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 sabre32 | Mario Vavti | 2016-06-01 | 21 | -184/+66 |
|\| | |||||
| * | more db column renames | redmatrix | 2016-05-31 | 17 | -57/+56 |
| | | |||||
| * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 4 | -10/+10 |
| | | |||||
| * | remove unused tables | redmatrix | 2016-05-30 | 1 | -117/+0 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-31 | 3 | -5/+171 |
|\| | |||||
| * | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 2 | -5/+5 |
| | | | | | | | | and hook) | ||||
| * | begin moving config to zotlabs. Leave procedural stubs for backward ↵ | redmatrix | 2016-05-30 | 1 | -0/+166 |
| | | | | | | | | comaptibility | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-30 | 2 | -3/+3 |
|\| | |||||
| * | undefined function | redmatrix | 2016-05-29 | 1 | -1/+1 |
| | | |||||
| * | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 1 | -2/+2 |
| | | |||||
* | | upgrade to sabre32 | Mario Vavti | 2016-05-28 | 1 | -2/+2 |
|/ | |||||
* | link to hubchart site for site detail on pubsites page | redmatrix | 2016-05-26 | 1 | -2/+3 |
| | |||||
* | track down some issues from the application logs | redmatrix | 2016-05-26 | 1 | -2/+2 |
| | |||||
* | consolidate all the sys_boot functionality that is common between the web ↵ | redmatrix | 2016-05-26 | 1 | -59/+1 |
| | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. | ||||
* | another typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
| | |||||
* | check if $addonDir is a dir to silence warning if it does not exist | Mario Vavti | 2016-05-26 | 1 | -5/+7 |
| | |||||
* | typo | Mario Vavti | 2016-05-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #402 from git-marijus/dev | hubzilla | 2016-05-26 | 2 | -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.php | Mario Vavti | 2016-05-25 | 2 | -0/+4 |
| | | |||||
* | | some event fixes, also change jquery-textcomplete to un-minified since the ↵ | redmatrix | 2016-05-25 | 1 | -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 cronhooks | redmatrix | 2016-05-25 | 1 | -5/+0 |
|/ | |||||
* | require token signatures in zot_refresh, also move channel specific stuff ↵ | redmatrix | 2016-05-24 | 1 | -0/+1 |
| | | | | into include/channel.php from include/connections.php | ||||
* | more work associated with DBA and index.php shuffle | redmatrix | 2016-05-24 | 2 | -42/+14 |
| | |||||
* | relocate index and db | redmatrix | 2016-05-24 | 2 | -12/+205 |
| |