| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-03 | 66 | -8/+146 |
| |\ | |||||
| | * | restrict emoji reactions to the top level for now. | redmatrix | 2016-06-02 | 1 | -0/+2 |
| | | | |||||
| | * | menu entries for basic emoji support. I could use a bit of help theming ↵ | redmatrix | 2016-06-02 | 2 | -0/+33 |
| | | | | | | | | | this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions. | ||||
| | * | experimental emoji support | redmatrix | 2016-06-02 | 61 | -0/+52 |
| | | | |||||
| | * | some initial emoji reaction work | redmatrix | 2016-06-02 | 2 | -1/+6 |
| | | | |||||
| | * | 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 | 42 | -616/+541 |
| |\| | |||||
| | * | check all return values | redmatrix | 2016-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | the rest of the schema updates - WARNING: some third party plugins may fail; ↵ | redmatrix | 2016-06-01 | 42 | -616/+541 |
| | | | | | | | | | 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 | 46 | -461/+295 |
| |\| | |||||
| | * | more db column renames | redmatrix | 2016-05-31 | 36 | -163/+210 |
| | | | |||||
| | * | more removal of reserved words from DB schemas | redmatrix | 2016-05-31 | 12 | -37/+54 |
| | | | |||||
| | * | provide a sort of mutex lock around db logging so it can't possibly recurse. ↵ | redmatrix | 2016-05-31 | 2 | -10/+18 |
| | | | | | | | | | Previous attempts to do something similar using other methods haven't worked out satisfactorily. | ||||
| | * | don't remove missing hooks while update_r1169 is happpening - temp fix | redmatrix | 2016-05-31 | 1 | -5/+8 |
| | | | |||||
| | * | remove unused tables | redmatrix | 2016-05-30 | 5 | -258/+17 |
| | | | |||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-31 | 360 | -55169/+272 |
| |\| | |||||
| | * | remove a bunch of unused stuff, some of which is orphaned and some which ↵ | redmatrix | 2016-05-30 | 343 | -54949/+0 |
| | | | | | | | | | represents dead development efforts | ||||
| | * | don't update hubloc_connected any more often than 15 minutes. We don't ↵ | redmatrix | 2016-05-30 | 1 | -5/+11 |
| | | | | | | | | | require that level of granularity and the frequent writes are causing issues with the stability of that table. | ||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-30 | 3 | -18/+21 |
| | |\ | |||||
| | | * | Merge pull request #405 from git-marijus/dev | hubzilla | 2016-05-31 | 3 | -18/+21 |
| | | |\ | | | | | | | | | render code bbcode inline if there are no linebreaks in the text. | ||||
| | | | * | render code bbcode inline if there are no linebreaks in the text. | Mario Vavti | 2016-05-30 | 3 | -18/+21 |
| | | | | | |||||
| | * | | | start removing reserved words from database column names (this run: addon ↵ | redmatrix | 2016-05-30 | 10 | -33/+51 |
| | | | | | | | | | | | | | | | | | and hook) | ||||
| | * | | | begin moving config to zotlabs. Leave procedural stubs for backward ↵ | redmatrix | 2016-05-30 | 2 | -144/+183 |
| | |/ / | | | | | | | | | | comaptibility | ||||
| | * / | redundant dev line from an earlier modification causes issue #404 | redmatrix | 2016-05-30 | 2 | -20/+6 |
| | |/ | |||||
| * | | Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32 | Mario Vavti | 2016-05-30 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-30 | 5 | -5/+7 |
| | |\| | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-05-30 | 5 | -5/+7 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | undefined function | redmatrix | 2016-05-29 | 1 | -1/+1 |
| | | | |||||
| | * | fix remote_channel(), update php minversion requirement | redmatrix | 2016-05-29 | 4 | -4/+6 |
| | | | |||||
| * | | use composer to install sabre32 | Mario Vavti | 2016-05-29 | 47 | -1338/+125 |
| | | | |||||
| * | | missed some files | Mario Vavti | 2016-05-29 | 38 | -1276/+2663 |
| | | | |||||
| * | | upgrade to sabre32 | Mario Vavti | 2016-05-28 | 228 | -8563/+10075 |
| |/ | |||||
| * | allow objs to represent inventory | redmatrix | 2016-05-27 | 4 | -4/+25 |
| | | |||||
| * | strings update | redmatrix | 2016-05-27 | 1 | -2109/+2099 |
| | | |||||
| * | check for session before querying session vars | redmatrix | 2016-05-27 | 1 | -10/+27 |
| | | |||||
| * | 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 | 3 | -4/+13 |
| | | |||||
| * | 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 | 16 | -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_merge | redmatrix | 2016-05-26 | 3 | -7/+9 |
| |\ | |||||
| | * | 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 |
| | | | |||||
| * | | kill off mcrypt | redmatrix | 2016-05-26 | 2 | -10/+11 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-05-25 | 2 | -0/+4 |
| |\ | |||||
| | * | 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 |
| | | | | |||||
| * | | | update to the bug doco | redmatrix | 2016-05-25 | 1 | -15/+1 |
| |/ / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |