aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'chunk'zotlabs2017-11-306-33/+65
|\
| * more or less working chunked uploads on /cloud now.zotlabs2017-11-303-32/+22
| * made it to prepareHtmlzotlabs2017-11-302-4/+6
| * progress on chunked uploads in /cloudzotlabs2017-11-302-12/+13
| * more chunk stuffzotlabs2017-11-292-4/+4
| * more chunkzotlabs2017-11-283-4/+7
| * more chunk workzotlabs2017-11-281-13/+12
| * more chunk workzotlabs2017-11-284-24/+29
| * first integration attempt with /cloud and blueimp uploaderzotlabs2017-11-282-0/+32
* | fix issue #921 - default addressbook has no nameMario2017-11-301-1/+1
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-302-12/+54
|\ \
| * | use the same variable name consistentlyzotlabs2017-11-291-1/+1
| * | use httpsig auth for getfilezotlabs2017-11-292-12/+54
| |/
* | use typeof if checking for undefined var and always clear timeout before sett...Mario Vavti2017-11-291-3/+4
* | load the profile images in the custom acl selector only if we actually need themMario Vavti2017-11-291-6/+6
* | an additional on touch event might improve things for mobile handlingMario Vavti2017-11-291-1/+1
* | allow an optional notify_id arg for liveUpdate()Mario Vavti2017-11-293-128/+11
* | bump version to prevent caching issues related to recent updates to main.jsMario Vavti2017-11-291-1/+1
* | remove the updateCountsOnly variable which is not used anymore nowMario Vavti2017-11-291-1/+0
* | rework liveUpdate() and notificationsUpdate() (aka ping) to first do the live...Mario Vavti2017-11-292-167/+85
|/
* check for updateCountsOnly in NavUpdate()Mario Vavti2017-11-281-19/+19
* set profile_uid in mod hqMario Vavti2017-11-281-0/+7
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-11-281-1/+8
|\
| * Merge pull request #918 from albigro/devgit-marijus2017-11-271-1/+8
| |\
| | * Update dark.cssalbigro2017-11-271-1/+8
| |/
* / split liveUpdateInit() out of NavUpdate() so we do not need to wait for initi...Mario Vavti2017-11-283-239/+129
|/
* do not stop click propagationMario Vavti2017-11-271-1/+0
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-271-0/+3
|\
| * unset item_wall and item_origin on pubstream to channel copyzotlabs2017-11-271-0/+3
* | Merge pull request #916 from dawnbreak/QA_testinggit-marijus2017-11-276-11/+41
|\ \
| * | Fix a PHP error in a unit test for PHP7.2.Klaus Weidenbach2017-11-251-4/+4
| * | :construction_worker:Improve Travis, add PHP7.2.Klaus Weidenbach2017-11-255-7/+37
* | | Merge pull request #917 from anaqreon/minimum-agegit-marijus2017-11-271-1/+5
|\ \ \
| * | | Provide system config option for minimum registration age.Andrew Manning2017-11-241-1/+5
* | | | fix mod like after recent changesMario Vavti2017-11-271-1/+1
| |_|/ |/| |
* | | pubstream comments and a few other bugfixes that were discovered along the wayzotlabs2017-11-2612-77/+204
| |/ |/|
* | fix double html ids in caldav widget if more than one shareeMario Vavti2017-11-251-2/+2
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario2017-11-251-1/+1
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-251-1/+1
| |\ \
| | * | blah is not author or ownerzotlabs2017-11-251-1/+1
* | | | fix regression in cdav calendar widgetMario2017-11-251-2/+3
|/ / /
* | | implement pubstream items in mod hqMario2017-11-252-12/+37
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-2515-49/+137
|\| |
| * | this may fix pubstream comments/likeszotlabs2017-11-241-0/+16
| * | don't include invisible "update activities" in category widgetzotlabs2017-11-242-34/+37
| * | default profile assignzotlabs2017-11-244-1/+17
| * | sync packet not generated when deleting a file using the web browser interfacezotlabs2017-11-241-0/+5
| * | remove deprecated $a argument from advanced_profile()zotlabs2017-11-232-2/+2
| * | change to bbcode calling parameters: important: will require pulling addons;zotlabs2017-11-235-16/+24
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-231-1/+1
| |\ \