Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-12 | 2 | -2/+3 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-11 | 1 | -3/+6 | |
| |\ \ | ||||||
| * | | | fix wiki pages not updating after creating new page | Mario Vavti | 2017-11-11 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
| * | | revert back to get the mid from enotify - otherwise we can not distinct ↵ | Mario Vavti | 2017-11-10 | 1 | -1/+2 | |
| | | | | | | | | | | | | between posts and likes | |||||
* | | | cleanup of upload_to_comments test; we actually don't care about the profile ↵ | zotlabs | 2017-11-12 | 1 | -9/+0 | |
| |/ |/| | | | | | owner. We only care that we're logged in locally and our storage is public by default. | |||||
* | | set os_syspath in DAV file put operation so that photos will scale correctly. | zotlabs | 2017-11-10 | 1 | -3/+6 | |
|/ | ||||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-09 | 2 | -1/+5 | |
|\ | ||||||
| * | unable to change permissions on wiki with space in name | zotlabs | 2017-11-08 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-08 | 1 | -0/+2 | |
| |\ | ||||||
| * | | make most recent cloud_tiles setting for local channels persistent across logins | zotlabs | 2017-11-07 | 1 | -0/+4 | |
| | | | ||||||
* | | | get the path infos from pathname instead of seperate data attribute | Mario Vavti | 2017-11-09 | 1 | -1/+0 | |
| | | | ||||||
* | | | load notifications links to /display via ajax if we are already in /display | Mario Vavti | 2017-11-09 | 2 | -0/+2 | |
| |/ |/| | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-07 | 2 | -1/+268 | |
|\| | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-06 | 1 | -1/+1 | |
| |\ | ||||||
| * | | .htignore update | zotlabs | 2017-11-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | second half of issue #893 - move channel default permissions to its own ↵ | zotlabs | 2017-11-06 | 2 | -1/+268 | |
| | | | | | | | | | | | | module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner. | |||||
* | | | rename channel app events to calendar and add nav_set_selected() to /cal | Mario Vavti | 2017-11-07 | 1 | -0/+2 | |
| |/ |/| | ||||||
* | | fix unable to mark all messages read | Mario Vavti | 2017-11-06 | 1 | -1/+1 | |
|/ | ||||||
* | allow cloud filenames to include ampersands without messing up auth tokens ↵ | zotlabs | 2017-11-05 | 2 | -16/+9 | |
| | | | | (zid, owt, and zat, and the constant placeholder 'f=') | |||||
* | common connections on suggestion page showing wildly different results than ↵ | zotlabs | 2017-11-05 | 1 | -2/+2 | |
| | | | | remote profile, and is consistently off by one | |||||
* | Merge branch 'dev' into docu | git-marijus | 2017-11-04 | 3 | -8/+20 | |
|\ | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-04 | 2 | -3/+6 | |
| |\ | ||||||
| | * | provide short localised summary for likes that will end up in displayed ↵ | zotlabs | 2017-11-03 | 1 | -1/+5 | |
| | | | | | | | | | | | | notifications | |||||
| | * | more search work | zotlabs | 2017-11-03 | 1 | -2/+1 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 1 | -5/+14 | |
| |\| | ||||||
| | * | fix cloud redirects with owt tokens | zotlabs | 2017-11-03 | 1 | -5/+14 | |
| | | | ||||||
* | | | :bulb: Improving Doxygen documentation. | Klaus Weidenbach | 2017-11-03 | 12 | -239/+451 | |
|/ / | | | | | | | | | Fix some Doxygen parsing errors. Improve hooks documentation. | |||||
* | | update item_normal() to not include ACTIVITY_OBJ_FILE obj_type | Mario Vavti | 2017-11-03 | 2 | -12/+5 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-03 | 2 | -0/+43 | |
|\| | ||||||
| * | hubzilla issue #896 | zotlabs | 2017-11-02 | 1 | -0/+42 | |
| | | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-02 | 1 | -2/+2 | |
| |\ | ||||||
| * | | more queue work | zotlabs | 2017-11-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | set $module_format to html to not break updates. it will be set to something ↵ | Mario Vavti | 2017-11-03 | 1 | -0/+2 | |
| |/ |/| | | | | | else later if appropriate | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-02 | 1 | -0/+8 | |
|\| | ||||||
| * | put deferred queue logic every place we create a delivery process (except ↵ | zotlabs | 2017-11-02 | 1 | -0/+8 | |
| | | | | | | | | for protocol 'friend requests' which aren't likely to swamp the delivery system). Remove it from the queue_delivery function which was too late to do anything. | |||||
* | | fix issues with diaspora xchans | Mario Vavti | 2017-11-02 | 1 | -2/+2 | |
|/ | ||||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-01 | 11 | -14/+90 | |
|\ | ||||||
| * | support for netselect query | zotlabs | 2017-11-01 | 5 | -8/+31 | |
| | | ||||||
| * | Maria's profile photo issue, please push to master. | zotlabs | 2017-11-01 | 1 | -2/+8 | |
| | | ||||||
| * | provide personal config for channel_menu; the site can set an initial ↵ | zotlabs | 2017-10-31 | 1 | -0/+3 | |
| | | | | | | | | site-wide value but this but there isn't a corresponding admin setting currently and can only be set by manual config | |||||
| * | pdledit - show original/system layout text for comparison | zotlabs | 2017-10-31 | 1 | -2/+6 | |
| | | ||||||
| * | add another delivery control parameter (force queue threshold) | zotlabs | 2017-10-31 | 1 | -2/+5 | |
| | | ||||||
| * | provide a 'tile' view (view only) mode to mod_cloud | zotlabs | 2017-10-30 | 2 | -0/+37 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-30 | 5 | -13/+33 | |
|\| | ||||||
| * | allow plugin class widgets, fix sql error in page module | zotlabs | 2017-10-29 | 2 | -1/+4 | |
| | | ||||||
| * | fix "unstar" | zotlabs | 2017-10-28 | 1 | -1/+1 | |
| | | ||||||
| * | encrypt the owa token | zotlabs | 2017-10-26 | 2 | -4/+13 | |
| | | ||||||
| * | hubzilla issue #890, separate the pdl preview feature from the mod_page ↵ | zotlabs | 2017-10-25 | 1 | -7/+15 | |
| | | | | | | | | webpage query so that the webpage will always win if a webpage and pdl have the same name. | |||||
* | | Added mode to Portfolio widget | Haakon Meland Eriksen | 2017-10-29 | 1 | -0/+12 | |
|/ | ||||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-10-24 | 1 | -17/+27 | |
|\ |