| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-30 | 8 | -309/+152 |
| |\ | |||||
| | * | fix issue #921 - default addressbook has no name | Mario | 2017-11-30 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-30 | 2 | -12/+54 |
| | |\ | |||||
| | | * | use the same variable name consistently | zotlabs | 2017-11-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | use httpsig auth for getfile | zotlabs | 2017-11-29 | 2 | -12/+54 |
| | | | | |||||
| | * | | use typeof if checking for undefined var and always clear timeout before ↵ | Mario Vavti | 2017-11-29 | 1 | -3/+4 |
| | | | | | | | | | | | | | setting a new one | ||||
| | * | | load the profile images in the custom acl selector only if we actually need them | Mario Vavti | 2017-11-29 | 1 | -6/+6 |
| | | | | |||||
| | * | | an additional on touch event might improve things for mobile handling | Mario Vavti | 2017-11-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | allow an optional notify_id arg for liveUpdate() | Mario Vavti | 2017-11-29 | 3 | -128/+11 |
| | | | | |||||
| | * | | bump version to prevent caching issues related to recent updates to main.js | Mario Vavti | 2017-11-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | remove the updateCountsOnly variable which is not used anymore now | Mario Vavti | 2017-11-29 | 1 | -1/+0 |
| | | | | |||||
| | * | | rework liveUpdate() and notificationsUpdate() (aka ping) to first do the ↵ | Mario Vavti | 2017-11-29 | 2 | -167/+85 |
| | |/ | | | | | | | liveUpdate and when this is done only do the ping once. rename initLiveUpdate() to initUpdate() and more main.js cleanup. | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-28 | 3 | -235/+132 |
| |\| | |||||
| | * | check for updateCountsOnly in NavUpdate() | Mario Vavti | 2017-11-28 | 1 | -19/+19 |
| | | | |||||
| | * | set profile_uid in mod hq | Mario Vavti | 2017-11-28 | 1 | -0/+7 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-11-28 | 1 | -1/+8 |
| | |\ | |||||
| | * | | split liveUpdateInit() out of NavUpdate() so we do not need to wait for ↵ | Mario Vavti | 2017-11-28 | 3 | -239/+129 |
| | | | | | | | | | | | | | initial ping to complete before we can init liveUpdate(). clean up main.js and bump version. | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-27 | 21 | -91/+261 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge pull request #918 from albigro/dev | git-marijus | 2017-11-27 | 1 | -1/+8 |
| | |\ \ | | |/ | |/| | Update dark.css | ||||
| | | * | Update dark.css | albigro | 2017-11-27 | 1 | -1/+8 |
| | |/ | |||||
| | * | do not stop click propagation | Mario Vavti | 2017-11-27 | 1 | -1/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-27 | 1 | -0/+3 |
| | |\ | |||||
| | | * | unset item_wall and item_origin on pubstream to channel copy | zotlabs | 2017-11-27 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge pull request #916 from dawnbreak/QA_testing | git-marijus | 2017-11-27 | 6 | -11/+41 |
| | |\ \ | | | | | | | | | Improve Travis CI | ||||
| | | * | | Fix a PHP error in a unit test for PHP7.2. | Klaus Weidenbach | 2017-11-25 | 1 | -4/+4 |
| | | | | | |||||
| | | * | | :construction_worker:Improve Travis, add PHP7.2. | Klaus Weidenbach | 2017-11-25 | 5 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Improve Travis CI configuration a bit and add PHP7.2 to the test matrix. Add PHPUnit Testdox output and optionally deploy test results on release tags. Add a configuration file for infection (Mutation Testing Framework). | ||||
| | * | | | Merge pull request #917 from anaqreon/minimum-age | git-marijus | 2017-11-27 | 1 | -1/+5 |
| | |\ \ \ | | | | | | | | | | | Provide system config option for minimum registration age. | ||||
| | | * | | | Provide system config option for minimum registration age. | Andrew Manning | 2017-11-24 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | fix mod like after recent changes | Mario Vavti | 2017-11-27 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| | * | | | pubstream comments and a few other bugfixes that were discovered along the way | zotlabs | 2017-11-26 | 12 | -77/+204 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-25 | 29 | -83/+281 |
| |\| | | |||||
| | * | | fix double html ids in caldav widget if more than one sharee | Mario Vavti | 2017-11-25 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario | 2017-11-25 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-25 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | blah is not author or owner | zotlabs | 2017-11-25 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | fix regression in cdav calendar widget | Mario | 2017-11-25 | 1 | -2/+3 |
| | |/ / / | |||||
| | * | | | implement pubstream items in mod hq | Mario | 2017-11-25 | 2 | -12/+37 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-25 | 15 | -49/+137 |
| | |\| | | |||||
| | | * | | this may fix pubstream comments/likes | zotlabs | 2017-11-24 | 1 | -0/+16 |
| | | | | | |||||
| | | * | | don't include invisible "update activities" in category widget | zotlabs | 2017-11-24 | 2 | -34/+37 |
| | | | | | |||||
| | | * | | default profile assign | zotlabs | 2017-11-24 | 4 | -1/+17 |
| | | | | | |||||
| | | * | | sync packet not generated when deleting a file using the web browser interface | zotlabs | 2017-11-24 | 1 | -0/+5 |
| | | | | | |||||
| | | * | | remove deprecated $a argument from advanced_profile() | zotlabs | 2017-11-23 | 2 | -2/+2 |
| | | | | | |||||
| | | * | | change to bbcode calling parameters: important: will require pulling addons; | zotlabs | 2017-11-23 | 5 | -16/+24 |
| | | | | | | | | | | | | | | | | | also some extra checking of server headers in upload functions | ||||
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-23 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | mod_file_upload: provide a handler for chunked uploads for when we ↵ | zotlabs | 2017-11-22 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | eventually support this on the client side | ||||
| | * | | | | mod hq: minor query change | Mario Vavti | 2017-11-24 | 1 | -10/+2 |
| | | |_|/ | |/| | | |||||
| | * | | | missing files | Mario Vavti | 2017-11-24 | 3 | -0/+65 |
| | | | | | |||||
| | * | | | some more work on mod hq | Mario Vavti | 2017-11-24 | 7 | -10/+37 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-11-23 | 24 | -19/+699 |
| |\| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |