aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-101-1/+1
|\
| * Merge branch 'dev' into 'dev'Mario2018-06-101-1/+1
| |\ | | | | | | | | | | | | Update symbolic link doc/es See merge request hubzilla/core!1214
| | * Update symbolic link doc/esManuel Jiménez Friaza2018-06-091-1/+1
| | |
* | | fix issue #1221Mario Vavti2018-06-101-2/+2
|/ /
* | fix issue #1219Mario Vavti2018-06-092-4/+7
| |
* | move cid filter js to the widgetMario Vavti2018-06-092-4/+5
| |
* | bump versionMario Vavti2018-06-091-1/+1
| |
* | restrict cid filter to unthreaded order (makes much more sense that way imho ↵Mario Vavti2018-06-093-36/+35
| | | | | | | | and the query is a lot faster) and slighty change order of the filters
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-06-0828-81/+96
|\ \
| * \ Merge branch 'dev' into 'dev'Mario2018-06-0826-44/+44
| |\ \ | | | | | | | | | | | | | | | | Update github.com git repo URLs with framagit.org URLs See merge request hubzilla/core!1212
| | * | Update github.com git repo URLs with framagit.org URLsAndrew Manning2018-06-0826-44/+44
| | | |
| | * | Merge branch 'dev' of framagit.org:hubzilla/core into devAndrew Manning2018-06-0871-403/+1771
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2018-05-259-14889/+16856
| | |\ \ \
| | * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2018-05-2463-469/+1010
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2018-05-185-12/+30
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'dev' into 'dev'Mario2018-06-083-37/+52
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Update doc/es-es See merge request hubzilla/core!1213
| | * | | | | | Update doc/es-esManuel Jiménez Friaza2018-06-083-37/+52
| |/ / / / / /
* | | | | | | if unthreaded and cid and not pf, query author onlyMario Vavti2018-06-081-5/+10
| | | | | | |
* | | | | | | new feature filter network by nameMario Vavti2018-06-085-2/+40
|/ / / / / /
* | | | | / update changelogMario Vavti2018-06-081-0/+24
| |_|_|_|/ |/| | | |
* | | | | github to framagit transitionMario Vavti2018-06-081-2/+2
| | | | |
* | | | | typoMario Vavti2018-06-081-1/+1
| | | | |
* | | | | Update developers.bbgia vec2018-06-081-71/+71
| | | | | | | | | | | | | | | (cherry picked from commit 009ecb0ff4a7118e9713d79dbb3cc7faa1d22034)
* | | | | Update Developers.mdgia vec2018-06-081-1/+1
| | | | | | | | | | | | | | | (cherry picked from commit 68ffddafb1ce27bf408735f08f2a69ad094655b3)
* | | | | fixes for search_item.tplMario Vavti2018-06-074-60/+47
| | | | |
* | | | | escape query stringMario Vavti2018-06-075-7/+7
| | | | |
* | | | | do not query for parents if $conv and $nouveau are setMario Vavti2018-06-071-5/+11
| | | | |
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-076-42/+39
|\ \ \ \ \
| * | | | | update a number of links in the codezotlabs2018-06-066-42/+39
| | | | | |
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-0610-4/+670
| |\ \ \ \ \
* | | | | | | update install instructionsMario Vavti2018-06-061-10/+10
| | | | | | |
* | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-067-75/+157
|\| | | | | |
| * | | | | | some work to make menus editable by visitors with webpage write permissions; ↵zotlabs2018-06-057-75/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality.
* | | | | | | add the pf argument to the forum notification linksMario Vavti2018-06-061-1/+1
| | | | | | |
* | | | | | | remove gravizot.de from directory fallback servers due to owners requestMario Vavti2018-06-061-1/+0
| |/ / / / / |/| | | | |
* | | | | | rely on the pf argument to determine if we deal with a forum or not. ↵Mario Vavti2018-06-052-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | xchan_pubforum is not set for all public forums in the forum filters for some reason.
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-06-058-0/+659
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1210 from mjfriaza/devgit-marijus2018-06-048-0/+659
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Initial Spanish translations in doc/es-es
| | * | | | | | Initial translations in doc/es-esManuel Jiménez Friaza2018-06-038-0/+659
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-052-13/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | photos not syncing properly if destination is a postgres sitezotlabs2018-06-042-13/+28
| | | | | | |
* | | | | | | be specific about the term type and do not sort the resultsMario Vavti2018-06-041-2/+5
|/ / / / / /
* | | | | | sort out some mismatched hovertips on the activity filterzotlabs2018-06-031-5/+5
| | | | | |
* | | | | | wrong levelzotlabs2018-06-031-2/+2
| | | | | |
* | | | | | fix submenunavigation on activity filterszotlabs2018-06-031-0/+2
| | | | | |
* | | | | | improve network cid queryMario Vavti2018-06-032-26/+24
| | | | | |
* | | | | | distinct is needed or it can heavily impact pagination in certain situations ↵Mario Vavti2018-06-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance.
* | | | | | missing $perm_sqlMario Vavti2018-06-032-3/+4
| | | | | |
* | | | | | the pf argument is required here for some functionality in /networkMario Vavti2018-06-031-3/+3
| | | | | |
* | | | | | add the archived flagMario Vavti2018-06-021-1/+1
| | | | | |