aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix simple errorjeroenpraat2018-06-181-1/+1
* fix simple errorjeroenpraat2018-06-181-1/+1
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-1729-73/+116
|\
| * apply changes to slider defaults across all modules that use buildQuery for u...zotlabs2018-06-155-10/+10
| * hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ...zotlabs2018-06-152-6/+8
| * wiki: word-wrap code on any characterzotlabs2018-06-141-0/+2
| * re-implement/refactor getQuotaInfo() on DAV storagezotlabs2018-06-144-37/+50
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-132-2/+2
| |\
| | * Merge branch 'dev' into 'dev'Mike Macgirvin2018-06-142-2/+2
| | |\
| | | * Update README.mdgia vec2018-06-141-1/+1
| | | * Update hubzilla-setup.shgia vec2018-06-141-1/+1
| | |/
| * | optionally report total available space when uploadingzotlabs2018-06-133-1/+9
| * | SECURITY: provide option to disable the cloud 'root' directory and make the c...zotlabs2018-06-133-0/+15
| |/
| * uid is integerzotlabs2018-06-131-1/+1
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2018-06-136-8/+8
| |\
| | * Merge branch 'fix-addons-links' into 'dev'Mike Macgirvin2018-06-136-8/+8
| | |\
| | | * fix links to addons repositoryHerbert Thielen2018-06-116-8/+8
| | |/
| * | Merge branch 'master' of ../hz into devzotlabs2018-06-131-1/+1
| |\ \ | | |/ | |/|
| | * null db fields in mod_invitezotlabs2018-06-131-1/+1
| * | Merge branch 'master' of ../hz into devzotlabs2018-06-104-5/+8
| |\|
| | * hubzilla core issue #1218zotlabs2018-06-102-1/+6
| | * fixes for immediate expire, channel_active not initialised in DBzotlabs2018-06-102-4/+2
| * | 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/esManuel Jiménez Friaza2018-06-091-1/+1
| * | | | fix issue #1221Mario Vavti2018-06-101-2/+2
| |/ / /
* / / / some work on mod groupMario2018-06-1711-171/+181
|/ / /
* | | 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
* | | 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 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-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
* | | | | Update Developers.mdgia vec2018-06-081-1/+1
* | | | | 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