Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-15 | 1 | -1/+1 | |
| |\ | ||||||
| | * | bump minor version because of jquery update | Mario Vavti | 2016-07-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | login isn't always your email. | redmatrix | 2016-07-15 | 1 | -1/+1 | |
| |/ | ||||||
| * | schema updates for zot access tokens | redmatrix | 2016-07-14 | 1 | -1/+1 | |
| | | ||||||
* | | more work on perms | redmatrix | 2016-07-09 | 1 | -1/+1 | |
|/ | ||||||
* | if cron is broken because the entire db or config table is crashed, don't ↵ | redmatrix | 2016-06-30 | 1 | -0/+9 | |
| | | | | send a cron broken email - because we have no way of limiting it to just one email. We need a working config to do that. | |||||
* | db update for abconfig transition | redmatrix | 2016-06-23 | 1 | -1/+1 | |
| | ||||||
* | relocate the cache class | redmatrix | 2016-06-23 | 1 | -1/+0 | |
| | ||||||
* | last merge from master did reset the std_version to 1.8 - set it back to 1.9 ↵ | Mario Vavti | 2016-06-20 | 1 | -1/+1 | |
| | | | | for dev | |||||
* | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -2/+2 | |
|\ | ||||||
| * | merge conflict | redmatrix | 2016-06-19 | 1 | -6/+0 | |
| | | ||||||
| * | zot_revision should be string, not float1.8 | redmatrix | 2016-06-19 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 1 | -170/+191 | |
| |\ | ||||||
| * | | make init static on master also | redmatrix | 2016-06-03 | 1 | -2/+2 | |
| | | | ||||||
| * | | minor version roll | redmatrix | 2016-05-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | be specific | redmatrix | 2016-05-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | roll minor version due to change | redmatrix | 2016-05-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | issue #387 | redmatrix | 2016-05-15 | 1 | -1/+2 | |
| | | | ||||||
| * | | issue #383 | redmatrix | 2016-05-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | SECURITY: edited comment to private post loses privacy info. Not visible in ↵ | redmatrix | 2016-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | stream but may be visible in feeds | |||||
| * | | update std_version | redmatrix | 2016-05-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | experimental rtl support; this will probably require a fair bit of work. | redmatrix | 2016-06-19 | 1 | -0/+7 | |
| | | | ||||||
* | | | schema changes needed for the caldav client bit | redmatrix | 2016-06-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 1 | -1/+1 | |
| |/ |/| | | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. | |||||
* | | move dev forward | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -0/+7 | |
|\ \ | ||||||
| * | | issue #59 | redmatrix | 2016-06-08 | 1 | -0/+7 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -0/+1 | |
|\| | | ||||||
| * | | For emojis in posts, extend smilies and save a lot of duplication of effort | redmatrix | 2016-06-04 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1 | -1/+1 | |
|\| | | ||||||
| * | | App::init() should be static | redmatrix | 2016-06-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 1 | -5/+6 | |
|\| | | ||||||
| * | | some initial emoji reaction work | redmatrix | 2016-06-02 | 1 | -0/+1 | |
| | | | ||||||
| * | | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | 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. | |||||
| * | | more db column renames | redmatrix | 2016-05-31 | 1 | -2/+2 | |
| | | | ||||||
| * | | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | remove unused tables | redmatrix | 2016-05-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 1 | -4/+4 | |
| | | | | | | | | | | | | and hook) | |||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-29 | 1 | -1/+1 | |
|\| | | ||||||
| * | | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-28 | 1 | -13/+30 | |
|\| | | ||||||
| * | | allow objs to represent inventory | redmatrix | 2016-05-27 | 1 | -3/+3 | |
| | | | ||||||
| * | | check for session before querying session vars | redmatrix | 2016-05-27 | 1 | -10/+27 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 1 | -29/+91 | |
|\| | | ||||||
| * | | don't need quite so many backslashes | redmatrix | 2016-05-26 | 1 | -11/+11 | |
| | | | ||||||
| * | | consolidate all the sys_boot functionality that is common between the web ↵ | redmatrix | 2016-05-26 | 1 | -0/+66 | |
| | | | | | | | | | | | | server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. | |||||
| * | | run background/daemon tasks at approximately 4 hour intervals from web ↵ | redmatrix | 2016-05-25 | 1 | -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. | |||||
| * | | code cleanup | redmatrix | 2016-05-24 | 1 | -21/+3 | |
| | | | ||||||
| * | | turn the oft-repeated block_public ... check into a function ↵ | redmatrix | 2016-05-22 | 1 | -0/+9 | |
| | | | | | | | | | | | | observer_prohibited() | |||||
| * | | renamed include files identity.php (channel.php) and Contact.php ↵ | redmatrix | 2016-05-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | (connections.php) |