aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-11-042-3/+6
|\
| * provide short localised summary for likes that will end up in displayed ↵zotlabs2017-11-031-1/+5
| | | | | | | | notifications
| * more search workzotlabs2017-11-031-2/+1
| |
* | 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
| |/ |/| | | | | else later if appropriate
* | 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 ↵zotlabs2017-11-021-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 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 ↵zotlabs2017-10-311-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 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 ↵zotlabs2017-10-251-7/+15
| | | | | | | | webpage query so that the webpage will always win if a webpage and pdl have the same name.
* | 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
| |\ | | | | | | Update composer autoload cache.
| | * 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 ↵Mario Vavti2017-10-241-2/+2
|/ / | | | | | | functional again
* | 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 ↵Mario Vavti2017-10-222-35/+37
| | | | | | | | instead. Update notifications count also on notifications updates
| * 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
| |/ |/| | | | | work)
* | 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 ↵Mario Vavti2017-10-192-5/+24
| | | | partent mid in /modrate
* 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 ↵zotlabs2017-10-161-3/+3
|/ | | | each time unless their browser saves passwords.
* 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 ↵Mario Vavti2017-10-112-19/+26
| | | | local_channel() and whitespace
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:31:57 +0000