aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev_merge'zotlabs2017-11-041-0/+37
|\
| * developer certificate of originzotlabs2017-11-041-0/+37
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0313-26/+115
| |\
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-027-15/+53
| |\ \
| * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-11-0132-44/+257
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-292-9/+9
| |\ \ \ \
* | \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-034-16/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-033-5/+42
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | provide short localised summary for likes that will end up in displayed ↵zotlabs2017-11-032-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications
* | | | | | | more search workzotlabs2017-11-032-3/+1
| |_|/ / / / |/| | | | |
* | | | | | 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
| |/ / / / |/| | | |
* | | | | hubzilla issue #896zotlabs2017-11-023-0/+50
| | | | |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-023-6/+6
|\| | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-024-8/+36
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-1/+11
| |\ \ \ \ \
| * | | | | | fix issues with diaspora xchansMario Vavti2017-11-023-6/+6
| | |_|_|_|/ | |/| | | |
* | | | | | more queue workzotlabs2017-11-023-5/+12
| |_|/ / / |/| | | |
* | | | | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-011-0/+12
|\| | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-0122-17/+173
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-309-27/+72
| |\ \ \ \
| * \ \ \ \ Merge pull request #897 from HaakonME/devgit-marijus2017-10-301-0/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Added mode to Portfolio widget
| | * | | | Added mode to Portfolio widgetHaakon Meland Eriksen2017-10-291-0/+12
| | | | | |
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-292-9/+9
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-271-0/+20
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-244-23/+55
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-243-3/+10
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devHaakon Meland Eriksen2017-10-2416-3058/+3859
| | |\ \ \ \ \ \ \
* | | | | | | | | | 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)
* | | | | | | | | 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
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | 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
|\| | | | | | |
| * | | | | | | Merge pull request #894 from mjfriaza/devgit-marijus2017-10-292-9/+9
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Spanish translation revised again.
| | * | | | | | Spanish translation revised again.Manuel Jiménez Friaza2017-10-282-9/+9
| | | | | | | |
* | | | | | | | fix "unstar"zotlabs2017-10-281-1/+1
| | | | | | | |