harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,639 Commits 6 Branches 36 Tags
88bb61018da11207293a2bcbfaef7ce99623e0ba
Commit Graph

19639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs 88bb61018d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-13 19:59:30 -07:00
zotlabs c940d8d7ca implement chunked uploads on the wall; making it work painlessly on /cloud was attempted but will not be implemented today. That presents some interesting dragons to slay. 2017-07-13 17:04:58 -07:00
zotlabs aa70cbbf21 fix typos 2017-07-12 17:16:21 -07:00
zotlabs 6db717a1a0 make websub/PuSH and salmon both use consume_feed() for item storage as there is a lot of duplication of effort and patches applied to one that haven't been applied to the other. This will require an update of addons as well or follow activities may be duplicated 2017-07-12 17:07:31 -07:00
zotlabs ad9990e100 even more logging of conversation parent discovery 2017-07-11 17:31:57 -07:00
Mario Vavti 403e90861c Merge red/master 2017-07-11 16:11:52 +02:00
zotlabs 2d63bbb91e prevent expiration of conversations you are involved with - allows you to find your own comments months from now 2017-07-10 20:18:33 -07:00
Mario Vavti 271ed82d0d update to match primary color 2017-07-10 22:43:32 +02:00
Mario Vavti c47439fca4 update r1191: return update_success if table principals exists otherwise proceed with creating cdav tables. 2017-07-10 14:28:50 +02:00
zotlabs e3734328eb find_parent for feeds needs more debug logging. Something is still falling through the cracks and it isn't obvious why 2017-07-09 17:08:25 -07:00
zotlabs ddc454bd82 regression: allow position attributes in oembedable zcards by separating allow_position from the decision to allow zrls. 
Should probably turn the entire zcard into a gd image as other consumers of zcards are also likely to purify the position attributes.
 2017-07-09 16:04:45 -07:00
zotlabs 799d4ad549 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-09 13:15:50 -07:00
Mario Vavti 8dcdcd55e5 remove if not exist clause on index creation - it seems to be supported in mariadb only 2017-07-08 20:29:02 +02:00
Mario Vavti 1fca442828 update bs-dev and popper.js 2017-07-07 13:58:32 +02:00
git-marijus d077f15270 Merge pull request #822 from dawnbreak/composer-light 
Add optimize-autoloader to composer config.
 2017-07-07 12:16:27 +02:00
Klaus Weidenbach 31d1a72854 ⬆️ Updating some PHP libraries. 
htmlpurifier (v4.9.2 => v4.9.3) with bugfix for PHP7.1
sabre/http (4.2.2 => 4.2.3)
 2017-07-06 21:35:10 +02:00
Klaus Weidenbach f9a989fe1b Add optimize-autoloader to composer config. 2017-07-06 21:18:35 +02:00
git-marijus b16e4c558f Merge pull request #821 from zotlabs/hmessages 
Hmessages.po corruption
 2017-07-06 08:07:03 +02:00
zotlabs 2d6e87fb17 hmessages.po was corrupt from an old merge conflict - regenerated 2017-07-05 21:48:36 -07:00
zotlabs 024d2737d0 there was a merge conflict in hmessages.po 2017-07-05 20:52:33 -07:00
zotlabs b2e5b6c977 affinitiy slider settings were being updated on any submit of of settings/featured, plus minor non-code changes 2017-07-05 20:16:40 -07:00
zotlabs 75f058e15e reset project name 2017-07-05 15:38:20 -07:00
zotlabs 7fb849ab87 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-05 15:35:53 -07:00
zotlabs fca8e0aa6a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-07-05 15:35:05 -07:00
Mario Vavti 8dd9ab05a9 remove apps app 2017-07-05 14:54:23 +02:00
Mario Vavti c3b93de099 typo 2017-07-05 12:32:46 +02:00
zotlabs 27c8c74988 some sites use the old style ostatus:conversation xml field, check for it. 2017-07-05 11:49:05 +02:00
Mario Vavti 80352dab5f use if not exists clause to not error if the index was already there 2017-07-05 11:36:32 +02:00
Mario Vavti 00a49b42e4 version 2.5.8 2017-07-05 11:19:05 +02:00
Mario Vavti f5735fb67b missing abook_{my,their}_perms in pg schema and missing keys in mysql schema 2017-07-05 10:36:32 +02:00
Mario Vavti fb5b588349 update_version bump 2017-07-05 10:03:52 +02:00
Mario Vavti 9e497cde40 missing semicolon 2017-07-05 09:52:41 +02:00
zotlabs f3816836e5 some sites use the old style ostatus:conversation xml field, check for it. 2017-07-04 22:05:17 -07:00
Mario Vavti 038c928b9b db-update for cdav 2017-07-04 23:08:00 +02:00
Mario Vavti c596248f40 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-07-04 12:41:47 +02:00
Mario Vavti 6ae3a92f53 version 2.5.7 2017-07-04 12:40:10 +02:00
Mario Vavti fbf868e976 reimplement creation of default calendar and default addressbook using sabre classes 2017-07-04 12:07:11 +02:00
Mario Vavti 5e0bb6ecd5 add apd files for cdav 2017-07-04 10:36:24 +02:00
Mario Vavti a34d8773f1 add the cdav pgsql schemas 2017-07-04 10:28:16 +02:00
Mario Vavti 4bc94c0ee9 keep hubzillas license and readme 2017-07-04 09:41:39 +02:00
Mario Vavti bf1a21e46f Merge remote-tracking branch 'mike/master' into dev 2017-07-04 09:39:48 +02:00
zotlabs d18427a522 revert using channel_hash for cdav until we figure out how to do so cleanly 2017-07-03 21:20:22 -07:00
Mario Vavti 76850a7340 minor css fix 2017-07-03 21:38:29 +02:00
Mario Vavti d096106824 merge red into hubzilla 2017-07-03 21:33:24 +02:00
Mario Vavti 562124c29f bs-dev, minor css fix and min version 2017-07-03 21:22:13 +02:00
zotlabs 48063fa5ef Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-02 18:58:43 -07:00
zotlabs 41111bcdad Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-07-02 18:57:21 -07:00
Mario Vavti 133292e241 update bs-dev and min version bump 2017-07-02 11:24:17 +02:00
zotlabs 64cad0a041 duplicated posts after conversation fetch 2017-06-30 00:50:57 -07:00
zotlabs b73c844d1a use "Full Name (username)" for ostatus commenter xchans 2017-06-29 22:38:43 -07:00