Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-06-10 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-06-10 | 1 | -1/+1 | |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Update symbolic link doc/es See merge request hubzilla/core!1214 | |||||
| | * | | Update symbolic link doc/es | Manuel Jiménez Friaza | 2018-06-09 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix issue #1221 | Mario Vavti | 2018-06-10 | 1 | -2/+2 | |
|/ / / | ||||||
* | | | fix issue #1219 | Mario Vavti | 2018-06-09 | 2 | -4/+7 | |
| | | | ||||||
* | | | move cid filter js to the widget | Mario Vavti | 2018-06-09 | 2 | -4/+5 | |
| | | | ||||||
* | | | bump version | Mario Vavti | 2018-06-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | restrict cid filter to unthreaded order (makes much more sense that way imho ↵ | Mario Vavti | 2018-06-09 | 3 | -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 dev | Mario Vavti | 2018-06-08 | 28 | -81/+96 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-06-08 | 26 | -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 URLs | Andrew Manning | 2018-06-08 | 26 | -44/+44 | |
| | | | | | ||||||
| | * | | | Merge branch 'dev' of framagit.org:hubzilla/core into dev | Andrew Manning | 2018-06-08 | 71 | -403/+1771 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2018-05-25 | 9 | -14889/+16856 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2018-05-24 | 63 | -469/+1010 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2018-05-18 | 5 | -12/+30 | |
| | |\ \ \ \ \ | ||||||
| * | \ \ \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2018-06-08 | 3 | -37/+52 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Update doc/es-es See merge request hubzilla/core!1213 | |||||
| | * | | | | | | Update doc/es-es | Manuel Jiménez Friaza | 2018-06-08 | 3 | -37/+52 | |
| |/ / / / / / | ||||||
* | | | | | | | if unthreaded and cid and not pf, query author only | Mario Vavti | 2018-06-08 | 1 | -5/+10 | |
| | | | | | | | ||||||
* | | | | | | | new feature filter network by name | Mario Vavti | 2018-06-08 | 5 | -2/+40 | |
|/ / / / / / | ||||||
* | | | | / | update changelog | Mario Vavti | 2018-06-08 | 1 | -0/+24 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | github to framagit transition | Mario Vavti | 2018-06-08 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | typo | Mario Vavti | 2018-06-08 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Update developers.bb | gia vec | 2018-06-08 | 1 | -71/+71 | |
| | | | | | | | | | | | | | | | (cherry picked from commit 009ecb0ff4a7118e9713d79dbb3cc7faa1d22034) | |||||
* | | | | | Update Developers.md | gia vec | 2018-06-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | (cherry picked from commit 68ffddafb1ce27bf408735f08f2a69ad094655b3) | |||||
* | | | | | fixes for search_item.tpl | Mario Vavti | 2018-06-07 | 4 | -60/+47 | |
| | | | | | ||||||
* | | | | | escape query string | Mario Vavti | 2018-06-07 | 5 | -7/+7 | |
| | | | | | ||||||
* | | | | | do not query for parents if $conv and $nouveau are set | Mario Vavti | 2018-06-07 | 1 | -5/+11 | |
| | | | | | ||||||
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-07 | 6 | -42/+39 | |
|\ \ \ \ \ | ||||||
| * | | | | | update a number of links in the code | zotlabs | 2018-06-06 | 6 | -42/+39 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-06 | 10 | -4/+670 | |
| |\ \ \ \ \ | ||||||
* | | | | | | | update install instructions | Mario Vavti | 2018-06-06 | 1 | -10/+10 | |
| | | | | | | | ||||||
* | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-06 | 7 | -75/+157 | |
|\| | | | | | | ||||||
| * | | | | | | some work to make menus editable by visitors with webpage write permissions; ↵ | zotlabs | 2018-06-05 | 7 | -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 links | Mario Vavti | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | remove gravizot.de from directory fallback servers due to owners request | Mario Vavti | 2018-06-06 | 1 | -1/+0 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | rely on the pf argument to determine if we deal with a forum or not. ↵ | Mario Vavti | 2018-06-05 | 2 | -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 dev | Mario Vavti | 2018-06-05 | 8 | -0/+659 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #1210 from mjfriaza/dev | git-marijus | 2018-06-04 | 8 | -0/+659 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Initial Spanish translations in doc/es-es | |||||
| | * | | | | | | Initial translations in doc/es-es | Manuel Jiménez Friaza | 2018-06-03 | 8 | -0/+659 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-05 | 2 | -13/+28 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | photos not syncing properly if destination is a postgres site | zotlabs | 2018-06-04 | 2 | -13/+28 | |
| | | | | | | | ||||||
* | | | | | | | be specific about the term type and do not sort the results | Mario Vavti | 2018-06-04 | 1 | -2/+5 | |
|/ / / / / / | ||||||
* | | | | | | sort out some mismatched hovertips on the activity filter | zotlabs | 2018-06-03 | 1 | -5/+5 | |
| | | | | | | ||||||
* | | | | | | wrong level | zotlabs | 2018-06-03 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | fix submenunavigation on activity filters | zotlabs | 2018-06-03 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | improve network cid query | Mario Vavti | 2018-06-03 | 2 | -26/+24 | |
| | | | | | | ||||||
* | | | | | | distinct is needed or it can heavily impact pagination in certain situations ↵ | Mario Vavti | 2018-06-03 | 1 | -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_sql | Mario Vavti | 2018-06-03 | 2 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | the pf argument is required here for some functionality in /network | Mario Vavti | 2018-06-03 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | add the archived flag | Mario Vavti | 2018-06-02 | 1 | -1/+1 | |
| | | | | | |