Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove several unused/unreferenced templates | zotlabs | 2018-06-17 | 24 | -511/+12 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-17 | 11 | -171/+181 |
|\ | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-06-17 | 29 | -73/+116 |
| |\ | |||||
| * | | some work on mod group | Mario | 2018-06-17 | 11 | -171/+181 |
| | | | |||||
* | | | owa: htmlentity encoding encountered in authentication workflow (possibly ↵ | zotlabs | 2018-06-17 | 1 | -1/+8 |
| | | | | | | | | | | | | introduced during Apache mod_rewrite with QSA flag) | ||||
* | | | slightly more memory efficient way to drop posts of removed connections | zotlabs | 2018-06-15 | 1 | -7/+8 |
| |/ |/| | |||||
* | | apply changes to slider defaults across all modules that use buildQuery for ↵ | zotlabs | 2018-06-15 | 5 | -10/+10 |
| | | | | | | | | updates | ||||
* | | hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵ | zotlabs | 2018-06-15 | 2 | -6/+8 |
| | | | | | | | | saved default changes | ||||
* | | wiki: word-wrap code on any character | zotlabs | 2018-06-14 | 1 | -0/+2 |
| | | |||||
* | | re-implement/refactor getQuotaInfo() on DAV storage | zotlabs | 2018-06-14 | 4 | -37/+50 |
| | | |||||
* | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | change repo links See merge request hubzilla/core!1220 | ||||
| | * | | Update README.md | gia vec | 2018-06-14 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 7d73543b84507b74c8058da7dd062d7949c34d61) | ||||
| | * | | Update hubzilla-setup.sh | gia vec | 2018-06-14 | 1 | -1/+1 |
| |/ / | | | | | | | (cherry picked from commit 95f2eb68ca38976b7ca9d3f5c2d89c923d5ef4b5) | ||||
* | | | 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 ↵ | zotlabs | 2018-06-13 | 3 | -0/+15 |
|/ / | | | | | | | cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. | ||||
* | | 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 See merge request hubzilla/core!1216 | ||||
| | * | | 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 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 |
| | | | | |