| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-12-02 | 12 | -49/+132 |
| |\ | |||||
| | * | fix acl issue in mod cloud | Mario Vavti | 2017-12-02 | 1 | -1/+22 |
| | | | |||||
| | * | bump version | Mario Vavti | 2017-12-01 | 1 | -1/+1 |
| | | | |||||
| | * | add a cursor-pointer class | Mario Vavti | 2017-12-01 | 2 | -3/+4 |
| | | | |||||
| | * | add a filter for notification to show new posts only | Mario Vavti | 2017-12-01 | 4 | -14/+40 |
| | | | |||||
| | * | make sure we get a file upload progress indicator in the tiles view. | zotlabs | 2017-11-30 | 1 | -0/+4 |
| | | | |||||
| | * | remove logging line | zotlabs | 2017-11-30 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'chunk' | zotlabs | 2017-11-30 | 6 | -33/+65 |
| | |\ | |||||
| | | * | more or less working chunked uploads on /cloud now. | zotlabs | 2017-11-30 | 3 | -32/+22 |
| | | | | |||||
| | | * | made it to prepareHtml | zotlabs | 2017-11-30 | 2 | -4/+6 |
| | | | | |||||
| | | * | progress on chunked uploads in /cloud | zotlabs | 2017-11-30 | 2 | -12/+13 |
| | | | | |||||
| | | * | more chunk stuff | zotlabs | 2017-11-29 | 2 | -4/+4 |
| | | | | |||||
| | | * | more chunk | zotlabs | 2017-11-28 | 3 | -4/+7 |
| | | | | |||||
| | | * | more chunk work | zotlabs | 2017-11-28 | 1 | -13/+12 |
| | | | | |||||
| | | * | more chunk work | zotlabs | 2017-11-28 | 4 | -24/+29 |
| | | | | |||||
| | | * | first integration attempt with /cloud and blueimp uploader | zotlabs | 2017-11-28 | 2 | -0/+32 |
| | | | | |||||
| * | | | 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 |
| | | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |