Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-13 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mike Macgirvin | 2018-06-14 | 2 | -2/+2 |
| |\ | |||||
| | * | Update README.md | gia vec | 2018-06-14 | 1 | -1/+1 |
| | * | Update hubzilla-setup.sh | gia vec | 2018-06-14 | 1 | -1/+1 |
| |/ | |||||
* | | optionally report total available space when uploading | zotlabs | 2018-06-13 | 3 | -1/+9 |
* | | SECURITY: provide option to disable the cloud 'root' directory and make the c... | zotlabs | 2018-06-13 | 3 | -0/+15 |
|/ | |||||
* | uid is integer | zotlabs | 2018-06-13 | 1 | -1/+1 |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2018-06-13 | 6 | -8/+8 |
|\ | |||||
| * | Merge branch 'fix-addons-links' into 'dev' | Mike Macgirvin | 2018-06-13 | 6 | -8/+8 |
| |\ | |||||
| | * | fix links to addons repository | Herbert Thielen | 2018-06-11 | 6 | -8/+8 |
| |/ | |||||
* | | Merge branch 'master' of ../hz into dev | zotlabs | 2018-06-13 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | null db fields in mod_invite | zotlabs | 2018-06-13 | 1 | -1/+1 |
* | | Merge branch 'master' of ../hz into dev | zotlabs | 2018-06-10 | 4 | -5/+8 |
|\| | |||||
| * | hubzilla core issue #1218 | zotlabs | 2018-06-10 | 2 | -1/+6 |
| * | fixes for immediate expire, channel_active not initialised in DB | zotlabs | 2018-06-10 | 2 | -4/+2 |
* | | 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 | 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 |
* | | | 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 | 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 | 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 |
* | | | | | Update Developers.md | gia vec | 2018-06-08 | 1 | -1/+1 |
* | | | | | 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 |
* | | | | | | | 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 |
| |/ / / / / |/| | | | | |