aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-031-5/+14
|\
| * fix cloud redirects with owt tokenszotlabs2017-11-031-5/+14
* | update item_normal() to not include ACTIVITY_OBJ_FILE obj_typeMario Vavti2017-11-032-12/+5
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-032-0/+43
|\|
| * hubzilla issue #896zotlabs2017-11-021-0/+42
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-11-021-2/+2
| |\
| * | more queue workzotlabs2017-11-021-0/+1
* | | set $module_format to html to not break updates. it will be set to something ...Mario Vavti2017-11-031-0/+2
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-021-0/+8
|\|
| * put deferred queue logic every place we create a delivery process (except for...zotlabs2017-11-021-0/+8
* | fix issues with diaspora xchansMario Vavti2017-11-021-2/+2
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-0111-14/+90
|\
| * support for netselect queryzotlabs2017-11-015-8/+31
| * Maria's profile photo issue, please push to master.zotlabs2017-11-011-2/+8
| * provide personal config for channel_menu; the site can set an initial site-wi...zotlabs2017-10-311-0/+3
| * pdledit - show original/system layout text for comparisonzotlabs2017-10-311-2/+6
| * add another delivery control parameter (force queue threshold)zotlabs2017-10-311-2/+5
| * provide a 'tile' view (view only) mode to mod_cloudzotlabs2017-10-302-0/+37
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-305-13/+33
|\|
| * allow plugin class widgets, fix sql error in page modulezotlabs2017-10-292-1/+4
| * fix "unstar"zotlabs2017-10-281-1/+1
| * encrypt the owa tokenzotlabs2017-10-262-4/+13
| * hubzilla issue #890, separate the pdl preview feature from the mod_page webpa...zotlabs2017-10-251-7/+15
* | Added mode to Portfolio widgetHaakon Meland Eriksen2017-10-291-0/+12
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-10-241-17/+27
|\
| * Merge pull request #884 from dawnbreak/devgit-marijus2017-10-241-17/+27
| |\
| | * We call Theme:url() statically, make it also static.Klaus Weidenbach2017-10-231-17/+27
* | | comment out statistics link in mod pubsites until we have something functiona...Mario Vavti2017-10-241-2/+2
|/ /
* | not sure when but the hcard went missing in webfingerzotlabs2017-10-231-0/+7
* | acl encoding issueszotlabs2017-10-231-2/+2
* | mod_display: provide alternate serialisations (starting with atom)zotlabs2017-10-221-54/+113
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-223-35/+44
|\|
| * do not show seen notifys in notifications - show them in mod notifications in...Mario Vavti2017-10-222-35/+37
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-203-51/+96
| |\
| * | Display different info message if using invite codeAndrew Manning2017-10-191-1/+5
* | | bring back the markdown post feature (after investing some effort to make it ...zotlabs2017-10-221-37/+9
| |/ |/|
* | register workflow was getting over-ridden in include/securityzotlabs2017-10-192-5/+6
* | table structure for pseudo or proxy channels (pchan)zotlabs2017-10-191-49/+90
|/
* redirect to be moderated items to /moderate and change the conv link to parte...Mario Vavti2017-10-192-5/+24
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-161-1/+1
|\
| * fix typos in commentFelix Wolfsteller2017-10-161-1/+1
* | mod_register - don't re-use the password, force them to type it in twice each...zotlabs2017-10-161-3/+3
|/
* create an actual logout module instead of relying on internal variableszotlabs2017-10-121-0/+12
* sort out the notification idszotlabs2017-10-121-1/+2
* add local_channel as a comanche condition variablezotlabs2017-10-111-0/+4
* only show pubs notifications if discovery_tab != disabledMario Vavti2017-10-111-15/+17
* nav_set_selected() for apps and apporder. restrict apporder to local_channel(...Mario Vavti2017-10-112-19/+26
* re-implement single deliveryzotlabs2017-10-101-3/+20
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-102-9/+2
|\
| * remove notifications code from nav and go live with new notificationsMario Vavti2017-10-102-9/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:56:06 +0000