aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-033-5/+42
|\
| * imagedata not set correctly if large photo AND imagick is not installedzotlabs2017-11-031-0/+3
| |
| * fix cloud redirects with owt tokenszotlabs2017-11-032-5/+39
| |
* | update item_normal() to not include ACTIVITY_OBJ_FILE obj_typeMario Vavti2017-11-033-16/+9
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-036-5/+62
|\|
| * hubzilla issue #896zotlabs2017-11-023-0/+50
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-023-6/+6
| |\
| * | more queue workzotlabs2017-11-023-5/+12
| | |
* | | set $module_format to html to not break updates. it will be set to something ↵Mario Vavti2017-11-031-0/+2
| |/ |/| | | | | else later if appropriate
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-024-8/+36
|\|
| * put deferred queue logic every place we create a delivery process (except ↵zotlabs2017-11-024-8/+36
| | | | | | | | 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.
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-1/+11
|\|
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-011-0/+12
| |\
| * | don't perform zot_refresh on dead sites unless $force is setzotlabs2017-11-011-0/+10
| | |
| * | do not send message_list responses to dead sites (this delivery method ↵zotlabs2017-11-011-1/+1
| | | | | | | | | | | | bypassed the notifier)
* | | fix issues with diaspora xchansMario Vavti2017-11-023-6/+6
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-0122-17/+173
|\|
| * support for netselect queryzotlabs2017-11-016-8/+33
| |
| * Maria's profile photo issue, please push to master.zotlabs2017-11-012-2/+12
| |
| * provide personal config for channel_menu; the site can set an initial ↵zotlabs2017-10-312-0/+4
| | | | | | | | 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 comparisonzotlabs2017-10-312-2/+9
| |
| * add another delivery control parameter (force queue threshold)zotlabs2017-10-313-3/+17
| |
| * bring back sitesearch widget in mod_search because some screen modes don't ↵zotlabs2017-10-311-1/+1
| | | | | | | | have search in the navbar and there is no other way to enter text - hubzilla issue #898
| * move tile styles to theme instead of template filezotlabs2017-10-302-7/+30
| |
| * use 1) personal setting, 2) site setting, 3) default false - for ↵zotlabs2017-10-301-1/+1
| | | | | | | | system.channel_menu
| * provide a 'tile' view (view only) mode to mod_cloudzotlabs2017-10-304-0/+73
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-309-27/+72
|\|
| * memory overflow trying to delete a connection with a very high noise to ↵zotlabs2017-10-291-1/+1
| | | | | | | | signal ratio
| * add some documentation about shareable widgetszotlabs2017-10-291-2/+32
| |
| * allow plugin class widgets, fix sql error in page modulezotlabs2017-10-293-12/+4
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-292-9/+9
| |\
| * | fix "unstar"zotlabs2017-10-281-1/+1
| | |
| * | 1/2 of hubzilla issue #893zotlabs2017-10-261-0/+6
| | |
| * | encrypt the owa tokenzotlabs2017-10-262-4/+13
| | |
| * | hubzilla issue #890, separate the pdl preview feature from the mod_page ↵zotlabs2017-10-251-7/+15
| | | | | | | | | | | | webpage query so that the webpage will always win if a webpage and pdl have the same name.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-2510-27/+128
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-237-95/+152
| |\ \ \
| * | | | not sure when but the hcard went missing in webfingerzotlabs2017-10-231-0/+7
| | | | |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-2217-3017/+3883
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1910-1465/+1867
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-173-5/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1613-33/+104
| |\ \ \ \ \ \ \
| * | | | | | | | regression in zot site info after zot6 workzotlabs2017-10-161-4/+6
| | | | | | | | |
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-121-3/+19
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1120-60/+200
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1019-332/+134
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0937-84/+436
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0810-39/+54
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0868-80/+575
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0510-9/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:53:37 +0000